From: Amos Jeffries Date: Wed, 4 May 2011 02:44:09 +0000 (+1200) Subject: Docs: spelling and syntax in manuals X-Git-Tag: take07~16^2~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10228f687cd4d8594a8ed3e74a33cb8d63386690;p=thirdparty%2Fsquid.git Docs: spelling and syntax in manuals --- diff --git a/doc/manuals/en.po b/doc/manuals/en.po index e3aaed9734..074700e5ef 100644 --- a/doc/manuals/en.po +++ b/doc/manuals/en.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: Squid-3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-05-04 13:58+1200\n" -"PO-Revision-Date: 2011-05-04 03:59+0200\n" +"PO-Revision-Date: 2011-05-04 04:34+0200\n" "Last-Translator: Amos \n" "Language-Team: Squid Developers \n" "Language: en\n" @@ -895,6 +895,8 @@ msgid "" "Specity the LDAP server to connect to by LDAP URI (requires OpenLDAP " "libraries). Servers can also be specified last on the command line." msgstr "" +"Specity the LDAP server to connect to by LDAP URI (requires OpenLDAP " +"libraries). Servers can also be specified last on the command line." #. type: Plain text #: helpers/basic_auth/LDAP/basic_ldap_auth.8:206 @@ -912,6 +914,9 @@ msgid "" "than the default LDAP port 389. Can also be specified within the server " "specification by using servername:port syntax." msgstr "" +"Specify an alternate TCP port where the LDAP server is listening if other " +"than the default LDAP port 389. Can also be specified within the server " +"specification by using servername:port syntax." #. type: Plain text #: helpers/basic_auth/LDAP/basic_ldap_auth.8:218 @@ -973,6 +978,9 @@ msgid "" "locate your user DNs as these can no longer be constructed directly from the " "base DN and login name alone:" msgstr "" +"If you have sub-domains then you need to use a search filter approach to " +"locate your user DNs as these can no longer be constructed directly from the " +"base DN and login name alone:" #. type: Plain text #: helpers/basic_auth/LDAP/basic_ldap_auth.8:263 @@ -980,6 +988,8 @@ msgid "" "And similarly if you only want to allow access to users having a specific " "attribute" msgstr "" +"And similarly if you only want to allow access to users having a specific " +"attribute" #. type: Plain text #: helpers/basic_auth/LDAP/basic_ldap_auth.8:274 @@ -2006,6 +2016,8 @@ msgid "" "It is possible to enable case insensitive group name comparison ( B<-c> ), " "but on some non-English locales, the results can be unexpected." msgstr "" +"It is possible to enable case insensitive group name comparison ( B<-c> ), " +"but on some non-English locales, the results can be unexpected." #. type: Plain text #: helpers/external_acl/AD_group/ext_ad_group_acl.8:167 @@ -2273,6 +2285,9 @@ msgid "" "fixed by using version 4.91 SP3+, with the 'Auto-Reconnect' feature not re-" "populating the networkAddress field in eDirectory." msgstr "" +"There is a known issue regarding Novell's Client for Windows, that is mostly " +"fixed by using version 4.91 SP3+, with the 'Auto-Reconnect' feature not re-" +"populating the networkAddress field in eDirectory." #. type: Plain text #: helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8:179 @@ -2282,6 +2297,10 @@ msgid "" "low on connection licenses, that it I sometimes does not populate the " "networkAddress fields correctly." msgstr "" +"I have also experienced an issue related to using NetWare 6.5 (SP6 and " +"lower?) and connection licensing. It appears that whenever a server runs " +"low on connection licenses, that it I sometimes does not populate the " +"networkAddress fields correctly." #. type: Plain text #: helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8:186 @@ -2291,6 +2310,10 @@ msgid "" "B as a fallback. Check ConsoleOne, etc to verify their " "networkAddress fields to troubleshoot." msgstr "" +"Majority of Proxy Authentication issues can be resolved by having the users' " +"B if their networkAddress is not correct, or using " +"B as a fallback. Check ConsoleOne, etc to verify their " +"networkAddress fields to troubleshoot." #. type: Plain text #: helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8:211 @@ -2317,6 +2340,8 @@ msgid "" "B is an installed binary. An external helper for the " "Squid external acl scheme." msgstr "" +"B is an installed binary. An external helper for the " +"Squid external acl scheme." #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:22 @@ -2337,7 +2362,7 @@ msgstr "" #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:43 msgid "The B configuration for the external ACL should be:" -msgstr "" +msgstr "The B configuration for the external ACL should be:" #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:51 @@ -2345,6 +2370,8 @@ msgid "" "If the helper program finds a matching username/ip in the configuration " "file, it returns B , otherwise it returns B" msgstr "" +"If the helper program finds a matching username/ip in the configuration " +"file, it returns B , otherwise it returns B" #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:53 @@ -2357,6 +2384,8 @@ msgid "" "Where B is a dotted quad format IP address, the B must be " "in dotted quad format too." msgstr "" +"Where B is a dotted quad format IP address, the B must be " +"in dotted quad format too." #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:68 @@ -2364,12 +2393,14 @@ msgid "" "When the second parameter is prefixed with an B<@> , the program will lookup " "the B file entry for the specified username." msgstr "" +"When the second parameter is prefixed with an B<@> , the program will lookup " +"the B file entry for the specified username." #. any user on this IP address may authenticate\" or \"no user on this ip address may authenticate\". #. type: Plain text #: helpers/external_acl/file_userip/ext_file_userip_acl.8:74 msgid "There are other two directives, B and B , which mean" -msgstr "" +msgstr "There are other two directives, B and B , which mean" #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:7 @@ -2390,6 +2421,11 @@ msgid "" "user@REALM, NDOMAIN\\euser) to be checked against the LDAP directory are " "specified on subsequent lines of input to the helper, one username per line." msgstr "" +"B is an installed binary and allows Squid to " +"connect to a LDAP directory to authorize users via LDAP groups. Options are " +"specified as parameters on the command line, while the username (e.g. user, " +"user@REALM, NDOMAIN\\euser) to be checked against the LDAP directory are " +"specified on subsequent lines of input to the helper, one username per line." #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:28 @@ -2476,17 +2512,17 @@ msgstr "" #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:80 msgid "Maximal depth of recursive group search." -msgstr "" +msgstr "Maximal depth of recursive group search." #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:83 msgid "Username for LDAP server." -msgstr "" +msgstr "Username for LDAP server." #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:86 msgid "Password for LDAP server." -msgstr "" +msgstr "Password for LDAP server." #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:91 @@ -2497,6 +2533,11 @@ msgid "" "hold of a copy of your Squid configuration file or extracts the password " "used from a process listing." msgstr "" +"As the password needs to be printed in plain text in your Squid " +"configuration it is strongly recommended to use a account with minimal " +"associated privileges. This to limit the damage in case someone could get " +"hold of a copy of your Squid configuration file or extracts the password " +"used from a process listing." #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:95 @@ -2542,12 +2583,14 @@ msgid "" "This helper is intended to be used as an B helper in " "B" msgstr "" +"This helper is intended to be used as an B helper in " +"B" #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:138 #: helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8:55 msgid "B The following squid startup file modification may be required:" -msgstr "" +msgstr "B The following squid startup file modification may be required:" #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:142 @@ -2672,13 +2715,14 @@ msgstr "" #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:238 msgid "B - Domain names - implementation and specification," -msgstr "" +msgstr "B - Domain names - implementation and specification," #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:240 msgid "" "B - A DNS RR for specifying the location of services (DNS SRV)," msgstr "" +"B - A DNS RR for specifying the location of services (DNS SRV)," #. type: Plain text #: helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:245 @@ -2766,6 +2810,8 @@ msgid "" "The DN and password to bind as while performing searches. Required if the " "LDAP directory does not allow anonymous searches." msgstr "" +"The DN and password to bind as while performing searches. Required if the " +"LDAP directory does not allow anonymous searches." #. type: Plain text #: helpers/external_acl/LDAP_group/ext_ldap_group_acl.8:93 diff --git a/errors/en.po b/errors/en.po index 83dc3530ce..af0fba0fe7 100644 --- a/errors/en.po +++ b/errors/en.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: Squid-3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-05-04 13:57+1300\n" -"PO-Revision-Date: 2011-05-04 01:55+0200\n" +"PO-Revision-Date: 2011-05-04 04:20+0200\n" "Last-Translator: Amos \n" "Language-Team: Squid Developers \n" "Language: en\n" @@ -421,9 +421,8 @@ msgstr "Illegal double-escape in the URL-Path" #: templates/ERR_AGENT_CONFIGURE+html.body.div.div.ul.li:30 #: templates/ERR_AGENT_CONFIGURE+html.body.div.div.ul.li:38 #: templates/ERR_AGENT_CONFIGURE+html.body.div.div.ul.li:46 -#, fuzzy msgid "In the HTTP proxy box type the proxy name %h and port %b." -msgstr "In the HTTP proxy box type the proxy name %h and port 3128." +msgstr "In the HTTP proxy box type the proxy name %h and port %b." #: templates/ERR_INVALID_URL+html.body.div.blockquote.p:23 msgid "Invalid URL" @@ -499,9 +498,8 @@ msgid "Request is too large." msgstr "Request is too large." #: templates/ERR_AGENT_WPAD+html.body.div.div.ul.li:30 -#, fuzzy msgid "Select Auto-detect proxy settings for this network" -msgstr "Select Automatically detect settings" +msgstr "Select Auto-detect proxy settings for this network" #: templates/ERR_AGENT_WPAD+html.body.div.div.ul.li:38 msgid "Select Automatically detect settings" diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.8 b/helpers/basic_auth/SSPI/basic_sspi_auth.8 index fd19c478c9..284d2e849f 100644 --- a/helpers/basic_auth/SSPI/basic_sspi_auth.8 +++ b/helpers/basic_auth/SSPI/basic_sspi_auth.8 @@ -24,9 +24,11 @@ to authenticate users on an NT domain in native WIN32 mode. . .PP Usage is simple. It accepts a username and password on standard input -and will return OK if the username/password is valid for the domain/machine, -or ERR if there was some problem. -It is possible to authenticate against NT trusted domains specifyng the username +and will return +.B OK +if the username/password is valid for the domain/machine, or +.B ERR +if there was some problem. It is possible to authenticate against NT trusted domains specifying the username in the domain\\username Microsoft notation. . .SH OPTIONS 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 11777d3f6b..36b187e98c 100644 --- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 +++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.8 @@ -204,7 +204,9 @@ Questions on the usage of this program can be sent to the . .SH REPORTING BUGS .PP -I *STRONGLY RECOMMEND* using the latest version of the Novell Client in all situations +I +.B "STRONGLY RECOMMEND" +using the latest version of the Novell Client in all situations .B before seeking support! You may also need to make sure your servers have the latest service packs installed, and that your servers are properly synchronizing partitions. 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 a30b99983a..eec2d8fb49 100644 --- a/helpers/external_acl/file_userip/ext_file_userip_acl.8 +++ b/helpers/external_acl/file_userip/ext_file_userip_acl.8 @@ -3,7 +3,7 @@ .SH NAME .if !'po4a'hide' .B ext_file_userip_acl .if !'po4a'hide' \- -Restrict users to cetain IP addresses, using a text file backend. +Restrict users to certain IP addresses, using a text file backend. .PP Version 1.0 . @@ -17,7 +17,7 @@ file name .B ext_file_userip_acl is an installed binary. An external helper for the Squid external acl scheme. .PP -It works by reading a pair composed by an ip address and an username +It works by reading a pair composed by an IP address and an username on STDIN and matching it against a configuration file. . .SH OPTIONS @@ -28,8 +28,8 @@ Write debug info to stderr. .if !'po4a'hide' .TP .if !'po4a'hide' .B \-f file Configuration -.B file - to load. +.B file +to load. . .if !'po4a'hide' .TP .if !'po4a'hide' .B \-h @@ -70,7 +70,7 @@ There are other two directives, .B ALL and .B NONE -, which mean \"any user on this IP address may authenticate\" or \"no user on this ip address may authenticate\". +, which mean \"any user on this IP address may authenticate\" or \"no user on this IP address may authenticate\". . .SH AUTHOR This program was written by 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 a076cd4483..87b1d26b8a 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 @@ -15,22 +15,39 @@ Version 1.3.0sq .B ext_kerberos_ldap_group_acl is an installed binary and allows Squid to connect to a LDAP directory to authorize users via LDAP groups. Options are specified as parameters on the -command line, while the username (e.g. user, user@REALM, NDOMAIN\\user) to -be checked against the LDAP directory are specified on subsequent lines of +command line, while the username (e.g. +.B user +, +.B user@REALM +, +.B NDOMAIN\\user +) to be checked against the LDAP directory are specified on subsequent lines of input to the helper, one username per line. .PP .B ext_kerberos_ldap_group_acl -will determine the ldap server name from DNS SRV and/or -A records or a local hosts file (e.g. for the Kerberos Realm SUSE.HOME it -will look for an SRV record _ldap._tcp.SUSE.HOME and an A record SUSE.HOME -or a SUSE.HOME hosts entry). If no domain information is available from the -username the ldap server will be determined through the command line options. +will determine the ldap server name from DNS SRV and/or A records or a +local hosts file (e.g. for the Kerberos Realm +.B SUSE.HOME +it will look for an SRV record +.B _ldap._tcp.SUSE.HOME +and an A record +.B SUSE.HOME +or a +.B SUSE.HOME +hosts entry). If no domain information is available from the +username the LDAP server will be determined through the command line options. .PP .B ext_kerberos_ldap_group_acl -requires as a minimum the \-g, \-t or \-T option which -provides the ldap group name the user has to belong too. For Active Directory -a recursive group lookup is implemented until a max depth specified by \-m depth. -For other Ldap servers a RFC2307bis schema of groups is assumed. +requires as a minimum the +.B \-g +, +.B \-t +or +.B \-T +option which provides the LDAP group name the user has to belong too. For Active Directory +a recursive group lookup is implemented until a max depth specified by +.B \-m +depth. For other LDAP servers a RFC2307bis schema of groups is assumed. .PP Different group names can be specified for different domains using a group@domain syntax. @@ -57,7 +74,7 @@ Write debug messages to stderr. Write informational messages to stderr. .if !'po4a'hide' .TP 12 .if !'po4a'hide' .B \-s -Use SSL for the ldap connection. +Use SSL for the LDAP connection. .IP The CA certificate file can be set via the environment variable TLS_CACERTFILE (default /etc/ssl/certs/cert.pem) (OpenLDAP). .IP @@ -85,7 +102,7 @@ Username for LDAP server. Password for LDAP server. .IP As the password needs to be printed in plain text in your Squid configuration -it is strongly recommended to use a account with minimal associated privileges. +it is strongly recommended to use an account with minimal associated privileges. This to limit the damage in case someone could get hold of a copy of your Squid configuration file or extracts the password used from a process listing. .