aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2011-09-22 19:47:45 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-09-28 23:31:37 +0200
commit57fffa728b4f34fbf2e2b431ba788287239248f4 (patch)
tree39bb646456f98bb8a046ab441f9d7fc240e63ef8 /docs
parent421a46027821119e2ab76d28016b9763b13848d2 (diff)
curl_easy_setopt: A brief tidy up
Slight rewording of the CURLOPT_URL SMTP sub-section. Corrected the incorrect use of hyphens on the three uses of "zero-terminated" with "zero terminated" to match the rest of the document. Corrected the use of an out of place hyphen in CURLOPT_NOPROXY section.
Diffstat (limited to 'docs')
-rw-r--r--docs/libcurl/curl_easy_setopt.316
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 9f6f11d89..7ef0d8790 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -678,11 +678,11 @@ from the root directory when logging in as a specified user.
The path part of a SMTP request specifies the host name to present during
communication with the mail server. If the path is omitted then libcurl will
-attempt to to resolve the local computer's host name. However, that will not
+attempt to to resolve the local computer's host name. However, this will not
return the fully qualified domain name that is required by some mail servers
-and specifing this path allows you to specify an alternative name such as your
-machine's fully qualified domain name which you might have obtained from an
-external function such as gethostname or getaddrinfo.
+and specifing this path allows you to specify an alternative name, such as
+your machine's fully qualified domain name, which you might have obtained
+from an external function such as gethostname or getaddrinfo.
smtp://mail.domain.com - This connects to the mail server at domain.com and
sends your local computer's host name in the HELO / EHLO command.
@@ -765,7 +765,7 @@ affect how libcurl speaks to a proxy when CONNECT is used. The HTTP version
used for "regular" HTTP requests is instead controled with
\fICURLOPT_HTTP_VERSION\fP.
.IP CURLOPT_NOPROXY
-Pass a pointer to a zero terminated string. The should be a comma- separated
+Pass a pointer to a zero terminated string. The should be a comma separated
list of hosts which do not use a proxy, if one is specified. The only
wildcard is a single * character, which matches all hosts, and effectively
disables the proxy. Each name in this list is matched as either a domain which
@@ -1029,12 +1029,12 @@ You need to build libcurl with GnuTLS or OpenSSL with TLS-SRP support for this
to work. (Added in 7.21.4)
.RE
.IP CURLOPT_TLSAUTH_USERNAME
-Pass a char * as parameter, which should point to the zero-terminated username
+Pass a char * as parameter, which should point to the zero terminated username
to use for the TLS authentication method specified with the
\fICURLOPT_TLSAUTH_TYPE\fP option. Requires that the
\fICURLOPT_TLS_PASSWORD\fP option also be set. (Added in 7.21.4)
.IP CURLOPT_TLSAUTH_PASSWORD
-Pass a char * as parameter, which should point to the zero-terminated password
+Pass a char * as parameter, which should point to the zero terminated password
to use for the TLS authentication method specified with the
\fICURLOPT_TLSAUTH_TYPE\fP option. Requires that the
\fICURLOPT_TLS_USERNAME\fP option also be set. (Added in 7.21.4)
@@ -1567,7 +1567,7 @@ a reply.
Initiate the shutdown and wait for a reply.
.RE
.IP CURLOPT_FTP_ACCOUNT
-Pass a pointer to a zero-terminated string (or NULL to disable). When an FTP
+Pass a pointer to a zero terminated string (or NULL to disable). When an FTP
server asks for "account data" after user name and password has been provided,
this data is sent off using the ACCT command. (Added in 7.13.0)
.IP CURLOPT_FTP_FILEMETHOD