Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C0CECD8B3 for ; Wed, 12 Sep 2012 09:29:01 +0000 (UTC) Received: (qmail 52899 invoked by uid 500); 12 Sep 2012 09:28:58 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 52758 invoked by uid 500); 12 Sep 2012 09:28:58 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 52076 invoked by uid 99); 12 Sep 2012 09:28:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Sep 2012 09:28:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Sep 2012 09:28:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 64BC0238899C for ; Wed, 12 Sep 2012 09:28:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1383865 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn: scheme/Scheme.java ssl/SSLSocketFactory.java Date: Wed, 12 Sep 2012 09:28:13 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120912092813.64BC0238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Wed Sep 12 09:28:12 2012 New Revision: 1383865 URL: http://svn.apache.org/viewvc?rev=1383865&view=rev Log: HTTPCLIENT-1231, HTTPCLIENT-1232: javadoc fixes Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=1383865&r1=1383864&r2=1383865&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Wed Sep 12 09:28:12 2012 @@ -36,11 +36,12 @@ import org.apache.http.util.LangUtils; * Encapsulates specifics of a protocol scheme such as "http" or "https". Schemes are identified * by lowercase names. Supported schemes are typically collected in a {@link SchemeRegistry * SchemeRegistry}. - *

+ *

* For example, to configure support for "https://" URLs, you could write code like the following: *

  * Scheme https = new Scheme("https", 443, new MySecureSocketFactory());
- * SchemeRegistry.DEFAULT.register(https);
+ * SchemeRegistry registry = new SchemeRegistry();
+ * registry.register(https);
  * 
* * @since 4.0 Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1383865&r1=1383864&r2=1383865&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Wed Sep 12 09:28:12 2012 @@ -178,7 +178,7 @@ public class SSLSocketFactory implements /** * Gets the default factory, which uses system properties for initializing the SSL context * as described in - * + * * "JavaTM Secure Socket Extension (JSSE) Reference Guide for the JavaTM 2 Platform * Standard Edition 5 *