From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 21 Jun 2014 18:03:35 +0000 (+0200)
Subject: opts: the CURLOPT_SSL_ENABLE_*PN options are enabled by default
X-Git-Tag: curl-7_37_1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d618c477fcf147296462266456a43a02a91c06e;p=thirdparty%2Fcurl.git

opts: the CURLOPT_SSL_ENABLE_*PN options are enabled by default
---

diff --git a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3 b/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3
index 687b9bb79a..6716f721c0 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3
+++ b/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3
@@ -28,12 +28,11 @@ CURLOPT_SSL_ENABLE_ALPN \- enable ALPN
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_ENABLE_ALPN, long npn);
 .SH DESCRIPTION
-Pass a long as parameter, 0 or 1 where 1 is for enable and 0 for disable. By
-default, libcurl assumes a value of 1. This option enables/disables ALPN in
-the SSL handshake (if the SSL backend libcurl is built to use supports it),
-which can be used to negotiate http2.
+Pass a long as parameter, 0 or 1 where 1 is for enable and 0 for disable. This
+option enables/disables ALPN in the SSL handshake (if the SSL backend libcurl
+is built to use supports it), which can be used to negotiate http2.
 .SH DEFAULT
-0
+1, enabled
 .SH PROTOCOLS
 HTTP
 .SH EXAMPLE
diff --git a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3 b/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3
index a4fb4fb122..5db9b510bd 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3
+++ b/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3
@@ -28,12 +28,11 @@ CURLOPT_SSL_ENABLE_NPN \- enable NPN
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_ENABLE_NPN, long npn);
 .SH DESCRIPTION
-Pass a long as parameter, 0 or 1 where 1 is for enable and 0 for disable. By
-default, libcurl assumes a value of 1. This option enables/disables NPN in the
-SSL handshake (if the SSL backend libcurl is built to use supports it), which
-can be used to negotiate http2.
+Pass a long as parameter, 0 or 1 where 1 is for enable and 0 for disable. This
+option enables/disables NPN in the SSL handshake (if the SSL backend libcurl
+is built to use supports it), which can be used to negotiate http2.
 .SH DEFAULT
-0
+1, enabled
 .SH PROTOCOLS
 HTTP
 .SH EXAMPLE