aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-12-27 11:09:01 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-12-27 11:31:55 +0000
commit151ae594362460bb4391585a5d408b3b8e3a164d (patch)
tree79971cd65a18403844bfec5f7fc2d56b4330f3e3 /docs
parentbde08d216ca08fc185af2f31e57ebdb5c36f4497 (diff)
code/docs: Use correct case for IPv4 and IPv6
For consistency, as we seem to have a bit of a mixed bag, changed all instances of ipv4 and ipv6 in comments and documentations to use the correct case.
Diffstat (limited to 'docs')
-rw-r--r--docs/FAQ8
-rw-r--r--docs/TODO2
-rw-r--r--docs/examples/asiohiper.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/FAQ b/docs/FAQ
index c505fff2d..043b7bbc1 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1274,7 +1274,7 @@ FAQ
you want to change name resolver function you must rebuild libcurl and tell
it to use a different function.
- - The non-ipv6 resolver that can use one out of four host name resolve calls
+ - The non-IPv6 resolver that can use one out of four host name resolve calls
(depending on what your system supports):
A - gethostbyname()
@@ -1282,15 +1282,15 @@ FAQ
C - gethostbyname_r() with 5 arguments
D - gethostbyname_r() with 6 arguments
- - The ipv6-resolver that uses getaddrinfo()
+ - The IPv6-resolver that uses getaddrinfo()
- The c-ares based name resolver that uses the c-ares library for resolves.
Using this offers asynchronous name resolves.
- The threaded resolver (default option on Windows). It uses:
- A - gethostbyname() on plain ipv4 hosts
- B - getaddrinfo() on ipv6-enabled hosts
+ A - gethostbyname() on plain IPv4 hosts
+ B - getaddrinfo() on IPv6 enabled hosts
Also note that libcurl never resolves or reverse-lookups addresses given as
pure numbers, such as 127.0.0.1 or ::1.
diff --git a/docs/TODO b/docs/TODO
index 5db921174..181d4e8b0 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -135,7 +135,7 @@
Use 'struct lifreq' and SIOCGLIFADDR instead of 'struct ifreq' and
SIOCGIFADDR on newer Solaris versions as they claim the latter is obsolete.
- To support ipv6 interface addresses for network interfaces properly.
+ To support IPv6 interface addresses for network interfaces properly.
1.4 signal-based resolver timeouts
diff --git a/docs/examples/asiohiper.cpp b/docs/examples/asiohiper.cpp
index 44836fdc1..82426792d 100644
--- a/docs/examples/asiohiper.cpp
+++ b/docs/examples/asiohiper.cpp
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 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
@@ -336,7 +336,7 @@ static curl_socket_t opensocket(void *clientp,
curl_socket_t sockfd = CURL_SOCKET_BAD;
- /* restrict to ipv4 */
+ /* restrict to IPv4 */
if (purpose == CURLSOCKTYPE_IPCXN && address->family == AF_INET)
{
/* create a tcp socket object */