More gosa.conf cleanup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11780 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 38d8c9528ed1b7e448d0f4063f304e67c3cebb94..8a968d204e442940622f114d2091ca61a4bea950 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -25,6 +25,9 @@
        an ACL definition done inside of GOsa -> ACLs.
 
        You can override an icon by specifying the "icon" attribute.
+
+       For more information about possible configuration parameters, please take
+       a look at the gosa.conf manual page.
    -->
   <menu>
 
@@ -285,13 +288,13 @@
   </ogrouptabs>
 
   <!-- Debian archive management plugin -->
-<!--
+  <!--
   <dak_tabs>
     <tab class="dakrepository" name="Repository" />
     <tab class="dakqueue" name="Queue" />
     <tab class="dakkeyring" name="Key ring" />
   </dak_tabs>
--->
+  -->
 
   <!-- Connectivity plugins -->
   <connectivity>
@@ -303,13 +306,13 @@
     <tab class="webdavAccount" />
     <tab class="phpgwAccount" />
     <tab class="intranetAccount" />
-<!--
+    <!--
     <tab class="opengwAccount"
       username="OGo"
       password=""
       database="OGo"
       datahost="localhost" />
--->
+    -->
     <tab class="pptpAccount" /> 
     <tab class="phpscheduleitAccount" /> 
         <tab class="oxchangeAccount" />
@@ -353,7 +356,7 @@
     <tab class="faiPackage" name="Packages" />
   </faipackagetabs>
 {else}
-<!-- 
+  <!-- 
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -382,7 +385,7 @@
   <faipackagetabs>
     <tab class="faiPackage" name="Packages" />
   </faipackagetabs>
--->
+  -->
 {/if}
 
 
@@ -398,6 +401,9 @@
        The main section defines global settings, which might be overridden by
        each location definition inside.
 
+       For more information about the configuration parameters, take a look at
+       the gosa.conf manual page.
+
   -->
   <main default="{$cv.location}"
 {if $cv.optional.list_summary}
@@ -461,9 +467,6 @@
 {if $cv.optional.mailQueueScriptPath_active}
        mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
 {/if}
-{if $cv.optional.auto_network_hook_active}
-       auto_network_hook="{$cv.optional.auto_network_hook} "
-{/if}
 {if $cv.optional.user_filter_cookie}
        save_filter="true"
 {else}
@@ -528,9 +531,6 @@
 {else}
               include_personal_title="false"
 {/if}
-{if $cv.optional.notifydir_active }
-              notifydir="{$cv.optional.notifydir}"
-{/if}
 {if $cv.base_hook_active}
               base_hook="{$cv.base_hook}"
 {/if}