------------------------------------------------------------ revno: 13658 revision-id: squid3@treenet.co.nz-20141113080158-kic511y050sgnkfa parent: squid3@treenet.co.nz-20141031105647-m57ns2n6flfcxv0j committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2014-11-13 00:01:58 -0800 message: squidclient: Fix display errors in man(1) page ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141113080158-kic511y050sgnkfa # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 7e9286f06c7c9e259c06cc79a6d9d64d5ed1567c # timestamp: 2014-11-13 08:04:39 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141031105647-\ # m57ns2n6flfcxv0j # # Begin patch === modified file 'tools/squidclient/squidclient.1' --- tools/squidclient/squidclient.1 2014-10-31 09:12:50 +0000 +++ tools/squidclient/squidclient.1 2014-11-13 08:01:58 +0000 @@ -42,12 +42,14 @@ .if !'po4a'hide' .B "] " url . +.PP .if !'po4a'hide' .B "Ping options: [ \-g" count .if !'po4a'hide' .B "] [ \-I" interval .if !'po4a'hide' .B "] " . +.PP .if !'po4a'hide' .B "TLS options: [ \-\-anonymous\-tls ] [ \-\-trusted\-ca" CA certificates file .if !'po4a'hide' .B "...] [ \-\-cert" @@ -116,7 +118,7 @@ .B squid.conf similar to .I manager - access. Here is an example: +access. Here is an example: .if !'po4a'hide' .nf .if !'po4a'hide' acl purge method PURGE .if !'po4a'hide' http_access deny purge !localhost @@ -133,6 +135,7 @@ WWW Negotiate(Kerberos) authentication. .if !'po4a'hide' .nf Use kinit username@DOMAIN first to get initial TGS. +.if !'po4a'hide' .fi . .if !'po4a'hide' .TP .if !'po4a'hide' .B "\-p port" @@ -209,14 +212,14 @@ .if !'po4a'hide' .I "GnuTLS: http://gnutls.org/manual/html_node/Priority\-Strings.html" If repeated only the last value will have effect. . -.if !'po4a'hide' .TP 10 +.if !'po4a'hide' .TP .if !'po4a'hide' .B "\-\-ping [options]" Enable ping mode. Optional \-g and \-I parameters must follow immediately if used. Repeated use resets to default ping settings. . -.if !'po4a'hide' .TP 12 +.if !'po4a'hide' .TP .if !'po4a'hide' .B "\-g count" -Ping mode, perform +Ping mode, perform\ .I count iterations (default is to loop until interrupted). .