Commit 0952c9ab authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http2: call it "HTTP 2" and not 2.0 

The minor version will be dropped for HTTP 2 so it will make sense to
avoid using it in option names etc.
parent 83f52a45

docs/curl.1

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms
@@ -130,8 +130,8 @@ preferred: HTTP 1.1. 
.IP "--http1.1"

(HTTP) Tells curl to use HTTP version 1.1. This is the internal default

version. (Added in 7.33.0)

.IP "--http2.0"

(HTTP) Tells curl to issue its requests using HTTP 2.0. This requires that the

.IP "--http2"

(HTTP) Tells curl to issue its requests using HTTP 2. This requires that the

underlying libcurl was built to support it. (Added in 7.33.0)

.IP "-1, --tlsv1"

(SSL)

src/tool_getparam.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -182,7 +182,7 @@ static const struct LongShort aliases[]= { 
  {"$L", "test-event",               FALSE},

  {"0",   "http1.0",                 FALSE},

  {"01",  "http1.1",                 FALSE},

  {"02",  "http2.0",                 FALSE},

  {"02",  "http2",                   FALSE},

  {"1",  "tlsv1",                    FALSE},

  {"10",  "tlsv1.0",                 FALSE},

  {"11",  "tlsv1.1",                 FALSE},

src/tool_help.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -104,7 +104,7 @@ static const char *const helptext[] = { 
  "Hex encoded MD5 string of the host public key. (SSH)",

  " -0, --http1.0       Use HTTP 1.0 (H)",

  "     --http1.1       Use HTTP 1.1 (H)",

  "     --http2.0       Use HTTP 2.0 (H)",

  "     --http2         Use HTTP 2 (H)",

  "     --ignore-content-length  Ignore the HTTP Content-Length header",

  " -i, --include       Include protocol headers in the output (H/F)",

  " -k, --insecure      Allow connections to SSL sites without certs (H)",