diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 99bfb1f1..ebaf7f64 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -1048,6 +1048,10 @@ Have fun!
NIS objects
+
+
+ Sudo roles
+ Additional modules:
@@ -1080,6 +1084,10 @@ Have fun!
Custom scripts (customScripts)
+
+
+ Sudo role (sudoRole)
+ Basic page layout:
@@ -1253,16 +1261,8 @@ Have fun!
Asterisk
- LAM supports Asterisk accounts, too. You can set the called ID,
- host and account context for your users.
-
-
-
-
-
-
-
-
+ LAM supports Asterisk accounts, too. See the Asterisk section for details.
@@ -1306,6 +1306,41 @@ Have fun!
"default" then OpenLDAP will use the default policy as defined in your
slapd.conf file.
+
+
+ Mail routing
+
+ LAM supports to manage mail routing for user accounts. You can
+ specify a routing address, the mail server and a number of local
+ addresses to route. This feature can be activated by adding the "Mail
+ routing" module to the user account type in your server
+ profile.
+
+
+
+
+
+
+
+
+
+
+
+ SSH keys
+
+ You can manage your public keys for SSH in LAM if you installed
+ the LPK patch for
+ SSH. Activate the "SSH public key" module for users in the
+ server profile and you can add keys to your user entries.
+
+
+
+
+
+
+
+
+
@@ -1433,6 +1468,22 @@ Have fun!
+
+
+ MAC addressese
+
+ Hosts can have an unlimited number of MAC addresses. To enable
+ this feature just add the "MAC address" module to the host account
+ type.
+
+
+
+
+
+
+
+
+
@@ -1476,6 +1527,107 @@ Have fun!
+
+ Asterisk
+
+ LAM includes large support for Asterisk. You can add Asterisk
+ extensions (including voicemail) to your users and also manage Asterisk
+ extensions.
+
+ The Asterisk support for users can be added by selecting the
+ Asterisk and Asterisk voicemail modules for users in your LAM server
+ profile. This will add the following tabs to your user accounts.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ If you also want to manage Asterisk extensions then simply add the
+ account type "Asterisk extensions" and its module to your server
+ profile.
+
+
+
+
+
+
+
+
+
+
+
+ DHCP
+
+ You can mange your DHCP server with LAM. It supports to manage
+ subnets, fixed IP entries, IP ranges and DDNS. The DHCP can be activated
+ by adding the account type DHCP to your server profile. Please also add
+ the DHCP modules. LAM requires that you use an LDAP entry with the
+ object class "dhcpServer" as suffix for this account type.
+
+ You can also change the settings of your DHCP server entry:
+
+
+
+
+
+
+
+
+
+ You can easily create new subnet entries.
+
+
+
+
+
+
+
+
+
+ It is also possible to specify a list of fixed IPs.
+
+
+
+
+
+
+
+
+
+ IP ranges may be specified.
+
+
+
+
+
+
+
+
+
+ If you activated DDNS in the server entry then you may also
+ specify the DDNS settings for this subnet.
+
+
+
+
+
+
+
+
+
+
Aliases (LAM Pro)
@@ -1495,6 +1647,27 @@ Have fun!
+
+ NIS net groups
+
+ LAM supports to define NIS netgroups. You can use them e.g. to
+ restrict SSH access to your machines.
+
+ Add the NIS net group account type and its module to your server
+ profile. Then you can manage net groups in LAM. Net groups may contain
+ other net groups as child groups. You can either insert the host/user
+ names manually or print the search buttons next to the input fields to
+ find existing entries in your directory.
+
+
+
+
+
+
+
+
+
+
NIS objects (LAM Pro)
diff --git a/lam/docs/manual-sources/images/asterisk.png b/lam/docs/manual-sources/images/asterisk.png
new file mode 100644
index 00000000..2cad8b71
Binary files /dev/null and b/lam/docs/manual-sources/images/asterisk.png differ
diff --git a/lam/docs/manual-sources/images/asteriskExtension.png b/lam/docs/manual-sources/images/asteriskExtension.png
new file mode 100644
index 00000000..b5c2b521
Binary files /dev/null and b/lam/docs/manual-sources/images/asteriskExtension.png differ
diff --git a/lam/docs/manual-sources/images/asteriskVoicemail.png b/lam/docs/manual-sources/images/asteriskVoicemail.png
new file mode 100644
index 00000000..379ec458
Binary files /dev/null and b/lam/docs/manual-sources/images/asteriskVoicemail.png differ
diff --git a/lam/docs/manual-sources/images/ddns.png b/lam/docs/manual-sources/images/ddns.png
new file mode 100644
index 00000000..7f1a4be0
Binary files /dev/null and b/lam/docs/manual-sources/images/ddns.png differ
diff --git a/lam/docs/manual-sources/images/dhcpMainSettings.png b/lam/docs/manual-sources/images/dhcpMainSettings.png
new file mode 100644
index 00000000..73346503
Binary files /dev/null and b/lam/docs/manual-sources/images/dhcpMainSettings.png differ
diff --git a/lam/docs/manual-sources/images/dhcpSettings.png b/lam/docs/manual-sources/images/dhcpSettings.png
new file mode 100644
index 00000000..1525e6b9
Binary files /dev/null and b/lam/docs/manual-sources/images/dhcpSettings.png differ
diff --git a/lam/docs/manual-sources/images/fixedIP.png b/lam/docs/manual-sources/images/fixedIP.png
new file mode 100644
index 00000000..31b2bdde
Binary files /dev/null and b/lam/docs/manual-sources/images/fixedIP.png differ
diff --git a/lam/docs/manual-sources/images/ldapPublicKey.png b/lam/docs/manual-sources/images/ldapPublicKey.png
new file mode 100644
index 00000000..b2b885e7
Binary files /dev/null and b/lam/docs/manual-sources/images/ldapPublicKey.png differ
diff --git a/lam/docs/manual-sources/images/macAddress.png b/lam/docs/manual-sources/images/macAddress.png
new file mode 100644
index 00000000..c2e2396b
Binary files /dev/null and b/lam/docs/manual-sources/images/macAddress.png differ
diff --git a/lam/docs/manual-sources/images/mailRouting.png b/lam/docs/manual-sources/images/mailRouting.png
new file mode 100644
index 00000000..d146abdd
Binary files /dev/null and b/lam/docs/manual-sources/images/mailRouting.png differ
diff --git a/lam/docs/manual-sources/images/mod_asterisk.png b/lam/docs/manual-sources/images/mod_asterisk.png
deleted file mode 100644
index 0b97933f..00000000
Binary files a/lam/docs/manual-sources/images/mod_asterisk.png and /dev/null differ
diff --git a/lam/docs/manual-sources/images/nisNetgroup.png b/lam/docs/manual-sources/images/nisNetgroup.png
new file mode 100644
index 00000000..f2e6f8e0
Binary files /dev/null and b/lam/docs/manual-sources/images/nisNetgroup.png differ
diff --git a/lam/docs/manual-sources/images/ranges.png b/lam/docs/manual-sources/images/ranges.png
new file mode 100644
index 00000000..d3d083ab
Binary files /dev/null and b/lam/docs/manual-sources/images/ranges.png differ