commit 0fc27267236e14a3176d90085892df2e938cfda5
Author: Philipp Hahn <hahn@univention.de>
Date:   Fri Sep 20 10:05:49 2013 +0200

    Bug #30943: Remove duplicate description for nscd/autostart
    
    The init.d script is part of univention-base-files and the variable is
    already described there.

diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/changelog b/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/changelog
index b9106b8..8a045f1 100644
--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/changelog
+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/changelog
@@ -1,3 +1,9 @@
+univention-pam (7.0.2-1) unstable; urgency=low
+
+  * Remove duplicate description for nscd/autostart (Bug #30943)
+
+ -- Philipp Hahn <hahn@univention.de>  Fri, 20 Sep 2013 10:05:01 +0200
+
 univention-pam (7.0.1-2) unstable; urgency=low
 
   * Update/review UCR variable descriptions (Bug #30943)
@@ -74,7 +80,7 @@ univention-pam (6.0.10-1) unstable; urgency=low
 
 univention-pam (6.0.9-1) unstable; urgency=low
 
-  * added UCRV homedir/mount/required (Bug #23637) 
+  * added UCRV homedir/mount/required (Bug #23637)
 
  -- Felix Botner <botner@univention.de>  Mon, 29 Oct 2012 16:08:43 +0100
 
diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/univention-pam.univention-config-registry-variables b/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/univention-pam.univention-config-registry-variables
index 940948c..1b11570 100644
--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/univention-pam.univention-config-registry-variables
+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-pam/debian/univention-pam.univention-config-registry-variables
@@ -94,12 +94,6 @@ Description[en]=If this variable is activated (possible values: yes/no) NSCD is
 Type=bool
 Categories=system-base
 
-[nscd/autostart]
-Description[de]=Die Variable konfiguriert den Startmodus des NSCD-Dienstes. Wird sie auf 'no' oder 'disabled' gesetzt, kann der Dienst nicht gestartet werden. Wird die auf 'manually' gesetzt, erfolgt kein automatischer Start zum Systemstart, der Dienst kann aber später gezielt gestartet werden.
-Description[en]=This variable configures the start mode of the NSCD service. If set to 'no' or 'disabled', the service cannot be started. If the variable is set to 'manually', the service isn't started during system boot, can can be enabled manually at a later point.
-Type=bool
-Categories=system-base
-
 [nscd/restart/interval]
 Description[de]=Wenn der automatische NSCD-Neustart mit der Variable nscd/restart aktiviert wurde, kann hier das Intervall in Sekunden festgelegt werden. Wird kein Wert konfiguriert, erfolgt der Neustart stündlich.
 Description[en]=If the automatic NSCD restart has been activated through the variable nscd/restart, the restart interval in seconds can be configured here. If no value is set, the restart occurs hourly.