From: Lubos Uhliarik Date: Wed, 22 Mar 2017 05:04:41 +0000 (+1200) Subject: Bug 4688: various typo error(s) in man page(s) X-Git-Tag: M-staged-PR71~213 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b61af8e10be09f25cc2f9a05181f03c0af73bdb;p=thirdparty%2Fsquid.git Bug 4688: various typo error(s) in man page(s) --- diff --git a/compat/compat.h b/compat/compat.h index 2872d7bf74..1eeaf0e9f6 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -11,7 +11,7 @@ /* * From discussions it was chosen to push compat code as far down as possible. - * That means we can have a seperate compat for most + * That means we can have a separate compat for most * compatability and portability hacks and resolutions. * * This file is meant to collate all those hacks files together and diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h index d85596d87c..d34f6309ac 100644 --- a/src/StoreFileSystem.h +++ b/src/StoreFileSystem.h @@ -48,7 +48,7 @@ \par * configure will take a list of storage types through the * --enable-store-io parameter. This parameter takes a list of - * space seperated storage types. For example, + * space separated storage types. For example, * --enable-store-io="ufs aufs" . * \par diff --git a/src/acl/external/LDAP_group/ext_ldap_group_acl.8 b/src/acl/external/LDAP_group/ext_ldap_group_acl.8 index 682f27083b..501b2e9004 100644 --- a/src/acl/external/LDAP_group/ext_ldap_group_acl.8 +++ b/src/acl/external/LDAP_group/ext_ldap_group_acl.8 @@ -52,8 +52,8 @@ When to dereference aliases. Defaults to 'never' .BI never dereference aliases (default), .BI always -dereference aliases, only while -.BR search ing +dereference aliases, only during a +.BR search or only to .B find the base object @@ -143,7 +143,7 @@ Specify the LDAP server to connect to . .if !'po4a'hide' .TP .if !'po4a'hide' .BI \-H " ldapuri" -Specity the LDAP server to connect to by a LDAP URI (requires OpenLDAP libraries) +Specify the LDAP server to connect to by a LDAP URI (requires OpenLDAP libraries) . .if !'po4a'hide' .TP .if !'po4a'hide' .BI \-K diff --git a/src/acl/external/kerberos_ldap_group/README b/src/acl/external/kerberos_ldap_group/README index 4d80409826..78e8a671d1 100644 --- a/src/acl/external/kerberos_ldap_group/README +++ b/src/acl/external/kerberos_ldap_group/README @@ -65,7 +65,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab export KRB5_KTNAME If you use a different Kerberos domain than the machine itself is in you can point squid to -the seperate Kerberos config file by setting the following environmnet variable in the startup +the separate Kerberos config file by setting the following environment variable in the startup script. KRB5_CONFIG=/etc/krb5-squid.conf diff --git a/src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 b/src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 index 64b86d25b0..e3d9de5893 100644 --- a/src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 +++ b/src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 @@ -163,7 +163,7 @@ the proxy name set in IE or firefox. You can not use an IP address. .if !'po4a'hide' .ft . If you use a different Kerberos domain than the machine itself is in you can point squid to -the seperate Kerberos config file by setting the following environmnet variable in the startup +the separate Kerberos config file by setting the following environment variable in the startup script. .if !'po4a'hide' .P .if !'po4a'hide' .ft CR diff --git a/src/acl/external/session/ext_session_acl.8 b/src/acl/external/session/ext_session_acl.8 index 69164c15cc..00525d2691 100644 --- a/src/acl/external/session/ext_session_acl.8 +++ b/src/acl/external/session/ext_session_acl.8 @@ -21,7 +21,7 @@ and timing out sessions. The timeout is based either on idle use ( ) or a fixed period of time ( .B \-T ). The former is suitable for displaying terms and conditions to a user; the -latter is suitable for the display of advertisments or other notices (both as a +latter is suitable for the display of advertisements or other notices (both as a splash page \- see config examples in the wiki online). The session helper can also be used to force users to re\-authenticate if the .B %LOGIN @@ -55,7 +55,7 @@ used as the database. If a path is specified, a Berkeley DB database environment is created within the directory. The advantage of the latter is better database support between multiple instances of the session helper. Using multiple instances of the session helper with a single -database file will cause synchronisation problems between processes. +database file will cause synchronization problems between processes. If this option is not specified the session details will be kept in memory only and all sessions will reset each time Squid restarts its helpers (Squid restart or rotation of logs). diff --git a/src/auth/basic/DB/basic_db_auth.pl.in b/src/auth/basic/DB/basic_db_auth.pl.in index a0e1b13c91..155a14e5e3 100644 --- a/src/auth/basic/DB/basic_db_auth.pl.in +++ b/src/auth/basic/DB/basic_db_auth.pl.in @@ -14,7 +14,7 @@ use Getopt::Long; basic_db_auth [options] -=head1 DESCRIPTOIN +=head1 DESCRIPTION This program verifies username & password to a database @@ -101,7 +101,7 @@ This manual was written by I> Copyright (C) 2007 Henrik Nordstrom Copyright (C) 2010 Luis Daniel Lucio Quiroz (Joomla support) This program is free software. You may redistribute copies of it under the -terms of the GNU General Public License version 2, or (at youropinion) any +terms of the GNU General Public License version 2, or (at your opinion) any later version. =head1 QUESTIONS diff --git a/src/auth/basic/LDAP/basic_ldap_auth.8 b/src/auth/basic/LDAP/basic_ldap_auth.8 index d32daf175f..3223007c72 100644 --- a/src/auth/basic/LDAP/basic_ldap_auth.8 +++ b/src/auth/basic/LDAP/basic_ldap_auth.8 @@ -98,7 +98,7 @@ option). Defaults to .B Note: This can only be done if all your users are located directly under the same position in the LDAP tree and the login name is used for naming -each user object. If your LDAP tree does not match these criterias or if +each user object. If your LDAP tree does not match these criteria or if you want to filter who are valid users then you need to use a search filter to search for your users DN ( .B \-f @@ -186,15 +186,15 @@ when to dereference aliases. Defaults to .B never dereference aliases (default), .B always -dereference aliases, only while -.B search ing +dereference aliases, only during a +.B search or only to .B find the base object. . .if !'po4a'hide' .TP .if !'po4a'hide' .B "\-H ldap_uri -Specity the LDAP server to connect to by LDAP URI (requires OpenLDAP libraries). +Specify the LDAP server to connect to by LDAP URI (requires OpenLDAP libraries). Servers can also be specified last on the command line. . .if !'po4a'hide' .TP diff --git a/src/auth/digest/LDAP/digest_pw_auth.cc b/src/auth/digest/LDAP/digest_pw_auth.cc index 75755a44e8..e6720bc095 100644 --- a/src/auth/digest/LDAP/digest_pw_auth.cc +++ b/src/auth/digest/LDAP/digest_pw_auth.cc @@ -30,7 +30,7 @@ * the file format. However storing such a triple does little to * improve security: If compromised the username:realm:HA1 combination * is "plaintext equivalent" - for the purposes of digest authentication - * they allow the user access. Password syncronisation is not tackled + * they allow the user access. Password synchronization is not tackled * by digest - just preventing on the wire compromise. * * Copyright (c) 2003 Robert Collins diff --git a/src/auth/digest/eDirectory/digest_pw_auth.cc b/src/auth/digest/eDirectory/digest_pw_auth.cc index 1b0d4efbd3..53a2c49684 100644 --- a/src/auth/digest/eDirectory/digest_pw_auth.cc +++ b/src/auth/digest/eDirectory/digest_pw_auth.cc @@ -30,7 +30,7 @@ * the file format. However storing such a triple does little to * improve security: If compromised the username:realm:HA1 combination * is "plaintext equivalent" - for the purposes of digest authentication - * they allow the user access. Password syncronisation is not tackled + * they allow the user access. Password synchronization is not tackled * by digest - just preventing on the wire compromise. * * Copyright (c) 2003 Robert Collins diff --git a/src/auth/digest/file/digest_file_auth.8 b/src/auth/digest/file/digest_file_auth.8 index 480ef1cfa0..534b2152c1 100644 --- a/src/auth/digest/file/digest_file_auth.8 +++ b/src/auth/digest/file/digest_file_auth.8 @@ -15,7 +15,7 @@ file is an installed binary authentication program for Squid. It handles digest authentication protocol and authenticates against a text file backend. . -This program will automatically detect the existence of a concurrecy channel-ID and adjust appropriately. +This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately. It may be used with any value 0 or above for the auth_param children concurrency= parameter. . .SH OPTIONS @@ -54,7 +54,7 @@ the file format. However storing such a triple does little to improve security: If compromised the .B username:realm:HA1 combination is "plaintext equivalent" - for the purposes of digest authentication -they allow the user access. Password syncronisation is not tackled +they allow the user access. Password synchronization is not tackled by digest - just preventing on the wire compromise. . .SH AUTHOR diff --git a/src/auth/digest/file/digest_file_auth.cc b/src/auth/digest/file/digest_file_auth.cc index bd9ad6c747..da4e9d7663 100644 --- a/src/auth/digest/file/digest_file_auth.cc +++ b/src/auth/digest/file/digest_file_auth.cc @@ -33,7 +33,7 @@ * the file format. However storing such a triple does little to * improve security: If compromised the username:realm:HA1 combination * is "plaintext equivalent" - for the purposes of digest authentication - * they allow the user access. Password syncronisation is not tackled + * they allow the user access. Password synchronization is not tackled * by digest - just preventing on the wire compromise. * * Copyright (c) 2003 Robert Collins diff --git a/src/auth/digest/file/text_backend.cc b/src/auth/digest/file/text_backend.cc index 012778d860..23e8104f02 100644 --- a/src/auth/digest/file/text_backend.cc +++ b/src/auth/digest/file/text_backend.cc @@ -29,7 +29,7 @@ * the file format. However storing such a triple does little to * improve security: If compromised the username:realm:HA1 combination * is "plaintext equivalent" - for the purposes of digest authentication - * they allow the user access. Password syncronisation is not tackled + * they allow the user access. Password synchronization is not tackled * by digest - just preventing on the wire compromise. * * Copyright (c) 2003 Robert Collins diff --git a/src/auth/negotiate/kerberos/README b/src/auth/negotiate/kerberos/README index 69c2a6c949..d49af11cab 100644 --- a/src/auth/negotiate/kerberos/README +++ b/src/auth/negotiate/kerberos/README @@ -53,7 +53,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab export KRB5_KTNAME If you use a different Kerberos domain than the machine itself is in you can point squid to -the seperate Kerberos config file by setting the following environmnet variable in the startup +the separate Kerberos config file by setting the following environment variable in the startup script. KRB5_CONFIG=/etc/krb-squid5.conf diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 index b31b046c5e..52a86a290a 100644 --- a/src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 +++ b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 @@ -69,7 +69,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab export KRB5_KTNAME If you use a different Kerberos domain than the machine itself is in you can point squid to -the seperate Kerberos config file by setting the following environmnet variable in the startup +the separate Kerberos config file by setting the following environment variable in the startup script. KRB5_CONFIG=/etc/krb5\-squid.conf diff --git a/src/ipcache.cc b/src/ipcache.cc index 989616c91d..14bc57abf6 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -49,7 +49,7 @@ \defgroup IPCacheInternal IP Cache Internals \ingroup IPCacheAPI \todo when IP cache is provided as a class. These sub-groups will be obsolete - * for now they are used to seperate the public and private functions. + * for now they are used to separate the public and private functions. * with the private ones all being in IPCachInternal and public in IPCacheAPI * \section InternalOperation Internal Operation diff --git a/src/log/DB/log_db_daemon.pl.in b/src/log/DB/log_db_daemon.pl.in index b3c90af3da..e3aa6d0ecb 100755 --- a/src/log/DB/log_db_daemon.pl.in +++ b/src/log/DB/log_db_daemon.pl.in @@ -18,7 +18,7 @@ log_db_daemon - Database logging daemon for Squid log_db_daemon DSN [options] -=head1 DESCRIPTOIN +=head1 DESCRIPTION This program writes Squid access.log entries to a database. Presently only accepts the B native format @@ -373,7 +373,7 @@ To distinguish only between HITs and MISSes: WHERE squid_request_status LIKE '%MISS%') / (SELECT COUNT(*) FROM access_log)*100 - AS pecentage; + AS percentage; =item Response time ranges @@ -433,7 +433,7 @@ Indexes should be created according to the queries that are more frequently run. This script currently implements only the C (i.e. "append a line to the log") command, therefore the log lines are never purged from the table. This approach has an obvious scalability problem. -One solution would be to implement e.g. the "rotate log" command in a way that would calculate some summary values, put them in a "summary table" and then delete the lines used to caluclate those values. +One solution would be to implement e.g. the "rotate log" command in a way that would calculate some summary values, put them in a "summary table" and then delete the lines used to calculate those values. Similar cleanup code could be implemented in an external script and run periodically independently from squid log commands. diff --git a/src/security/cert_generators/file/security_file_certgen.8.in b/src/security/cert_generators/file/security_file_certgen.8.in index 8d74a80c37..44c25cae46 100644 --- a/src/security/cert_generators/file/security_file_certgen.8.in +++ b/src/security/cert_generators/file/security_file_certgen.8.in @@ -34,7 +34,7 @@ is an installed binary. Because the generation and signing of SSL certificates takes time Squid must use external process to handle the work. . -This process generates new SSL certificates and uses a disk cache of certificatess +This process generates new SSL certificates and uses a disk cache of certificates to improve response times on repeated requests. Communication occurs via TCP sockets bound to the loopback interface. . @@ -123,7 +123,7 @@ After any change to the signing CA in squid.conf be sure to erase and re-initial . .PP For simple configuration the helper defaults can be used. -Only HTTP listening port options are required to enable generation and set the signign CA certificate. +Only HTTP listening port options are required to enable generation and set the signing CA certificate. For Example: .if !'po4a'hide' .RS .if !'po4a'hide' .B http_port 3128 ssl-bump generate-host-certificates=on dynamic_cert_mem_cache_size=4MB cert=@SYSCONFDIR@/ssl_cert/example.com.pem diff --git a/src/store/id_rewriters/file/storeid_file_rewrite.pl.in b/src/store/id_rewriters/file/storeid_file_rewrite.pl.in index 016a888a86..02b59b5435 100644 --- a/src/store/id_rewriters/file/storeid_file_rewrite.pl.in +++ b/src/store/id_rewriters/file/storeid_file_rewrite.pl.in @@ -29,7 +29,7 @@ Eg: Rewrite rules are matched in the same order as they appear in the rules file. So for best performance, sort it in order of frequency of occurrence. -This program will automatically detect the existence of a concurrecy channel-ID and adjust appropriately. +This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately. It may be used with any value 0 or above for the store_id_children concurrency= parameter. =head1 OPTIONS