diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-01-30 16:32:03 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-01-30 16:59:35 +0100 |
| commit | 0952c9abccce1dd8ee19a53d38570a2515df70a9 (patch) | |
| tree | 7cdd2d956e135238992b70708ee39d8380862387 | |
| parent | 83f52a455fde40a360238c63d9976b03f941e1d0 (diff) | |
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.
| -rw-r--r-- | docs/curl.1 | 6 | ||||
| -rw-r--r-- | src/tool_getparam.c | 4 | ||||
| -rw-r--r-- | src/tool_help.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index 32ae92a8d..94f4cd845 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -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) diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 542bea022..dcb358411 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -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}, diff --git a/src/tool_help.c b/src/tool_help.c index f7aebf322..ac2e7ae5f 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -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)", |