|
|
03b9a7 |
diff --git a/compat/compat.h b/compat/compat.h
|
|
|
03b9a7 |
index 00714ed..92f245a 100644
|
|
|
03b9a7 |
--- a/compat/compat.h
|
|
|
03b9a7 |
+++ b/compat/compat.h
|
|
|
03b9a7 |
@@ -11,7 +11,7 @@
|
|
|
03b9a7 |
|
|
|
03b9a7 |
/*
|
|
|
03b9a7 |
* From discussions it was chosen to push compat code as far down as possible.
|
|
|
03b9a7 |
- * That means we can have a seperate compat for most
|
|
|
03b9a7 |
+ * That means we can have a separate compat for most
|
|
|
03b9a7 |
* compatability and portability hacks and resolutions.
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
* This file is meant to collate all those hacks files together and
|
|
|
03b9a7 |
diff --git a/helpers/basic_auth/DB/basic_db_auth.8 b/helpers/basic_auth/DB/basic_db_auth.8
|
|
|
03b9a7 |
index 1aebcee..77e683c 100644
|
|
|
03b9a7 |
--- a/helpers/basic_auth/DB/basic_db_auth.8
|
|
|
03b9a7 |
+++ b/helpers/basic_auth/DB/basic_db_auth.8
|
|
|
03b9a7 |
@@ -147,8 +147,8 @@
|
|
|
03b9a7 |
.Vb 1
|
|
|
03b9a7 |
\& basic_db_auth [options]
|
|
|
03b9a7 |
.Ve
|
|
|
03b9a7 |
-.SH "DESCRIPTOIN"
|
|
|
03b9a7 |
-.IX Header "DESCRIPTOIN"
|
|
|
03b9a7 |
+.SH "DESCRIPTION"
|
|
|
03b9a7 |
+.IX Header "DESCRIPTION"
|
|
|
03b9a7 |
This program verifies username & password to a database
|
|
|
03b9a7 |
.SH "OPTIONS"
|
|
|
03b9a7 |
.IX Header "OPTIONS"
|
|
|
03b9a7 |
@@ -213,7 +213,7 @@ This manual was written by \fIHenrik Nordstrom <henrik@henriknordstrom.net\fR>
|
|
|
03b9a7 |
Copyright (C) 2007 Henrik Nordstrom <henrik@henriknordstrom.net>
|
|
|
03b9a7 |
Copyright (C) 2010 Luis Daniel Lucio Quiroz <dlucio@okay.com.mx> (Joomla support)
|
|
|
03b9a7 |
This program is free software. You may redistribute copies of it under the
|
|
|
03b9a7 |
-terms of the \s-1GNU\s0 General Public License version 2, or (at youropinion) any
|
|
|
03b9a7 |
+terms of the \s-1GNU\s0 General Public License version 2, or (at your opinion) any
|
|
|
03b9a7 |
later version.
|
|
|
03b9a7 |
.SH "QUESTIONS"
|
|
|
03b9a7 |
.IX Header "QUESTIONS"
|
|
|
03b9a7 |
diff --git a/helpers/basic_auth/DB/basic_db_auth.pl.in b/helpers/basic_auth/DB/basic_db_auth.pl.in
|
|
|
03b9a7 |
index 8dc7f00..3672488 100644
|
|
|
03b9a7 |
--- a/helpers/basic_auth/DB/basic_db_auth.pl.in
|
|
|
03b9a7 |
+++ b/helpers/basic_auth/DB/basic_db_auth.pl.in
|
|
|
03b9a7 |
@@ -14,7 +14,7 @@ use Getopt::Long;
|
|
|
03b9a7 |
|
|
|
03b9a7 |
basic_db_auth [options]
|
|
|
03b9a7 |
|
|
|
03b9a7 |
-=head1 DESCRIPTOIN
|
|
|
03b9a7 |
+=head1 DESCRIPTION
|
|
|
03b9a7 |
|
|
|
03b9a7 |
This program verifies username & password to a database
|
|
|
03b9a7 |
|
|
|
03b9a7 |
@@ -97,7 +97,7 @@ This manual was written by I<Henrik Nordstrom <henrik@henriknordstrom.net>>
|
|
|
03b9a7 |
Copyright (C) 2007 Henrik Nordstrom <henrik@henriknordstrom.net>
|
|
|
03b9a7 |
Copyright (C) 2010 Luis Daniel Lucio Quiroz <dlucio@okay.com.mx> (Joomla support)
|
|
|
03b9a7 |
This program is free software. You may redistribute copies of it under the
|
|
|
03b9a7 |
-terms of the GNU General Public License version 2, or (at youropinion) any
|
|
|
03b9a7 |
+terms of the GNU General Public License version 2, or (at your opinion) any
|
|
|
03b9a7 |
later version.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
=head1 QUESTIONS
|
|
|
03b9a7 |
diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.8 b/helpers/basic_auth/LDAP/basic_ldap_auth.8
|
|
|
03b9a7 |
index 3893514..cb972cd 100644
|
|
|
03b9a7 |
--- a/helpers/basic_auth/LDAP/basic_ldap_auth.8
|
|
|
03b9a7 |
+++ b/helpers/basic_auth/LDAP/basic_ldap_auth.8
|
|
|
03b9a7 |
@@ -98,7 +98,7 @@ option). Defaults to
|
|
|
03b9a7 |
.B Note:
|
|
|
03b9a7 |
This can only be done if all your users are located directly under
|
|
|
03b9a7 |
the same position in the LDAP tree and the login name is used for naming
|
|
|
03b9a7 |
-each user object. If your LDAP tree does not match these criterias or if
|
|
|
03b9a7 |
+each user object. If your LDAP tree does not match these criteria or if
|
|
|
03b9a7 |
you want to filter who are valid users then you need to use a search filter
|
|
|
03b9a7 |
to search for your users DN (
|
|
|
03b9a7 |
.B \-f
|
|
|
03b9a7 |
@@ -187,14 +187,14 @@ when to dereference aliases. Defaults to
|
|
|
03b9a7 |
dereference aliases (default),
|
|
|
03b9a7 |
.B always
|
|
|
03b9a7 |
dereference aliases, only while
|
|
|
03b9a7 |
-.B search ing
|
|
|
03b9a7 |
+.B searching
|
|
|
03b9a7 |
or only to
|
|
|
03b9a7 |
.B find
|
|
|
03b9a7 |
the base object.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.if !'po4a'hide' .TP
|
|
|
03b9a7 |
.if !'po4a'hide' .B "\-H ldap_uri
|
|
|
03b9a7 |
-Specity the LDAP server to connect to by LDAP URI (requires OpenLDAP libraries).
|
|
|
03b9a7 |
+Specify the LDAP server to connect to by LDAP URI (requires OpenLDAP libraries).
|
|
|
03b9a7 |
Servers can also be specified last on the command line.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.if !'po4a'hide' .TP
|
|
|
03b9a7 |
diff --git a/helpers/digest_auth/LDAP/digest_pw_auth.cc b/helpers/digest_auth/LDAP/digest_pw_auth.cc
|
|
|
03b9a7 |
index 50ce8fb..866cf9c 100644
|
|
|
03b9a7 |
--- a/helpers/digest_auth/LDAP/digest_pw_auth.cc
|
|
|
03b9a7 |
+++ b/helpers/digest_auth/LDAP/digest_pw_auth.cc
|
|
|
03b9a7 |
@@ -30,7 +30,7 @@
|
|
|
03b9a7 |
* the file format. However storing such a triple does little to
|
|
|
03b9a7 |
* improve security: If compromised the username:realm:HA1 combination
|
|
|
03b9a7 |
* is "plaintext equivalent" - for the purposes of digest authentication
|
|
|
03b9a7 |
- * they allow the user access. Password syncronisation is not tackled
|
|
|
03b9a7 |
+ * they allow the user access. Password synchronization is not tackled
|
|
|
03b9a7 |
* by digest - just preventing on the wire compromise.
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
|
|
|
03b9a7 |
diff --git a/helpers/digest_auth/eDirectory/digest_pw_auth.cc b/helpers/digest_auth/eDirectory/digest_pw_auth.cc
|
|
|
03b9a7 |
index 5db1ce4..aaeb86d 100644
|
|
|
03b9a7 |
--- a/helpers/digest_auth/eDirectory/digest_pw_auth.cc
|
|
|
03b9a7 |
+++ b/helpers/digest_auth/eDirectory/digest_pw_auth.cc
|
|
|
03b9a7 |
@@ -30,7 +30,7 @@
|
|
|
03b9a7 |
* the file format. However storing such a triple does little to
|
|
|
03b9a7 |
* improve security: If compromised the username:realm:HA1 combination
|
|
|
03b9a7 |
* is "plaintext equivalent" - for the purposes of digest authentication
|
|
|
03b9a7 |
- * they allow the user access. Password syncronisation is not tackled
|
|
|
03b9a7 |
+ * they allow the user access. Password synchronization is not tackled
|
|
|
03b9a7 |
* by digest - just preventing on the wire compromise.
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
|
|
|
03b9a7 |
diff --git a/helpers/digest_auth/file/digest_file_auth.8 b/helpers/digest_auth/file/digest_file_auth.8
|
|
|
03b9a7 |
index 008d53c..66254d9 100644
|
|
|
03b9a7 |
--- a/helpers/digest_auth/file/digest_file_auth.8
|
|
|
03b9a7 |
+++ b/helpers/digest_auth/file/digest_file_auth.8
|
|
|
03b9a7 |
@@ -15,7 +15,7 @@ file
|
|
|
03b9a7 |
is an installed binary authentication program for Squid. It handles digest
|
|
|
03b9a7 |
authentication protocol and authenticates against a text file backend.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
-This program will automatically detect the existence of a concurrecy channel-ID and adjust appropriately.
|
|
|
03b9a7 |
+This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately.
|
|
|
03b9a7 |
It may be used with any value 0 or above for the auth_param children concurrency= parameter.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.SH OPTIONS
|
|
|
03b9a7 |
@@ -54,7 +54,7 @@ the file format. However storing such a triple does little to
|
|
|
03b9a7 |
improve security: If compromised the
|
|
|
03b9a7 |
.B username:realm:HA1
|
|
|
03b9a7 |
combination is "plaintext equivalent" - for the purposes of digest authentication
|
|
|
03b9a7 |
-they allow the user access. Password syncronisation is not tackled
|
|
|
03b9a7 |
+they allow the user access. Password synchronization is not tackled
|
|
|
03b9a7 |
by digest - just preventing on the wire compromise.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.SH AUTHOR
|
|
|
03b9a7 |
diff --git a/helpers/digest_auth/file/digest_file_auth.cc b/helpers/digest_auth/file/digest_file_auth.cc
|
|
|
03b9a7 |
index cd17a54..5d36563 100644
|
|
|
03b9a7 |
--- a/helpers/digest_auth/file/digest_file_auth.cc
|
|
|
03b9a7 |
+++ b/helpers/digest_auth/file/digest_file_auth.cc
|
|
|
03b9a7 |
@@ -33,7 +33,7 @@
|
|
|
03b9a7 |
* the file format. However storing such a triple does little to
|
|
|
03b9a7 |
* improve security: If compromised the username:realm:HA1 combination
|
|
|
03b9a7 |
* is "plaintext equivalent" - for the purposes of digest authentication
|
|
|
03b9a7 |
- * they allow the user access. Password syncronisation is not tackled
|
|
|
03b9a7 |
+ * they allow the user access. Password synchronization is not tackled
|
|
|
03b9a7 |
* by digest - just preventing on the wire compromise.
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
|
|
|
03b9a7 |
diff --git a/helpers/digest_auth/file/text_backend.cc b/helpers/digest_auth/file/text_backend.cc
|
|
|
03b9a7 |
index 0b58670..5f4e882 100644
|
|
|
03b9a7 |
--- a/helpers/digest_auth/file/text_backend.cc
|
|
|
03b9a7 |
+++ b/helpers/digest_auth/file/text_backend.cc
|
|
|
03b9a7 |
@@ -29,7 +29,7 @@
|
|
|
03b9a7 |
* the file format. However storing such a triple does little to
|
|
|
03b9a7 |
* improve security: If compromised the username:realm:HA1 combination
|
|
|
03b9a7 |
* is "plaintext equivalent" - for the purposes of digest authentication
|
|
|
03b9a7 |
- * they allow the user access. Password syncronisation is not tackled
|
|
|
03b9a7 |
+ * they allow the user access. Password synchronization is not tackled
|
|
|
03b9a7 |
* by digest - just preventing on the wire compromise.
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
|
|
|
03b9a7 |
diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
|
|
|
03b9a7 |
index 1345f6a..d165f57 100644
|
|
|
03b9a7 |
--- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
|
|
|
03b9a7 |
+++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
|
|
|
03b9a7 |
@@ -53,7 +53,7 @@ When to dereference aliases. Defaults to 'never'
|
|
|
03b9a7 |
dereference aliases (default),
|
|
|
03b9a7 |
.BI always
|
|
|
03b9a7 |
dereference aliases, only while
|
|
|
03b9a7 |
-.BR search ing
|
|
|
03b9a7 |
+.BR searching
|
|
|
03b9a7 |
or only to
|
|
|
03b9a7 |
.B find
|
|
|
03b9a7 |
the base object
|
|
|
03b9a7 |
@@ -143,7 +143,7 @@ Specify the LDAP server to connect to
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.if !'po4a'hide' .TP
|
|
|
03b9a7 |
.if !'po4a'hide' .BI \-H " ldapuri"
|
|
|
03b9a7 |
-Specity the LDAP server to connect to by a LDAP URI (requires OpenLDAP libraries)
|
|
|
03b9a7 |
+Specify the LDAP server to connect to by a LDAP URI (requires OpenLDAP libraries)
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.if !'po4a'hide' .TP
|
|
|
03b9a7 |
.if !'po4a'hide' .BI \-K
|
|
|
03b9a7 |
diff --git a/helpers/external_acl/kerberos_ldap_group/README b/helpers/external_acl/kerberos_ldap_group/README
|
|
|
03b9a7 |
index 4d80409..78e8a67 100644
|
|
|
03b9a7 |
--- a/helpers/external_acl/kerberos_ldap_group/README
|
|
|
03b9a7 |
+++ b/helpers/external_acl/kerberos_ldap_group/README
|
|
|
03b9a7 |
@@ -65,7 +65,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab
|
|
|
03b9a7 |
export KRB5_KTNAME
|
|
|
03b9a7 |
|
|
|
03b9a7 |
If you use a different Kerberos domain than the machine itself is in you can point squid to
|
|
|
03b9a7 |
-the seperate Kerberos config file by setting the following environmnet variable in the startup
|
|
|
03b9a7 |
+the separate Kerberos config file by setting the following environment variable in the startup
|
|
|
03b9a7 |
script.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
KRB5_CONFIG=/etc/krb5-squid.conf
|
|
|
03b9a7 |
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
|
|
|
03b9a7 |
index 6972104..90b2cdd 100644
|
|
|
03b9a7 |
--- a/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8
|
|
|
03b9a7 |
+++ b/helpers/external_acl/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8
|
|
|
03b9a7 |
@@ -163,7 +163,7 @@ the proxy name set in IE or firefox. You can not use an IP address.
|
|
|
03b9a7 |
.if !'po4a'hide' .ft
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
If you use a different Kerberos domain than the machine itself is in you can point squid to
|
|
|
03b9a7 |
-the seperate Kerberos config file by setting the following environmnet variable in the startup
|
|
|
03b9a7 |
+the separate Kerberos config file by setting the following environment variable in the startup
|
|
|
03b9a7 |
script.
|
|
|
03b9a7 |
.if !'po4a'hide' .P
|
|
|
03b9a7 |
.if !'po4a'hide' .ft CR
|
|
|
03b9a7 |
diff --git a/helpers/external_acl/session/ext_session_acl.8 b/helpers/external_acl/session/ext_session_acl.8
|
|
|
03b9a7 |
index 6a2ec7b..a631fb2 100644
|
|
|
03b9a7 |
--- a/helpers/external_acl/session/ext_session_acl.8
|
|
|
03b9a7 |
+++ b/helpers/external_acl/session/ext_session_acl.8
|
|
|
03b9a7 |
@@ -21,7 +21,7 @@ and timing out sessions. The timeout is based either on idle use (
|
|
|
03b9a7 |
) or a fixed period of time (
|
|
|
03b9a7 |
.B \-T
|
|
|
03b9a7 |
). The former is suitable for displaying terms and conditions to a user; the
|
|
|
03b9a7 |
-latter is suitable for the display of advertisments or other notices (both as a
|
|
|
03b9a7 |
+latter is suitable for the display of advertisements or other notices (both as a
|
|
|
03b9a7 |
splash page \- see config examples in the wiki online). The session helper can also be used
|
|
|
03b9a7 |
to force users to re\-authenticate if the
|
|
|
03b9a7 |
.B %LOGIN
|
|
|
03b9a7 |
@@ -55,7 +55,7 @@ used as the database. If a path is specified, a Berkeley DB database
|
|
|
03b9a7 |
environment is created within the directory. The advantage of the latter
|
|
|
03b9a7 |
is better database support between multiple instances of the session
|
|
|
03b9a7 |
helper. Using multiple instances of the session helper with a single
|
|
|
03b9a7 |
-database file will cause synchronisation problems between processes.
|
|
|
03b9a7 |
+database file will cause synchronization problems between processes.
|
|
|
03b9a7 |
If this option is not specified the session details will be kept in
|
|
|
03b9a7 |
memory only and all sessions will reset each time Squid restarts its
|
|
|
03b9a7 |
helpers (Squid restart or rotation of logs).
|
|
|
03b9a7 |
diff --git a/helpers/log_daemon/DB/log_db_daemon.8 b/helpers/log_daemon/DB/log_db_daemon.8
|
|
|
03b9a7 |
index abb4407..d260feb 100644
|
|
|
03b9a7 |
--- a/helpers/log_daemon/DB/log_db_daemon.8
|
|
|
03b9a7 |
+++ b/helpers/log_daemon/DB/log_db_daemon.8
|
|
|
03b9a7 |
@@ -143,8 +143,8 @@ log_db_daemon \- Database logging daemon for Squid
|
|
|
03b9a7 |
.SH "SYNOPSIS"
|
|
|
03b9a7 |
.IX Header "SYNOPSIS"
|
|
|
03b9a7 |
log_db_daemon \s-1DSN\s0 [options]
|
|
|
03b9a7 |
-.SH "DESCRIPTOIN"
|
|
|
03b9a7 |
-.IX Header "DESCRIPTOIN"
|
|
|
03b9a7 |
+.SH "DESCRIPTION"
|
|
|
03b9a7 |
+.IX Header "DESCRIPTION"
|
|
|
03b9a7 |
This program writes Squid access.log entries to a database.
|
|
|
03b9a7 |
Presently only accepts the \fBsquid\fR native format
|
|
|
03b9a7 |
.IP "\fB\s-1DSN\s0\fR" 8
|
|
|
03b9a7 |
diff --git a/helpers/log_daemon/DB/log_db_daemon.pl.in b/helpers/log_daemon/DB/log_db_daemon.pl.in
|
|
|
03b9a7 |
index 66b863f..24e0256 100755
|
|
|
03b9a7 |
--- a/helpers/log_daemon/DB/log_db_daemon.pl.in
|
|
|
03b9a7 |
+++ b/helpers/log_daemon/DB/log_db_daemon.pl.in
|
|
|
03b9a7 |
@@ -18,7 +18,7 @@ log_db_daemon - Database logging daemon for Squid
|
|
|
03b9a7 |
|
|
|
03b9a7 |
log_db_daemon DSN [options]
|
|
|
03b9a7 |
|
|
|
03b9a7 |
-=head1 DESCRIPTOIN
|
|
|
03b9a7 |
+=head1 DESCRIPTION
|
|
|
03b9a7 |
|
|
|
03b9a7 |
This program writes Squid access.log entries to a database.
|
|
|
03b9a7 |
Presently only accepts the B<squid> native format
|
|
|
03b9a7 |
@@ -373,7 +373,7 @@ To distinguish only between HITs and MISSes:
|
|
|
03b9a7 |
WHERE squid_request_status LIKE '%MISS%')
|
|
|
03b9a7 |
/
|
|
|
03b9a7 |
(SELECT COUNT(*) FROM access_log)*100
|
|
|
03b9a7 |
- AS pecentage;
|
|
|
03b9a7 |
+ AS percentage;
|
|
|
03b9a7 |
|
|
|
03b9a7 |
=item Response time ranges
|
|
|
03b9a7 |
|
|
|
03b9a7 |
@@ -433,7 +433,7 @@ Indexes should be created according to the queries that are more frequently run.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
This script currently implements only the C<L> (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.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
-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.
|
|
|
03b9a7 |
+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.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
Similar cleanup code could be implemented in an external script and run periodically independently from squid log commands.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
diff --git a/helpers/negotiate_auth/kerberos/README b/helpers/negotiate_auth/kerberos/README
|
|
|
03b9a7 |
index 69c2a6c..d49af11 100644
|
|
|
03b9a7 |
--- a/helpers/negotiate_auth/kerberos/README
|
|
|
03b9a7 |
+++ b/helpers/negotiate_auth/kerberos/README
|
|
|
03b9a7 |
@@ -53,7 +53,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab
|
|
|
03b9a7 |
export KRB5_KTNAME
|
|
|
03b9a7 |
|
|
|
03b9a7 |
If you use a different Kerberos domain than the machine itself is in you can point squid to
|
|
|
03b9a7 |
-the seperate Kerberos config file by setting the following environmnet variable in the startup
|
|
|
03b9a7 |
+the separate Kerberos config file by setting the following environment variable in the startup
|
|
|
03b9a7 |
script.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
KRB5_CONFIG=/etc/krb-squid5.conf
|
|
|
03b9a7 |
diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8 b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8
|
|
|
03b9a7 |
index b31b046..52a86a2 100644
|
|
|
03b9a7 |
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8
|
|
|
03b9a7 |
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.8
|
|
|
03b9a7 |
@@ -69,7 +69,7 @@ KRB5_KTNAME=/etc/squid/HTTP.keytab
|
|
|
03b9a7 |
export KRB5_KTNAME
|
|
|
03b9a7 |
|
|
|
03b9a7 |
If you use a different Kerberos domain than the machine itself is in you can point squid to
|
|
|
03b9a7 |
-the seperate Kerberos config file by setting the following environmnet variable in the startup
|
|
|
03b9a7 |
+the separate Kerberos config file by setting the following environment variable in the startup
|
|
|
03b9a7 |
script.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
KRB5_CONFIG=/etc/krb5\-squid.conf
|
|
|
03b9a7 |
diff --git a/helpers/storeid_rewrite/file/storeid_file_rewrite.8 b/helpers/storeid_rewrite/file/storeid_file_rewrite.8
|
|
|
03b9a7 |
index c314387..aafe7d5 100644
|
|
|
03b9a7 |
--- a/helpers/storeid_rewrite/file/storeid_file_rewrite.8
|
|
|
03b9a7 |
+++ b/helpers/storeid_rewrite/file/storeid_file_rewrite.8
|
|
|
03b9a7 |
@@ -162,7 +162,7 @@ Eg:
|
|
|
03b9a7 |
Rewrite rules are matched in the same order as they appear in the rules file.
|
|
|
03b9a7 |
So for best performance, sort it in order of frequency of occurrence.
|
|
|
03b9a7 |
.PP
|
|
|
03b9a7 |
-This program will automatically detect the existence of a concurrecy channel-ID and adjust appropriately.
|
|
|
03b9a7 |
+This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately.
|
|
|
03b9a7 |
It may be used with any value 0 or above for the store_id_children concurrency= parameter.
|
|
|
03b9a7 |
.SH "OPTIONS"
|
|
|
03b9a7 |
.IX Header "OPTIONS"
|
|
|
03b9a7 |
diff --git a/helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in b/helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in
|
|
|
03b9a7 |
index dccd164..12e0d95 100644
|
|
|
03b9a7 |
--- a/helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in
|
|
|
03b9a7 |
+++ b/helpers/storeid_rewrite/file/storeid_file_rewrite.pl.in
|
|
|
03b9a7 |
@@ -29,7 +29,7 @@ Eg:
|
|
|
03b9a7 |
Rewrite rules are matched in the same order as they appear in the rules file.
|
|
|
03b9a7 |
So for best performance, sort it in order of frequency of occurrence.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
-This program will automatically detect the existence of a concurrecy channel-ID and adjust appropriately.
|
|
|
03b9a7 |
+This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately.
|
|
|
03b9a7 |
It may be used with any value 0 or above for the store_id_children concurrency= parameter.
|
|
|
03b9a7 |
|
|
|
03b9a7 |
=head1 OPTIONS
|
|
|
03b9a7 |
diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
|
|
|
03b9a7 |
index d9a33c5..53ae98f 100644
|
|
|
03b9a7 |
--- a/src/StoreFileSystem.h
|
|
|
03b9a7 |
+++ b/src/StoreFileSystem.h
|
|
|
03b9a7 |
@@ -47,7 +47,7 @@
|
|
|
03b9a7 |
\par
|
|
|
03b9a7 |
* configure will take a list of storage types through the
|
|
|
03b9a7 |
* --enable-store-io parameter. This parameter takes a list of
|
|
|
03b9a7 |
- * space seperated storage types. For example,
|
|
|
03b9a7 |
+ * space separated storage types. For example,
|
|
|
03b9a7 |
* --enable-store-io="ufs aufs" .
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
\par
|
|
|
03b9a7 |
diff --git a/src/ipcache.cc b/src/ipcache.cc
|
|
|
03b9a7 |
index 0eaab11..f350ccd 100644
|
|
|
03b9a7 |
--- a/src/ipcache.cc
|
|
|
03b9a7 |
+++ b/src/ipcache.cc
|
|
|
03b9a7 |
@@ -50,7 +50,7 @@
|
|
|
03b9a7 |
\defgroup IPCacheInternal IP Cache Internals
|
|
|
03b9a7 |
\ingroup IPCacheAPI
|
|
|
03b9a7 |
\todo when IP cache is provided as a class. These sub-groups will be obsolete
|
|
|
03b9a7 |
- * for now they are used to seperate the public and private functions.
|
|
|
03b9a7 |
+ * for now they are used to separate the public and private functions.
|
|
|
03b9a7 |
* with the private ones all being in IPCachInternal and public in IPCacheAPI
|
|
|
03b9a7 |
*
|
|
|
03b9a7 |
\section InternalOperation Internal Operation
|
|
|
03b9a7 |
diff --git a/src/ssl/ssl_crtd.8 b/src/ssl/ssl_crtd.8
|
|
|
03b9a7 |
index 9931e7e..ef39ebe 100644
|
|
|
03b9a7 |
--- a/src/ssl/ssl_crtd.8
|
|
|
03b9a7 |
+++ b/src/ssl/ssl_crtd.8
|
|
|
03b9a7 |
@@ -33,7 +33,7 @@ is an installed binary.
|
|
|
03b9a7 |
Because the generation and signing of SSL certificates takes time
|
|
|
03b9a7 |
Squid must use external process to handle the work.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
-This process generates new SSL certificates and uses a disk cache of certificatess
|
|
|
03b9a7 |
+This process generates new SSL certificates and uses a disk cache of certificates
|
|
|
03b9a7 |
to improve response times on repeated requests.
|
|
|
03b9a7 |
Communication occurs via TCP sockets bound to the loopback interface.
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
@@ -122,7 +122,7 @@ After any change to the signing CA in squid.conf be sure to erase and re-initial
|
|
|
03b9a7 |
.
|
|
|
03b9a7 |
.PP
|
|
|
03b9a7 |
For simple configuration the helper defaults can be used.
|
|
|
03b9a7 |
-Only HTTP listening port options are required to enable generation and set the signign CA certificate.
|
|
|
03b9a7 |
+Only HTTP listening port options are required to enable generation and set the signing CA certificate.
|
|
|
03b9a7 |
For Example:
|
|
|
03b9a7 |
.if !'po4a'hide' .RS
|
|
|
03b9a7 |
.if !'po4a'hide' .B http_port 3128 ssl-bump generate-host-certificates=on dynamic_cert_mem_cache_size=4MB cert=/usr/local/squid/ssl_cert/www.sample.com.pem
|