diff options
author | Steve Holme <steve_holme@hotmail.com> | 2014-12-26 20:45:21 +0000 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2014-12-26 21:42:44 +0000 |
commit | 1abe65d928440b3b23d25746b966dd4169c358b9 (patch) | |
tree | a486ff20aee5dda2a65401d4e6da76852fedf354 /docs/libcurl | |
parent | b7f740f2fc6c9b5e96ccbc013aeaae4093a9f1ed (diff) |
code/docs: Use Unix rather than UNIX to avoid use of the trademark
Use Unix when generically writing about Unix based systems as UNIX is
the trademark and should only be used in a particular product's name.
Diffstat (limited to 'docs/libcurl')
-rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 2 | ||||
-rw-r--r-- | docs/libcurl/curl_version_info.3 | 2 | ||||
-rw-r--r-- | docs/libcurl/libcurl-tutorial.3 | 6 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 71f681b70..ecfa38f39 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -188,7 +188,7 @@ Idle time before sending keep-alive. See \fICURLOPT_TCP_KEEPIDLE(3)\fP .IP CURLOPT_TCP_KEEPINTVL Interval between keep-alive probes. See \fICURLOPT_TCP_KEEPINTVL(3)\fP .IP CURLOPT_UNIX_SOCKET_PATH -Path to a UNIX domain socket. See \fICURLOPT_UNIX_SOCKET_PATH(3)\fP +Path to a Unix domain socket. See \fICURLOPT_UNIX_SOCKET_PATH(3)\fP .SH NAMES and PASSWORDS OPTIONS (Authentication) .IP CURLOPT_NETRC Enable .netrc parsing. See \fICURLOPT_NETRC(3)\fP diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3 index 6e553463e..1b8f9c119 100644 --- a/docs/libcurl/curl_version_info.3 +++ b/docs/libcurl/curl_version_info.3 @@ -147,7 +147,7 @@ libcurl was built with support for NTLM delegation to a winbind helper. libcurl was built with support for HTTP2. (Added in 7.33.0) .IP CURL_VERSION_UNIX_SOCKETS -libcurl was built with support for UNIX domain sockets. +libcurl was built with support for Unix domain sockets. (Added in 7.40.0) .RE \fIssl_version\fP is an ASCII string for the OpenSSL version used. If libcurl diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3 index d496e7027..11b019011 100644 --- a/docs/libcurl/libcurl-tutorial.3 +++ b/docs/libcurl/libcurl-tutorial.3 @@ -40,7 +40,7 @@ refer to their respective man pages. .SH "Building" There are many different ways to build C programs. This chapter will assume a -UNIX-style build process. If you use a different build system, you can still +Unix style build process. If you use a different build system, you can still read this to get general information that may apply to your environment as well. .IP "Compiling the Program" @@ -412,7 +412,7 @@ similar to the \fICURLOPT_USERPWD(3)\fP option like this: curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "myname:thesecret"); -There's a long time UNIX "standard" way of storing ftp user names and +There's a long time Unix "standard" way of storing FTP user names and passwords, namely in the $HOME/.netrc file. The file should be made private so that only the user may read it (see also the "Security Considerations" chapter), as it might contain the password in plain text. libcurl has the @@ -1402,7 +1402,7 @@ This happens on Windows machines when libcurl is built and used as a DLL. However, you can still do this on Windows if you link with a static library. .IP "[3]" -The curl-config tool is generated at build-time (on UNIX-like systems) and +The curl-config tool is generated at build-time (on Unix-like systems) and should be installed with the 'make install' or similar instruction that installs the library, header files, man pages etc. .IP "[4]" diff --git a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 index f65676364..a659cd2ca 100644 --- a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 +++ b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 @@ -22,18 +22,18 @@ .\" .TH CURLOPT_UNIX_SOCKET_PATH 3 "09 Oct 2014" "libcurl 7.40.0" "curl_easy_setopt options" .SH NAME -CURLOPT_UNIX_SOCKET_PATH \- set UNIX domain socket +CURLOPT_UNIX_SOCKET_PATH \- set Unix domain socket .SH SYNOPSIS #include <curl/curl.h> CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UNIX_SOCKET_PATH, char *path); .SH DESCRIPTION -Enables the use of UNIX domain sockets as connection endpoint and sets the path -to \fIpath\fP. If \fIpath\fP is NULL, then UNIX domain sockets are disabled. An +Enables the use of Unix domain sockets as connection endpoint and sets the path +to \fIpath\fP. If \fIpath\fP is NULL, then Unix domain sockets are disabled. An empty string will result in an error at some point, it will not disable use of -UNIX domain sockets. +Unix domain sockets. -When enabled, cURL will connect to the UNIX domain socket instead of +When enabled, cURL will connect to the Unix domain socket instead of establishing a TCP connection to a host. Since no TCP connection is created, cURL does not need to resolve the DNS hostname in the URL. @@ -45,9 +45,9 @@ Proxy and TCP options such as are not supported. Proxy options such as .BR CURLOPT_PROXY "(3) have no effect either as these are TCP-oriented, and asking a proxy server to -connect to a certain UNIX domain socket is not possible. +connect to a certain Unix domain socket is not possible. .SH DEFAULT -Default is NULL, meaning that no UNIX domain sockets are used. +Default is NULL, meaning that no Unix domain sockets are used. .SH PROTOCOLS All protocols except for file:// and FTP are supported in theory. HTTP, IMAP, POP3 and SMTP should in particular work (including their SSL/TLS variants). |