From 13486f375ace7f7a94bb1b67c18168d44103417f Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 23 Nov 2010 11:18:16 -0700
Subject: [PATCH] Cleanup caching config options

---
 horde/config/conf.xml | 84 +++++++++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 87e7a182e..3af806dae 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -988,11 +988,11 @@
   <configsection name="cache">
    <configheader>Cache System Settings</configheader>
    <configinteger name="default_lifetime" desc="How long, in seconds, should
-   objects be cached by default?">86400</configinteger>
+   data be cached by default?">86400</configinteger>
    <configswitch name="driver" desc="If you want to enable the Horde Cache,
    select a driver here. This is used to speed up portions of Horde by storing
    commonly processed objects.">file
-    <case name="Null" desc="Don't cache any objects"/>
+    <case name="Null" desc="Don't cache any data"/>
     <case name="Apc" desc="Use the APC cache">
      <configsection name="params">
       <configstring name="prefix" required="false" desc="The prefix to use for
@@ -1013,7 +1013,7 @@
       cache entries."/>
      </configsection>
     </case>
-    <case name="File" desc="Store objects in filesystem">
+    <case name="File" desc="Store data in filesystem">
      <configsection name="params">
       <configstring name="dir" required="false" desc="The location to store the
       cached files"/>
@@ -1062,12 +1062,17 @@
    </configswitch>
   </configsection>
 
-  <configheader>Javascript Caching</configheader>
-  <configswitch name="cachejs" desc="Cache static javascript and combine into
-  a single page for delivery to the browser?">false
+  <configheader>CSS Caching</configheader>
+  <configdescription>
+   CSS caching packages all stylesheets used in a page into a single file
+   sent to the browser. It also allows compression and optimization of this
+   file to reduce the data size. Caching reduces server load, speeds up the
+   user's browsing experience, and is HIGHLY RECOMMENDED.
+  </configdescription>
+  <configswitch name="cachecss" desc="Cache CSS?">false
    <case name="false" desc="No" />
    <case name="true" desc="Yes">
-    <configsection name="cachejsparams">
+    <configsection name="cachecssparams">
      <configswitch name="driver" desc="How should we store the cached data?">
       <case name="filesystem" desc="Filesystem (recommended)">
        <configdescription>
@@ -1081,43 +1086,35 @@
       </case>
       <case name="horde_cache" desc="Horde_Cache">
        <configdescription>
-        &lt;strong&gt;Requires a configured Horde_Cache backend.&lt;/strong&gt;
+        &lt;strong&gt;Requires a configured Horde caching
+        backend.&lt;/strong&gt;
        </configdescription>
       </case>
      </configswitch>
-     <configinteger name="lifetime" desc="Lifetime, in seconds, after which
-     the garbage collector will remove static javascript
-     files.">86400</configinteger>
+     <configinteger name="lifetime" desc="Lifetime of the cached files, in
+     seconds.">86400</configinteger>
      <configswitch name="compress" desc="How should we compress the static
      cached files?">php
       <case name="none" desc="No compression" />
-      <case name="php" desc="Built-in compressor (Medium compression, good
+      <case name="php" desc="Built-in compressor (Good compression, good
       speed)" />
-      <case name="yui" desc="YUI Compressor (Best compression, slowest
-      speed)">
-       <configstring name="javapath" desc="The path to the Java
-       application launcher.">/opt/java/jre/bin/java</configstring>
-       <configstring name="yuipath" desc="The path to the YUI compressor
-       .jar file"></configstring>
-      </case>
-      <case name="closure" desc="Google Closure Compiler (Best compression,
-      slowest speed)">
-       <configstring name="javapath" desc="The path to the Java
-       application launcher.">/opt/java/jre/bin/java</configstring>
-       <configstring name="closurepath" desc="The path to the Closure compiler
-       .jar file"></configstring>
-      </case>
      </configswitch>
     </configsection>
    </case>
   </configswitch>
 
-  <configheader>CSS Caching</configheader>
-  <configswitch name="cachecss" desc="Cache static CSS and combine into
-  a single page for delivery to the remote browser?">false
+  <configheader>Javascript Caching</configheader>
+  <configdescription>
+   Javascript caching packages all static javascript files used in a page into
+   more efficient chunks to send to the browser. It also allows compression
+   and optimizations of this file to reduce the data size. Caching reduces
+   server load, speeds up the user's browsing experience, and is HIGHLY
+   RECOMMENDED.
+  </configdescription>
+  <configswitch name="cachejs" desc="Cache javascript?">false
    <case name="false" desc="No" />
    <case name="true" desc="Yes">
-    <configsection name="cachecssparams">
+    <configsection name="cachejsparams">
      <configswitch name="driver" desc="How should we store the cached data?">
       <case name="filesystem" desc="Filesystem (recommended)">
        <configdescription>
@@ -1131,18 +1128,33 @@
       </case>
       <case name="horde_cache" desc="Horde_Cache">
        <configdescription>
-        &lt;strong&gt;Requires a configured Horde_Cache backend.&lt;/strong&gt;
+        &lt;strong&gt;Requires a configured Horde caching
+        backend.&lt;/strong&gt;
        </configdescription>
       </case>
      </configswitch>
-     <configinteger name="lifetime" desc="Lifetime, in seconds, after which
-     the garbage collector will remove static CSS files.">86400</configinteger>
-     <configswitch name="compress" desc="How should we compress the static
-     cached files?">php
+     <configswitch name="compress" desc="How should we compress the cached
+     files?">php
       <case name="none" desc="No compression" />
-      <case name="php" desc="Built-in compressor (Good compression, good
+      <case name="php" desc="Built-in compressor (Medium compression, good
       speed)" />
+      <case name="yui" desc="YUI Compressor (Best compression, slowest
+      speed)">
+       <configstring name="javapath" desc="The path to the Java
+       application launcher.">/opt/java/jre/bin/java</configstring>
+       <configstring name="yuipath" desc="The path to the YUI compressor
+       .jar file"></configstring>
+      </case>
+      <case name="closure" desc="Google Closure Compiler (Best compression,
+      slowest speed)">
+       <configstring name="javapath" desc="The path to the Java
+       application launcher.">/opt/java/jre/bin/java</configstring>
+       <configstring name="closurepath" desc="The path to the Closure compiler
+       .jar file"></configstring>
+      </case>
      </configswitch>
+     <configinteger name="lifetime" desc="Lifetime of the cached files, in
+     seconds.">86400</configinteger>
     </configsection>
    </case>
   </configswitch>
-- 
2.11.0