From: Amos Jeffries Date: Fri, 31 Oct 2014 09:18:20 +0000 (-0700) Subject: Fix man(8)/man(1) page syntax X-Git-Tag: SQUID_3_4_9~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34634593cf2c561e7c60efcfc7427b39aceddc14;p=thirdparty%2Fsquid.git 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. --- diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.8 b/helpers/basic_auth/LDAP/basic_ldap_auth.8 index eb648c5bb9..c0e366a090 100644 --- a/helpers/basic_auth/LDAP/basic_ldap_auth.8 +++ b/helpers/basic_auth/LDAP/basic_ldap_auth.8 @@ -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 diff --git a/helpers/basic_auth/NCSA/basic_ncsa_auth.8 b/helpers/basic_auth/NCSA/basic_ncsa_auth.8 index 1d7f32696b..1d2f793423 100644 --- a/helpers/basic_auth/NCSA/basic_ncsa_auth.8 +++ b/helpers/basic_auth/NCSA/basic_ncsa_auth.8 @@ -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 diff --git a/helpers/basic_auth/PAM/basic_pam_auth.8 b/helpers/basic_auth/PAM/basic_pam_auth.8 index ff9508a420..1c53794c49 100644 --- a/helpers/basic_auth/PAM/basic_pam_auth.8 +++ b/helpers/basic_auth/PAM/basic_pam_auth.8 @@ -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 \"" diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.8 b/helpers/basic_auth/RADIUS/basic_radius_auth.8 index 7d5679489c..c98d12c9e5 100644 --- a/helpers/basic_auth/RADIUS/basic_radius_auth.8 +++ b/helpers/basic_auth/RADIUS/basic_radius_auth.8 @@ -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 diff --git a/helpers/basic_auth/SASL/basic_sasl_auth.8 b/helpers/basic_auth/SASL/basic_sasl_auth.8 index f551d15cde..b6b6817341 100644 --- a/helpers/basic_auth/SASL/basic_sasl_auth.8 +++ b/helpers/basic_auth/SASL/basic_sasl_auth.8 @@ -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 . diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.8 b/helpers/basic_auth/SSPI/basic_sspi_auth.8 index 284d2e849f..6c84b50d3d 100644 --- a/helpers/basic_auth/SSPI/basic_sspi_auth.8 +++ b/helpers/basic_auth/SSPI/basic_sspi_auth.8 @@ -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 . diff --git a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 b/helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 index 2e84a65781..ce57ea85be 100644 --- a/helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 +++ b/helpers/basic_auth/getpwnam/basic_getpwnam_auth.8 @@ -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 diff --git a/helpers/digest_auth/file/digest_file_auth.8 b/helpers/digest_auth/file/digest_file_auth.8 index 3342ef81bd..dee7c8921d 100644 --- a/helpers/digest_auth/file/digest_file_auth.8 +++ b/helpers/digest_auth/file/digest_file_auth.8 @@ -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 . diff --git a/helpers/external_acl/AD_group/ext_ad_group_acl.8 b/helpers/external_acl/AD_group/ext_ad_group_acl.8 index 1c19845046..e3e23e83d7 100644 --- a/helpers/external_acl/AD_group/ext_ad_group_acl.8 +++ b/helpers/external_acl/AD_group/ext_ad_group_acl.8 @@ -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 . diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 index 1aab94b2a8..628f63c685 100644 --- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 +++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 @@ -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 . diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.8 b/helpers/external_acl/LM_group/ext_lm_group_acl.8 index af3084d8f7..8b35f85381 100644 --- a/helpers/external_acl/LM_group/ext_lm_group_acl.8 +++ b/helpers/external_acl/LM_group/ext_lm_group_acl.8 @@ -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 . diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 index 36b187e98c..1bd8306339 100644 --- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 +++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 @@ -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 . diff --git a/helpers/external_acl/file_userip/ext_file_userip_acl.8 b/helpers/external_acl/file_userip/ext_file_userip_acl.8 index eec2d8fb49..5f273e44cc 100644 --- a/helpers/external_acl/file_userip/ext_file_userip_acl.8 +++ b/helpers/external_acl/file_userip/ext_file_userip_acl.8 @@ -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 . diff --git a/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 b/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 index 87b1d26b8a..2d76c9a8b5 100644 --- a/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 +++ b/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 @@ -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 . diff --git a/helpers/external_acl/session/ext_session_acl.8 b/helpers/external_acl/session/ext_session_acl.8 index aba3b0229f..116199df37 100644 --- a/helpers/external_acl/session/ext_session_acl.8 +++ b/helpers/external_acl/session/ext_session_acl.8 @@ -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 . diff --git a/helpers/external_acl/time_quota/ext_time_quota_acl.8 b/helpers/external_acl/time_quota/ext_time_quota_acl.8 index c53f6a7a69..cb9cb621a2 100644 --- a/helpers/external_acl/time_quota/ext_time_quota_acl.8 +++ b/helpers/external_acl/time_quota/ext_time_quota_acl.8 @@ -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 . diff --git a/helpers/external_acl/unix_group/ext_unix_group_acl.8 b/helpers/external_acl/unix_group/ext_unix_group_acl.8 index 6ff4b18212..27ce24e6d8 100644 --- a/helpers/external_acl/unix_group/ext_unix_group_acl.8 +++ b/helpers/external_acl/unix_group/ext_unix_group_acl.8 @@ -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 " diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 index ad332c53fd..3f96ff1a78 100644 --- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 +++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 @@ -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 . diff --git a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 b/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 index 0ff47745e2..961ee25430 100644 --- a/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 +++ b/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.8 @@ -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 . diff --git a/src/ssl/ssl_crtd.8 b/src/ssl/ssl_crtd.8 index 778f209f92..8db46f8349 100644 --- a/src/ssl/ssl_crtd.8 +++ b/src/ssl/ssl_crtd.8 @@ -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 . diff --git a/tools/squidclient.1 b/tools/squidclient.1 index f34fe0fb67..326a377903 100644 --- a/tools/squidclient.1 +++ b/tools/squidclient.1 @@ -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 @@ Proxy authentication password 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+).