------------------------------------------------------------ revno: 13186 revision-id: squid3@treenet.co.nz-20141031091820-49cfd3q3tsqwt97u parent: squid3@treenet.co.nz-20141031014435-r1bawuy1pdwy2mjv committer: Amos Jeffries branch nick: 3.4 timestamp: Fri 2014-10-31 02:18:20 -0700 message: Fix man(8)/man(1) page syntax It seems automated tools such as lroff are not able to parse the groff syntax accurately for automated indexing of our man pages. The if-conditional syntax was only used to simplify translators lives so we can live with the tools preferred 1-liner syntax for the NAME section. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141031091820-49cfd3q3tsqwt97u # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 5b893a74ae80c13c5564221ee1e341e9ca59cda8 # timestamp: 2014-10-31 09:43:54 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20141031014435-\ # r1bawuy1pdwy2mjv # # Begin patch === modified file 'helpers/basic_auth/LDAP/basic_ldap_auth.8' --- helpers/basic_auth/LDAP/basic_ldap_auth.8 2011-05-04 02:03:34 +0000 +++ helpers/basic_auth/LDAP/basic_ldap_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_ldap_auth 8 "14 January 2005" . .SH NAME -.if !'po4a'hide' .B basic_ldap_auth -.if !'po4a'hide' \- -LDAP authentication helper for Squid +basic_ldap_auth \- LDAP authentication helper for Squid . .SH SYNOPSIS .if !'po4a'hide' .B basic_ldap_auth === modified file 'helpers/basic_auth/NCSA/basic_ncsa_auth.8' --- helpers/basic_auth/NCSA/basic_ncsa_auth.8 2013-04-17 11:58:23 +0000 +++ helpers/basic_auth/NCSA/basic_ncsa_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_ncsa_auth 8 "May 16, 2006" . .SH NAME -.if !'po4a'hide' .B basic_ncsa_auth -.if !'po4a'hide' \- -NCSA httpd-style password file authentication helper for Squid +basic_ncsa_auth \- NCSA httpd-style password file authentication helper for Squid . .SH SYNOPSIS .if !'po4a'hide' .B basic_ncsa_auth === modified file 'helpers/basic_auth/PAM/basic_pam_auth.8' --- helpers/basic_auth/PAM/basic_pam_auth.8 2010-09-17 10:54:47 +0000 +++ helpers/basic_auth/PAM/basic_pam_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_pam_auth 8 "5 Sep 2003" . .SH NAME -.if !'po4a'hide' .B basic_pam_auth -.if !'po4a'hide' \- -Squid PAM Basic authentication helper +basic_pam_auth \- PAM Basic authentication helper for Squid . .SH SYNOPSIS .if !'po4a'hide' .B "basic_pam_auth [\-n \"" === modified file 'helpers/basic_auth/RADIUS/basic_radius_auth.8' --- helpers/basic_auth/RADIUS/basic_radius_auth.8 2012-08-29 13:51:52 +0000 +++ helpers/basic_auth/RADIUS/basic_radius_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_radius_auth 8 "7 August 2004" . .SH NAME -.if !'po4a'hide' .B basic_radius_auth -.if !'po4a'hide' \- -Squid RADIUS authentication helper +basic_radius_auth \- Squid RADIUS authentication helper . .SH SYNOPSIS .if !'po4a'hide' .B basic_radius_auth === modified file 'helpers/basic_auth/SASL/basic_sasl_auth.8' --- helpers/basic_auth/SASL/basic_sasl_auth.8 2010-06-18 12:23:19 +0000 +++ helpers/basic_auth/SASL/basic_sasl_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_sasl_auth 8 . .SH NAME -.if !'po4a'hide' .B basic_sasl_auth -.if !'po4a'hide' \- -Basic Authentication using SASL (specifically the cyrus-sasl authentication method) +basic_sasl_auth \- Basic Authentication using SASL (specifically the cyrus-sasl authentication method) .PP Version 1.0 . === modified file 'helpers/basic_auth/SSPI/basic_sspi_auth.8' --- helpers/basic_auth/SSPI/basic_sspi_auth.8 2011-05-04 02:44:09 +0000 +++ helpers/basic_auth/SSPI/basic_sspi_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_sspi_auth.exe 8 . .SH NAME -.if !'po4a'hide' .B basic_sspi_auth.exe -.if !'po4a'hide' \- -Basic authentication protocol +basic_sspi_auth.exe \- Basic authentication protocol .PP Version 2.0 . === modified file 'helpers/basic_auth/getpwnam/basic_getpwnam_auth.8' --- helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 2010-09-17 10:54:47 +0000 +++ helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH basic_getpwnam_auth 8 . .SH NAME -.if !'po4a'hide' .B basic_getpwnam_auth -.if !'po4a'hide' \- -Local Users auth helper for Squid +basic_getpwnam_auth \- Local Users auth helper for Squid . .SH SYNOPSIS .if !'po4a'hide' .B basic_getpwnam_auth === modified file 'helpers/digest_auth/file/digest_file_auth.8' --- helpers/digest_auth/file/digest_file_auth.8 2010-06-18 12:23:19 +0000 +++ helpers/digest_auth/file/digest_file_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH digest_file_auth 8 . .SH NAME -.if !'po4a'hide' .B digest_file_auth -.if !'po4a'hide' \- -File based digest authentication helper for Squid. +digest_file_auth \- File based digest authentication helper for Squid. .PP Version 1.0 . === modified file 'helpers/external_acl/AD_group/ext_ad_group_acl.8' --- helpers/external_acl/AD_group/ext_ad_group_acl.8 2011-05-04 02:03:34 +0000 +++ helpers/external_acl/AD_group/ext_ad_group_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_ad_group_acl.exe 8 . .SH NAME -.if !'po4a'hide' .B ext_ad_group_acl.exe -.if !'po4a'hide' \- -Squid external ACL helper to check Windows users group membership. +ext_ad_group_acl.exe \- Squid external ACL helper to check Windows users group membership. .PP Version 2.0 . === modified file 'helpers/external_acl/LDAP_group/ext_ldap_group_acl.8' --- helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 2010-09-19 05:21:08 +0000 +++ helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_ldap_group_acl 8 "30 January 2005" . .SH NAME -.if !'po4a'hide' .B ext_ldap_group_acl -.if !'po4a'hide' \- -Squid LDAP external acl group helper +ext_ldap_group_acl \- Squid LDAP external acl group helper .PP Version 2.17 . === modified file 'helpers/external_acl/LM_group/ext_lm_group_acl.8' --- helpers/external_acl/LM_group/ext_lm_group_acl.8 2010-09-16 13:07:02 +0000 +++ helpers/external_acl/LM_group/ext_lm_group_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_lm_group_acl 8 . .SH NAME -.if !'po4a'hide' .B ext_lm_group_acl -.if !'po4a'hide' \- -Squid external ACL helper to check Windows users group membership. +ext_lm_group_acl \- Squid external ACL helper to check Windows users group membership. .PP Version 1.22 . === modified file 'helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8' --- helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 2011-05-04 02:44:09 +0000 +++ helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_edirectory_userip_acl 8 . .SH NAME -.if !'po4a'hide' .B ext_edirectory_userip_acl -.if !'po4a'hide' \- -Squid eDirectory IP Lookup Helper +ext_edirectory_userip_acl \- Squid eDirectory IP Lookup Helper .PP Version 2.0 . === modified file 'helpers/external_acl/file_userip/ext_file_userip_acl.8' --- helpers/external_acl/file_userip/ext_file_userip_acl.8 2011-05-04 02:44:09 +0000 +++ helpers/external_acl/file_userip/ext_file_userip_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_file_userip_acl 8 . .SH NAME -.if !'po4a'hide' .B ext_file_userip_acl -.if !'po4a'hide' \- -Restrict users to certain IP addresses, using a text file backend. +ext_file_userip_acl \- Restrict users to certain IP addresses, using a text file backend. .PP Version 1.0 . === modified file 'helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8' --- helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 2011-05-04 02:44:09 +0000 +++ helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_kerberos_ldap_group_acl 8 . .SH NAME -.if !'po4a'hide' .B ext_kerberos_ldap_group_acl -.if !'po4a'hide' \- -Squid LDAP external acl group helper for Kerberos or NTLM credentials. +ext_kerberos_ldap_group_acl \- Squid LDAP external acl group helper for Kerberos or NTLM credentials. .PP Version 1.3.0sq . === modified file 'helpers/external_acl/session/ext_session_acl.8' --- helpers/external_acl/session/ext_session_acl.8 2013-03-20 21:31:35 +0000 +++ helpers/external_acl/session/ext_session_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_session_acl 8 "9 October 2011" . .SH NAME -.if !'po4a'hide' .B ext_session_acl -.if !'po4a'hide' \- -Squid session tracking external acl helper. +ext_session_acl \- Squid session tracking external acl helper. .PP Version 1.2 . === modified file 'helpers/external_acl/time_quota/ext_time_quota_acl.8' --- helpers/external_acl/time_quota/ext_time_quota_acl.8 2011-05-09 12:42:59 +0000 +++ helpers/external_acl/time_quota/ext_time_quota_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_time_quota_acl 8 "22 March 2011" . .SH NAME -.if !'po4a'hide' .B ext_time_quota_acl -.if !'po4a'hide' \- -Squid time quota external acl helper. +ext_time_quota_acl \- Squid time quota external acl helper. .PP Version 1.0 . === modified file 'helpers/external_acl/unix_group/ext_unix_group_acl.8' --- helpers/external_acl/unix_group/ext_unix_group_acl.8 2010-09-16 13:07:02 +0000 +++ helpers/external_acl/unix_group/ext_unix_group_acl.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ext_unix_group_acl 8 "12 August 2002" . .SH NAME -.if !'po4a'hide' .B ext_unix_group_acl -.if !'po4a'hide' \- -Squid UNIX Group ACL helper +ext_unix_group_acl \- Squid UNIX Group ACL helper . .SH SYNOPSIS .if !'po4a'hide' .B "ext_unix_group_acl [\-d] [\-g " === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8' --- helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 2011-05-04 02:03:34 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH negotiate_kerberos_auth 8 . .SH NAME -.if !'po4a'hide' .B negotiate_kerberos_auth -.if !'po4a'hide' \- -Squid kerberos based authentication helper +negotiate_kerberos_auth \- Squid kerberos based authentication helper .PP Version 3.0.4sq . === modified file 'helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8' --- helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 2011-05-04 02:03:34 +0000 +++ helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 2014-10-31 09:18:20 +0000 @@ -1,10 +1,7 @@ .if !'po4a'hide' .TH ntlm_sspi_auth.exe 8 . .SH NAME -.if !'po4a'hide' .B ntlm_sspi_auth.exe -.if !'po4a'hide' \- -Native Windows NTLM/NTLMv2 authenticator for Squid with -automatic support for NTLM NEGOTIATE packets. +ntlm_sspi_auth.exe \- Native Windows NTLM/NTLMv2 authenticator for Squid .PP Version 1.22 . === modified file 'src/ssl/ssl_crtd.8' --- src/ssl/ssl_crtd.8 2011-12-06 22:44:26 +0000 +++ src/ssl/ssl_crtd.8 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH ssl_crtd 8 . .SH NAME -.if !'po4a'hide' .B ssl_crtd -.if !'po4a'hide' \- -SSL certificate generator. +ssl_crtd \- SSL certificate generator for Squid. .PP Version 1.0 . === modified file 'tools/squidclient.1' --- tools/squidclient.1 2013-04-23 12:25:33 +0000 +++ tools/squidclient.1 2014-10-31 09:18:20 +0000 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH squidclient 1 . .SH NAME -.if !'po4a'hide' .B squidclient -.if !'po4a'hide' \- -A simple HTTP web client tool +squidclient \- A simple HTTP web client tool . .SH SYNOPSIS .if !'po4a'hide' .B squidclient @@ -185,10 +183,11 @@ WWW authentication password . .SH AUTHOR -Derived from Harvest. Further developed by by numerous individuals from -the internet community. Development is led by Duane Wessels of the -National Laboratory for Applied Network Research and funded by -the National Science Foundation. +This program and manual was written by +.if !'po4a'hide' .I Amos Jeffries +.PP +Based on original code derived from Harvest and further developed by +numerous individuals from the internet community. . .SH COPYRIGHT Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+).