From: Sven Hoexter Date: Sat, 2 Jun 2012 18:14:00 +0000 (+0200) Subject: Another round of manpage fixes and associated patch refreshes. X-Git-Tag: debian/7.22.0-1~1 X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Ftclcurl.git;a=commitdiff_plain;h=0affa503c758e11e6abd8680ac0ff8ec0a3897f3 Another round of manpage fixes and associated patch refreshes. --- diff --git a/debian/patches/man-hyphen-as-minus b/debian/patches/man-hyphen-as-minus index 4285838..0a355c1 100644 --- a/debian/patches/man-hyphen-as-minus +++ b/debian/patches/man-hyphen-as-minus @@ -19,7 +19,7 @@ Fix several hyphen-as-minus problems flagged by lintian. cached entries remain forever. By default, TclCurl caches this info for 60 seconds. The name resolve functions of various libc implementations don't re-read name -@@ -761,7 +761,7 @@ is meaningful only when setting \fB-f +@@ -762,7 +762,7 @@ is meaningful only when setting \fB-f Sets the redirection limit. If that many redirections have been followed, the next redirect will cause an error. This option only makes sense if the \fB-followlocation\fP option is used at the same time. Setting the limit @@ -28,7 +28,7 @@ Fix several hyphen-as-minus problems flagged by lintian. number of redirects (which is the default) .TP -@@ -1341,7 +1341,7 @@ Pass the offset in number of bytes that +@@ -1342,7 +1342,7 @@ Pass the offset in number of bytes that Set this option to 0 to make the transfer start from the beginning (effectively disabling resume). @@ -37,7 +37,16 @@ Fix several hyphen-as-minus problems flagged by lintian. target file (useful to continue an interrupted upload). When doing uploads with FTP, the resume position is where in the local/source -@@ -2077,7 +2077,7 @@ Internal error. A function was called wi +@@ -1537,7 +1537,7 @@ HOST+PORT will instead use your provided + + You can remove names from the DNS cache again, to stop providing these fake + resolves, by including a string in the linked list that uses the format +-"-HOST:PORT". The host name must be prefixed with a dash, and the host name ++"\-HOST:PORT". The host name must be prefixed with a dash, and the host name + and port number must exactly match what was already added previously. + + .TP +@@ -2078,7 +2078,7 @@ Internal error. A function was called wi Interface error. A specified outgoing interface could not be used. .IP 47 Too many redirects. When following redirects, TclCurl hit the maximum amount, set @@ -46,7 +55,7 @@ Fix several hyphen-as-minus problems flagged by lintian. .IP 48 An option passed to TclCurl is not recognized/known. Refer to the appropriate documentation. This is most likely a problem in the program that uses -@@ -2186,7 +2186,7 @@ Returns the last received proxy response +@@ -2187,7 +2187,7 @@ Returns the last received proxy response .TP .B filetime Returns the remote time of the retrieved document (in number of seconds @@ -55,7 +64,7 @@ Fix several hyphen-as-minus problems flagged by lintian. it can be because of many reasons (unknown, the server hides it or the server doesn't support the command that tells document time etc) and the time of the document is unknown. -@@ -2303,7 +2303,7 @@ requests. Note that this may be more tha +@@ -2304,7 +2304,7 @@ requests. Note that this may be more tha .TP .B sslverifyresult Returns the result of the certification verification that was requested @@ -64,6 +73,15 @@ Fix several hyphen-as-minus problems flagged by lintian. .TP .B sslengines +@@ -2316,7 +2316,7 @@ engines may be available at run-time. + .B contentlengthdownload + Returns the content-length of the download. This is the value read from the + .B Content-Length: +-field. If the size isn't known, it returns -1. ++field. If the size isn't known, it returns \-1. + + .TP + .B contentlengthupload --- a/doc/tclcurl_multi.n +++ b/doc/tclcurl_multi.n @@ -186,7 +186,7 @@ you can use the diff --git a/debian/patches/man-spelling b/debian/patches/man-spelling index 56e6ca0..f607600 100644 --- a/debian/patches/man-spelling +++ b/debian/patches/man-spelling @@ -28,7 +28,7 @@ Fix a few spelling issue flagged by lintian. one it finds most secure. .RE -@@ -971,7 +971,7 @@ a single option and thus you need to con +@@ -972,7 +972,7 @@ a single option and thus you need to con Set multiple cookies in one string like this: "name1=content1; name2=content2;" etc. @@ -37,7 +37,7 @@ Fix a few spelling issue flagged by lintian. If multiple requests are done due to authentication, followed redirections or similar, they will all get this cookie passed on. -@@ -1467,7 +1467,7 @@ than or equal to the parameter value. De +@@ -1468,7 +1468,7 @@ than or equal to the parameter value. De .TP .B -maxconnects @@ -46,7 +46,7 @@ Fix a few spelling issue flagged by lintian. persistent conecctions. The set amount will be the maximum amount of simultaneous connections that TclCurl may cache in this easy handle. Default is 5, and there isn't much point in changing this value unless you are perfectly aware of how this -@@ -2412,7 +2412,7 @@ to pause the transfer. +@@ -2413,7 +2413,7 @@ to pause the transfer. Resumes a transfer paused with \fBcurlhandle pause\fP .SH curl::transfer diff --git a/debian/patches/reformat-tclcurl3 b/debian/patches/reformat-tclcurl3 index cc33d23..887d70d 100644 --- a/debian/patches/reformat-tclcurl3 +++ b/debian/patches/reformat-tclcurl3 @@ -1,7 +1,35 @@ Fix some formating errors in the manpages. --- a/doc/tclcurl.n +++ b/doc/tclcurl.n -@@ -961,10 +961,10 @@ response will be treated as a valid HTTP +@@ -347,7 +347,7 @@ allows you to have a TclCurl built to su + specific transfers to only be allowed to use a subset of them. + + Accepted protocols are 'http', 'https', 'ftp', 'ftps', 'scp', 'sftp', 'telnet', 'ldap', +-'ldaps','dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' ++\&'ldaps', 'dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' + and 'all'. + + .TP +@@ -402,7 +402,7 @@ the proxy string by \fB-proxy\fP. If not + .TP + .B -proxytype + Pass the type of the proxy. Available options are 'http', 'http1.0', 'socks4', 'socks4a', +-'socks5' and 'socks5h', with the HTTP one being the default. ++\&'socks5' and 'socks5h', with the HTTP one being the default. + + If you set it to \fIhttp1.0\fP, it will only affect how libcurl speaks to a proxy + when CONNECT is used. The HTTP version used for "regular" HTTP requests is instead +@@ -661,7 +661,8 @@ It may use anything but basic, TclCurl w + one it finds most secure. + .RE + +-.TP -tlsauthtype ++.TP ++.B -tlsauthtype + Use it to tell TclCurl which authentication method(s) you want it to use for TLS authentication. + .RS + .TP 5 +@@ -961,10 +962,10 @@ response will be treated as a valid HTTP .TP .B -cookie @@ -16,7 +44,7 @@ Fix some formating errors in the manpages. If you need to set mulitple cookies, you need to set them all using a single option and thus you need to concatenate them all in one single string. -@@ -1771,7 +1771,7 @@ are also acceptable separators but colon +@@ -1771,7 +1772,7 @@ are also acceptable separators but colon used as operators. For OpenSSL and GnuTLS valid examples of cipher lists include 'RC4-SHA', 'SHA1+DES', @@ -25,7 +53,16 @@ Fix some formating errors in the manpages. You will find more details about cipher lists on this URL: http://www.openssl.org/docs/apps/ciphers.html -@@ -1976,7 +1976,7 @@ same handle. Let it return first before +@@ -1781,7 +1782,7 @@ etc. With NSS you don't add/remove ciphe + ciphers are disabled and only those passed in are enabled. + + You'll find more details about the NSS cipher lists on this URL: +- http://directory.fedora.redhat.com/docs/mod_nss.html ++ + + .TP + .B -sslsessionidcache +@@ -1976,7 +1977,7 @@ same handle. Let it return first before you want parallel transfers, you must use several curl handles. .TP .B RETURN VALUE