Just some minor updates to add angle brackets where appropriate and fix a few spellos/typos.
Please apply. Brad
From e7c3a650c0a8fdf1fd09aa643e7dfc4bb87cc084 Mon Sep 17 00:00:00 2001 From: Brad Hards <[email protected]> Date: Sat, 25 Dec 2010 11:54:41 +1100 Subject: [PATCH 1/3] Add angle brackets to addresses in easy SMTP examples, as for smtp-multi example. --- docs/examples/simplesmtp.c | 4 ++-- docs/examples/smtp-tls.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/examples/simplesmtp.c b/docs/examples/simplesmtp.c index 4144ed6..0c1f7ff 100644 --- a/docs/examples/simplesmtp.c +++ b/docs/examples/simplesmtp.c @@ -18,10 +18,10 @@ int main(void) struct curl_slist *recipients = NULL; /* value for envelope reverse-path */ - static const char *from = "[email protected]"; + static const char *from = "<[email protected]>"; /* this becomes the envelope forward-path */ - static const char *to = "[email protected]"; + static const char *to = "<[email protected]>"; curl = curl_easy_init(); if(curl) { diff --git a/docs/examples/smtp-tls.c b/docs/examples/smtp-tls.c index 97119c5..2769088 100644 --- a/docs/examples/smtp-tls.c +++ b/docs/examples/smtp-tls.c @@ -16,9 +16,9 @@ * authentication and transport security. */ -#define FROM "[email protected]" -#define TO "[email protected]" -#define CC "[email protected]" +#define FROM "<[email protected]>" +#define TO "<[email protected]>" +#define CC "<[email protected]>" static const char *payload_text[]={ "Date: Mon, 29 Nov 2010 21:54:29 +1100\n", -- 1.7.0.4
From f25b7f5fa9fbcea341e1113f90f8c35c31b4942c Mon Sep 17 00:00:00 2001 From: Brad Hards <[email protected]> Date: Sat, 25 Dec 2010 11:56:04 +1100 Subject: [PATCH 2/3] Use angle address, as for the rest of the example. Also spelling fix for RECIPIENT #define. --- docs/examples/smtp-multi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c index e13108a..4d1dfc4 100644 --- a/docs/examples/smtp-multi.c +++ b/docs/examples/smtp-multi.c @@ -21,7 +21,7 @@ #define SMTPSERVER "smtp.example.com" #define SMTPPORT ":587" /* it is a colon+port string, but you can set it to "" to use the default port */ -#define RECEPIENT "<[email protected]>" +#define RECIPIENT "<[email protected]>" #define MAILFROM "<[email protected]>" #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 @@ -99,9 +99,9 @@ int main(void) if(!mcurl) return 2; - rcpt_list = curl_slist_append(rcpt_list, RECEPIENT); + rcpt_list = curl_slist_append(rcpt_list, RECIPIENT); /* more addresses can be added here - rcpt_list = curl_slist_append(rcpt_list, "[email protected]"); + rcpt_list = curl_slist_append(rcpt_list, "<[email protected]>"); */ curl_easy_setopt(curl, CURLOPT_URL, "smtp://" SMTPSERVER SMTPPORT); -- 1.7.0.4
From 8cc49f7ab338765cc0757220627bc16d353d8aaa Mon Sep 17 00:00:00 2001 From: Brad Hards <[email protected]> Date: Sat, 25 Dec 2010 12:13:43 +1100 Subject: [PATCH 3/3] Typo / spelling fixes. --- docs/CONTRIBUTE | 2 +- docs/curl.1 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/CONTRIBUTE b/docs/CONTRIBUTE index db03c42..2e20d41 100644 --- a/docs/CONTRIBUTE +++ b/docs/CONTRIBUTE @@ -189,7 +189,7 @@ 3.2 How To Make a Patch with git - You need to first checkout the respository: + You need to first checkout the repository: git clone git://github.com/bagder/curl.git diff --git a/docs/curl.1 b/docs/curl.1 index 95614c6..e8216d4 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -427,7 +427,7 @@ server. The method argument should be one of the following alternatives: .RS .IP multicwd curl does a single CWD operation for each path part in the given URL. For deep -hierarchies this means very many commands. This is how RFC1738 says it should +hierarchies this means very many commands. This is how RFC 1738 says it should be done. This is the default but the slowest behavior. .IP nocwd curl does no CWD at all. curl will do SIZE, RETR, STOR etc and give a full @@ -439,7 +439,7 @@ compliant than 'nocwd' but without the full penalty of 'multicwd'. .RE (Added in 7.15.1) .IP "--ftp-pasv" -(FTP) Use passive mode for the data conection. Passive is the internal default +(FTP) Use passive mode for the data connection. Passive is the internal default behavior, but using this option can be used to override a previous \fI-P/-ftp-port\fP option. (Added in 7.11.0) @@ -501,7 +501,7 @@ waits for a reply from the server. .IP "-F/--form <name=content>" (HTTP) This lets curl emulate a filled-in form in which a user has pressed the submit button. This causes curl to POST data using the Content-Type -multipart/form-data according to RFC2388. This enables uploading of binary +multipart/form-data according to RFC 2388. This enables uploading of binary files etc. To force the 'content' part to be a file, prefix the file name with an @ sign. To just get the content part from a file, prefix the file name with the symbol <. The difference between @ and < is then that @ makes a file @@ -1051,7 +1051,7 @@ just before the transfer command(s), prefix the command with a '+' (this is only supported for FTP). You may specify any number of commands. If the server returns failure for one of the commands, the entire operation will be aborted. You must send syntactically correct FTP commands as -RFC959 defines to FTP servers, or one of the commands listed below to +RFC 959 defines to FTP servers, or one of the commands listed below to SFTP servers. This option can be used multiple times. SFTP is a binary protocol. Unlike for FTP, libcurl interprets SFTP quote @@ -1241,7 +1241,7 @@ sockd/proxy-name sockd/real-name for cases where the proxy-name does not match the princpal name. (Added in 7.19.4). .IP "--socks5-gssapi-nec" -As part of the gssapi negotiation a protection mode is negotiated. The rfc1961 +As part of the gssapi negotiation a protection mode is negotiated. RFC 1961 says in section 4.3/4.4 it should be protected, but the NEC reference implementation does not. The option \fI--socks5-gssapi-nec\fP allows the unprotected exchange of the protection mode negotiation. (Added in 7.19.4). -- 1.7.0.4
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
