aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/squid/squid.xml14
-rw-r--r--config/squid/squid_auth.xml14
-rw-r--r--config/squid/squid_cache.xml14
-rw-r--r--config/squid/squid_extauth.xml8
-rw-r--r--config/squid/squid_nac.xml14
-rw-r--r--config/squid/squid_ng.xml4
-rw-r--r--config/squid/squid_traffic.xml14
-rw-r--r--config/squid/squid_upstream.xml16
-rw-r--r--config/squid/squid_users.xml14
-rwxr-xr-xpkg_config.7.xml2
10 files changed, 57 insertions, 57 deletions
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 7f2c1627..01669087 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -63,32 +63,32 @@
</service>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
diff --git a/config/squid/squid_auth.xml b/config/squid/squid_auth.xml
index b3e7c5c1..33317d4a 100644
--- a/config/squid/squid_auth.xml
+++ b/config/squid/squid_auth.xml
@@ -51,32 +51,32 @@
<include_file>squid.inc</include_file>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
diff --git a/config/squid/squid_cache.xml b/config/squid/squid_cache.xml
index a5efb83e..52735bbe 100644
--- a/config/squid/squid_cache.xml
+++ b/config/squid/squid_cache.xml
@@ -51,32 +51,32 @@
<include_file>squid.inc</include_file>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
diff --git a/config/squid/squid_extauth.xml b/config/squid/squid_extauth.xml
index 745e85d5..41d9f633 100644
--- a/config/squid/squid_extauth.xml
+++ b/config/squid/squid_extauth.xml
@@ -51,7 +51,7 @@
<aftersaveredirect>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</aftersaveredirect>
<tabs>
<tab>
- <text>General Settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid_ng.xml&amp;id=0</url>
</tab>
@@ -66,7 +66,7 @@
</tab>
<tab>
- <text>Network Access Control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
@@ -76,12 +76,12 @@
</tab>
<tab>
- <text>Auth Settings</text>
+ <text>Auth</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Extended Auth Settings</text>
+ <text>Extended Auth</text>
<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>
<active/>
</tab>
diff --git a/config/squid/squid_nac.xml b/config/squid/squid_nac.xml
index a61471ec..193a89c6 100644
--- a/config/squid/squid_nac.xml
+++ b/config/squid/squid_nac.xml
@@ -51,32 +51,32 @@
<include_file>squid.inc</include_file>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
diff --git a/config/squid/squid_ng.xml b/config/squid/squid_ng.xml
index 5949606e..5d956387 100644
--- a/config/squid/squid_ng.xml
+++ b/config/squid/squid_ng.xml
@@ -90,11 +90,11 @@
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth Settings</text>
+ <text>Auth</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Extended Auth Settings</text>
+ <text>Extended Auth</text>
<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>
</tab>
</tabs>
diff --git a/config/squid/squid_traffic.xml b/config/squid/squid_traffic.xml
index 1330cac9..d560a7ad 100644
--- a/config/squid/squid_traffic.xml
+++ b/config/squid/squid_traffic.xml
@@ -51,32 +51,32 @@
<include_file>squid.inc</include_file>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
diff --git a/config/squid/squid_upstream.xml b/config/squid/squid_upstream.xml
index 1102c672..ad494524 100644
--- a/config/squid/squid_upstream.xml
+++ b/config/squid/squid_upstream.xml
@@ -51,33 +51,33 @@
<include_file>squid.inc</include_file>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
<active/>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
- <url>/pkg.php?xml=squid_users.in</url>
+ <text>Local Users</text>
+ <url>/pkg.php?xml=squid_users.xml</url>
</tab>
</tabs>
<fields>
diff --git a/config/squid/squid_users.xml b/config/squid/squid_users.xml
index 34260817..eef6389f 100644
--- a/config/squid/squid_users.xml
+++ b/config/squid/squid_users.xml
@@ -53,31 +53,31 @@
<addedit_string>A proxy server user has been created/modified.</addedit_string>
<tabs>
<tab>
- <text>General settings</text>
+ <text>General</text>
<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
</tab>
<tab>
- <text>Upstream proxy</text>
+ <text>Upstream Proxy</text>
<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
</tab>
<tab>
- <text>Cache management</text>
+ <text>Cache Mgmt</text>
<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access control</text>
+ <text>Access Control</text>
<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
</tab>
<tab>
- <text>Traffic management</text>
+ <text>Traffic Mgmt</text>
<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
</tab>
<tab>
- <text>Auth settings</text>
+ <text>Auth Settings</text>
<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
</tab>
<tab>
- <text>Local users</text>
+ <text>Local Users</text>
<url>/pkg.php?xml=squid_users.xml</url>
<active/>
</tab>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index f7c931b6..682c5e1b 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -697,7 +697,7 @@
<descr>High performance web proxy cache.</descr>
<website>http://www.squid-cache.org/</website>
<category>Network</category>
- <version>2.7.8</version>
+ <version>2.7.8_1</version>
<status>Stable</status>
<required_version>1.2.1</required_version>
<maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>