Backports from trunk

[gosa.git] / gosa-core / contrib / gosa.conf.5

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index afe458cdf64fea1c68bfc7f576118213fd9c8cce..655b7f8e5e751b3ee1b1eabb5587f80e5c399e04 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -89,7 +89,10 @@ You can override an icon by specifying the
 .I "icon"
 attribute.
 
-For every plugin, you can provide at least four additional hooks: 
+For every plugin, you can provide at least seven additional hooks: 
+.I precreate,
+.I preremove,
+.I premodify
 .I postcreate,
 .I postremove,
 .I postmodify
@@ -107,7 +110,7 @@ These keywords take a full executable path of a script. You can
 provide certain parameters in form of LDAP attributes. '%uid'
 will pass the current user id, '%dn' the current object dn, etc.
 
-The script gets executed after create, delete or modify tasks.
+The script gets executed before(pre) and after(post) create, delete or modify tasks.
 
 .I The
 .B check
@@ -370,6 +373,14 @@ characters like . or - inside of your accounts, set this to
 .I false.
 .PP
 
+.B allowUidProposalModification
+.I bool
+.PP
+The
+.I allowUidProposalModification
+statement enables the abilitiy to modify uid proposals when creating a new user from a template.
+.PP
+
 .B honourUnitTags
 .I bool
 .PP
@@ -537,16 +548,16 @@ statement determines whether a newly entered password has to be checked
 to have at least n different characters.
 .PP
 
-.B passwordHook
-.I path
+.B passwordProposalHook
+.I command
 .PP
 The
-.I passwordHook
-can specify an external script to handle password settings at some other
-location besides the LDAP. It will be called this way:
+.I passwordProposalHook
+can be used to let GOsa generate password proposals for you. 
+Whenever you change a password, you can then decide whether to use the proposal or to manually specify a password.
 
 .nf
-/path/to/your/script "username" "oldpassword" "newpassword"
+/usr/bin/apg -n1
 .fi
 
 .B strictPasswordRules
@@ -955,7 +966,7 @@ method.
 .I integer
 .PP
 The
-.I uidNumberPoolMin/gidNumberPoolMin
+.I uidNumberPoolMax/gidNumberPoolMax
 statement defines the highest assignable user/group id for use with the
 .I pool
 method.
@@ -1001,7 +1012,7 @@ functions supported - which can be combined:
       idGenerator="{%sn}-{%givenName[2-4]}"
 .fi
 
-    will generate an ID using the full surename, adding a dash, and adding at
+    will generate an ID using the full surname, adding a dash, and adding at
     least the first two characters of givenName. If this ID is used, it'll
     use up to four characters. If no automatic generation is possible, a
     input box is shown.