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 2011/01/24 15:07:00 UTC

svn commit: r1062780 - in /httpcomponents/project/src/site/apt: index.apt user-docs.apt

Author: olegk
Date: Mon Jan 24 14:07:00 2011
New Revision: 1062780

URL: http://svn.apache.org/viewvc?rev=1062780&view=rev
Log:
Updated references to the new location of 3.x documentation; cleanup of the User Docs

Modified:
    httpcomponents/project/src/site/apt/index.apt
    httpcomponents/project/src/site/apt/user-docs.apt

Modified: httpcomponents/project/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/httpcomponents/project/src/site/apt/index.apt?rev=1062780&r1=1062779&r2=1062780&view=diff
==============================================================================
--- httpcomponents/project/src/site/apt/index.apt (original)
+++ httpcomponents/project/src/site/apt/index.apt Mon Jan 24 14:07:00 2011
@@ -64,7 +64,7 @@ HttpComponents Overview
     {{{./httpcomponents-client-ga/index.html}HttpClient}} is a HTTP/1.1 compliant HTTP agent 
     implementation based on HttpCore. It also provides reusable components for client-side 
     authentication, HTTP state management, and HTTP connection management. HttpComponents Client 
-    is a successor of and replacement for {{{http://hc.apache.org/httpclient-3.x/index.html} 
+    is a successor of and replacement for {{{http://hc.apache.org/httpclient-legacy/index.html} 
     Commons HttpClient 3.x}}. Users of Commons HttpClient are strongly encouraged to upgrade.
 
     * HttpClient Tutorial ( {{{./httpcomponents-client-ga/tutorial/html}HTML}} 
@@ -84,4 +84,4 @@ HttpComponents Overview
 * {Commons HttpClient (legacy)}
 
     Commons HttpClient 3.x codeline is at the end of life. All users of Commons HttpClient 3.x 
-    are strongly encouraged to upgrade to HttpClient 4.0. 
+    are strongly encouraged to upgrade to HttpClient 4.1. 

Modified: httpcomponents/project/src/site/apt/user-docs.apt
URL: http://svn.apache.org/viewvc/httpcomponents/project/src/site/apt/user-docs.apt?rev=1062780&r1=1062779&r2=1062780&view=diff
==============================================================================
--- httpcomponents/project/src/site/apt/user-docs.apt (original)
+++ httpcomponents/project/src/site/apt/user-docs.apt Mon Jan 24 14:07:00 2011
@@ -82,15 +82,6 @@
     * {{{./httpcomponents-client-ga/tutorial/html/}HttpClient tutorial (GA)}} - 
     Detailed HttpClient API tutorial.
 
-    * {{{./httpcomponents-core-dev/tutorial/html/}HttpCore tutorial (DEV)}} - 
-    Detailed HttpCore API tutorial.
-
-    * {{{./httpcomponents-client-dev/tutorial/html/}HttpClient tutorial (DEV)}} - 
-    Detailed HttpClient API tutorial.
-
-    * {{{./httpcomponents-client-ga/ntlm.html}NTLM support}} -
-    How to enable support for NTLM authentication in HttpClient.
-
     * {{{./httpcomponents-client-ga/logging.html}Logging guide}} -
     How to enable internal context / wire logging in HttpClient.
 
@@ -104,67 +95,37 @@
     
     * {{{./httpcomponents-client-ga/httpmime/apidocs/index.html}HttpMime API (GA)}}
 
-    * {{{./httpcomponents-core-dev/httpcore/apidocs/index.html}HttpCore API (DEV)}}
-    
-    * {{{./httpcomponents-core-dev/httpcore-nio/apidocs/index.html}HttpCore NIO API (DEV)}}
-    
-    * {{{./httpcomponents-client-dev/httpclient/apidocs/index.html}HttpClient API (DEV)}}
-    
-    * {{{./httpcomponents-client-dev/httpmime/apidocs/index.html}HttpMime API (DEV)}}
+    * {{{./httpcomponents-client-ga/httpclient-cache/apidocs/index.html}HttpClient Cache API (GA)}}
 
 * {Example Code}
 
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/4.0.1/httpcore/src/examples/org/apache/http/examples/}
-       HttpCore (GA)}}
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/4.0.1/httpcore-nio/src/examples/org/apache/http/examples/nio/}
-       HttpCore NIO (GA)}}
+    * {{{./httpcomponents-core-ga/examples.html}HttpCore (GA)}}
        
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.0.1/httpclient/src/examples/org/apache/http/examples/client/}
-       HttpClient (GA)}}
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.0.1/httpmime/src/examples/org/apache/http/examples/entity/mime/}
-       HttpMime (GA)}}       
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/4.0.1/httpcore/src/examples/org/apache/http/examples/}
-       HttpCore (DEV)}}
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/4.0.1/httpcore-nio/src/examples/org/apache/http/examples/nio/}
-       HttpCore NIO (DEV)}}
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.0.1/httpclient/src/examples/org/apache/http/examples/client/}
-       HttpClient (DEV)}}
-       
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.0.1/httpmime/src/examples/org/apache/http/examples/entity/mime/}
-       HttpMime (DEV)}}       
+    * {{{./httpcomponents-client-ga/examples.html}HttpClient (GA)}}
        
     Example code is meant to help you understand the API. It is also shipped with releases.
   
 * {Code contributions}
 
-    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/httpcore-contrib/src/main/java/org/apache/http/contrib/}
        HttpCore}}
 
-    Contribution code can provide useful additional functionality or examples.
-    It is <not supported>, and not shipped with releases.
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/}
+       HttpClient}}
 
-* {User contributed documentation}
+    Contribution code can provide useful additional functionality or examples.
+    It is <not supported>, and not shipped with binary release packages.
 
-   * {{{http://wiki.apache.org/HttpComponents/GeneralHttpCoreIntroduction}
-       Building custom HTTP agents based on HttpCore}} -
-   The tutorial provides a general introduction into the HttpCore API and 
-   explains in details how to build a custom HTTP agent based on HttpCore.
-      
 * {Commons HttpClient 3.1 (legacy)}
 
-  * {{{./httpclient-3.x/tutorial.html}Tutorial}} -
+  * {{{./httpclient-legacy/tutorial.html}Tutorial}} -
     Explains how to use HttpClient 3.1 in simple scenarios.
     The concepts still apply to the new HttpClient 4.0,
     but the API has changed completely.
 
-  * {{{./httpclient-3.x/troubleshooting.html}Troubleshooting}} -
+  * {{{./httpclient-legacy/troubleshooting.html}Troubleshooting}} -
     Explains how to avoid common errors, and how to report the uncommon ones.
 
-  * {{{./httpclient-3.x/userguide.html}User Guide}} -
+  * {{{./httpclient-legacy/userguide.html}User Guide}} -
     The HttpClient 3.1 User Guide is a selection of guides for specific topics
     such as Authentication, Multi-Threaded Applications, SSL, and others.