You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2021/02/22 16:01:20 UTC

[httpcomponents-website] branch master updated (7a42c00 -> beac77f)

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git.


 discard 7a42c00  Restructured content common to multiple release series
     new beac77f  Restructured content common to multiple release series

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7a42c00)
            \
             N -- N -- N   refs/heads/master (beac77f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


[httpcomponents-website] 01/01: Restructured content common to multiple release series

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git

commit beac77f00d526166f71ad31bdc79d8a681d7d96c
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Feb 22 17:00:49 2021 +0100

    Restructured content common to multiple release series
---
 .../android.md                                                    | 0
 .../logging.md                                                    | 0
 .../ntlm.md                                                       | 0
 .../primer.md                                                     | 0
 .../android.md                                                    | 0
 .../logging.md                                                    | 0
 .../related-projects.md                                           | 0
 .../related-projects.md                                           | 0
 .../resources/httpcomponents-client-4.5.x/documentation.links     | 5 -----
 .../resources/httpcomponents-client-5.0.x/documentation.links     | 4 ----
 .../resources/httpcomponents-client-5.1.x/documentation.links     | 4 ----
 src/site/resources/httpcomponents-core-5.0.x/documentation.links  | 2 --
 src/site/resources/httpcomponents-core-5.1.x/documentation.links  | 2 --
 src/site/site.xml                                                 | 8 ++++----
 14 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/site/markdown/httpcomponents-client-4.x/android.md b/src/site/markdown/httpcomponents-client-4.5.x/android.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-4.x/android.md
rename to src/site/markdown/httpcomponents-client-4.5.x/android.md
diff --git a/src/site/markdown/httpcomponents-client-4.x/logging.md b/src/site/markdown/httpcomponents-client-4.5.x/logging.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-4.x/logging.md
rename to src/site/markdown/httpcomponents-client-4.5.x/logging.md
diff --git a/src/site/markdown/httpcomponents-client-4.x/ntlm.md b/src/site/markdown/httpcomponents-client-4.5.x/ntlm.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-4.x/ntlm.md
rename to src/site/markdown/httpcomponents-client-4.5.x/ntlm.md
diff --git a/src/site/markdown/httpcomponents-client-4.x/primer.md b/src/site/markdown/httpcomponents-client-4.5.x/primer.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-4.x/primer.md
rename to src/site/markdown/httpcomponents-client-4.5.x/primer.md
diff --git a/src/site/markdown/httpcomponents-client-5.x/android.md b/src/site/markdown/httpcomponents-client-5.0.x/android.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.x/android.md
rename to src/site/markdown/httpcomponents-client-5.0.x/android.md
diff --git a/src/site/markdown/httpcomponents-client-5.x/logging.md b/src/site/markdown/httpcomponents-client-5.0.x/logging.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.x/logging.md
rename to src/site/markdown/httpcomponents-client-5.0.x/logging.md
diff --git a/src/site/markdown/httpcomponents-client-5.x/related-projects.md b/src/site/markdown/httpcomponents-client-5.0.x/related-projects.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.x/related-projects.md
rename to src/site/markdown/httpcomponents-client-5.0.x/related-projects.md
diff --git a/src/site/markdown/httpcomponents-core-5.x/related-projects.md b/src/site/markdown/httpcomponents-core-5.0.x/related-projects.md
similarity index 100%
rename from src/site/markdown/httpcomponents-core-5.x/related-projects.md
rename to src/site/markdown/httpcomponents-core-5.0.x/related-projects.md
diff --git a/src/site/resources/httpcomponents-client-4.5.x/documentation.links b/src/site/resources/httpcomponents-client-4.5.x/documentation.links
index fb5d11e..5c1084a 100644
--- a/src/site/resources/httpcomponents-client-4.5.x/documentation.links
+++ b/src/site/resources/httpcomponents-client-4.5.x/documentation.links
@@ -3,8 +3,3 @@
 
 current     ../components/httpcomponents-client-4.5.x/4.5.13
 4.5.13      ../components/httpcomponents-client-4.5.x/4.5.13
-
-android.html    ../components/httpcomponents-client-4.x/android.html
-logging.html    ../components/httpcomponents-client-4.x/logging.html
-ntlm.html    ../components/httpcomponents-client-4.x/ntml.html
-primer.html    ../components/httpcomponents-client-4.x/primer.html
diff --git a/src/site/resources/httpcomponents-client-5.0.x/documentation.links b/src/site/resources/httpcomponents-client-5.0.x/documentation.links
index 3732d1b..39cabcd 100644
--- a/src/site/resources/httpcomponents-client-5.0.x/documentation.links
+++ b/src/site/resources/httpcomponents-client-5.0.x/documentation.links
@@ -3,7 +3,3 @@
 
 5.0.3       ../components/httpcomponents-client-5.0.x/5.0.3
 current     ../components/httpcomponents-client-5.0.x/5.0.3
-
-android.html             ../components/httpcomponents-client-5.x/android.html
-logging.html             ../components/httpcomponents-client-5.x/logging.html
-related-projects.html    ../components/httpcomponents-client-5.x/related-projects.html
diff --git a/src/site/resources/httpcomponents-client-5.1.x/documentation.links b/src/site/resources/httpcomponents-client-5.1.x/documentation.links
index 51b23ec..b562b21 100644
--- a/src/site/resources/httpcomponents-client-5.1.x/documentation.links
+++ b/src/site/resources/httpcomponents-client-5.1.x/documentation.links
@@ -3,7 +3,3 @@
 
 5.1-beta1   ../components/httpcomponents-client-5.1.x/5.1-beta1
 current     ../components/httpcomponents-client-5.1.x/5.1-beta1
-
-android.html             ../components/httpcomponents-client-5.x/android.html
-logging.html             ../components/httpcomponents-client-5.x/logging.html
-related-projects.html    ../components/httpcomponents-client-5.x/related-projects.html
diff --git a/src/site/resources/httpcomponents-core-5.0.x/documentation.links b/src/site/resources/httpcomponents-core-5.0.x/documentation.links
index f88e462..b770af3 100644
--- a/src/site/resources/httpcomponents-core-5.0.x/documentation.links
+++ b/src/site/resources/httpcomponents-core-5.0.x/documentation.links
@@ -3,5 +3,3 @@
 
 5.0.3       ../components/httpcomponents-core-5.0.x/5.0.3
 current     ../components/httpcomponents-core-5.0.x/5.0.3
-
-related-projects.html    ../components/httpcomponents-core-5.x/related-projects.html
diff --git a/src/site/resources/httpcomponents-core-5.1.x/documentation.links b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
index 577e635..17f959a 100644
--- a/src/site/resources/httpcomponents-core-5.1.x/documentation.links
+++ b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
@@ -3,5 +3,3 @@
 
 5.1-beta3   ../components/httpcomponents-core-5.1.x/5.1-beta3
 current     ../components/httpcomponents-core-5.1.x/5.1-beta3
-
-related-projects.html    ../components/httpcomponents-core-5.x/related-projects.html
diff --git a/src/site/site.xml b/src/site/site.xml
index a7c3830..8edb441 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -75,9 +75,9 @@ under the License.
         <item name="Examples (Classic)" href="httpcomponents-client-5.1.x/examples.html"/>
         <item name="Examples (Async)" href="httpcomponents-client-5.1.x/examples-async.html"/>
         <item name="Examples (Reactive)" href="httpcomponents-client-5.1.x/examples-reactive.html"/>
-        <item name="Logging Guide" href="httpcomponents-client-5.1.x/logging.html"/>
-        <item name="Android" href="httpcomponents-client-5.1.x/android.html"/>
-        <item name="Related" href="httpcomponents-client-5.1.x/related-projects.html"/>
+        <item name="Logging Guide" href="httpcomponents-client-5.0.x/logging.html"/>
+        <item name="Android" href="httpcomponents-client-5.0.x/android.html"/>
+        <item name="Related" href="httpcomponents-client-5.0.x/related-projects.html"/>
         <item name="Download" href="httpcomponents-client-5.1.x/download.html"/>
       </item>
       <item name="HttpClient 5.0" collapse="true" href="httpcomponents-client-5.0.x/index.html">
@@ -92,7 +92,7 @@ under the License.
       </item>
       <item name="HttpCore 5.1 BETA" collapse="true" href="httpcomponents-core-5.1.x/index.html">
         <item name="Examples" href="httpcomponents-core-5.1.x/examples.html"/>
-        <item name="Related" href="httpcomponents-core-5.1.x/related-projects.html"/>
+        <item name="Related" href="httpcomponents-core-5.0.x/related-projects.html"/>
         <item name="Download" href="httpcomponents-core-5.1.x/download.html"/>
       </item>
       <item name="HttpCore 5.0" collapse="true" href="httpcomponents-core-5.0.x/index.html">