From 675b363b712e0b91b9b7d1189a819a36853db539 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 17 Dec 2008 09:17:26 +0100 Subject: docs: Fix TOC of generated HTML docs. This fixes bug #5968. Thanks to Christian Perrier for reporting! Karolin --- docs-xml/htmldocs.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'docs-xml') diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index d2be5effa9..44fcc0f289 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,19 +23,15 @@ This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - Using Samba, 2nd Edition + Using Samba, 2nd Edition Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. - Man pages + Man pages The Samba man pages in HTML. WHATSNEW Samba Release Notes. - - README.VENDOR - VENDOR specific information. - -- cgit From 6ac36698e975649d26e3f2975c2101129c3ffe97 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 17 Dec 2008 15:42:12 +0100 Subject: docs: Fix some formatting issues in the "ldap ssl" section of man smb.conf. Karolin --- docs-xml/smbdotconf/ldap/ldapssl.xml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index 39ed08fe82..383a545ae2 100644 --- a/docs-xml/smbdotconf/ldap/ldapssl.xml +++ b/docs-xml/smbdotconf/ldap/ldapssl.xml @@ -3,36 +3,38 @@ type="enum" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - + This option is used to define whether or not Samba should use SSL when connecting to the ldap server This is NOT related to - Samba's previous SSL support which was enabled by specifying the - --with-ssl option to the configure + Samba's previous SSL support which was enabled by specifying the + --with-ssl option to the + configure script. - -The can be set to one of three values: + + The can be set to one of + three values: - Off = Never + Off = Never use SSL when querying the directory. - Start_tls = Use - the LDAPv3 StartTLS extended operation (RFC2830) for + Start_tls = Use + the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. - + - On = Use SSL - on the ldaps port when contacting the ldap server. Only available when the - backwards-compatiblity On = Use SSL + on the ldaps port when contacting the + moreinfo="none">ldap server. Only available when the + backwards-compatiblity moreinfo="none">--with-ldapsam option is specified - to configure. See . + to configure. See . - + start_tls -- cgit From 580461629bb88ce3b61770e7abfe2c942a121877 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 17 Dec 2008 16:18:38 +0100 Subject: docs: Update section "ldap ssl" in man smb.conf. Remove non-existent value "on". Change default value to "no". Add hint about ldaps. Karolin --- docs-xml/smbdotconf/ldap/ldapssl.xml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index 383a545ae2..d785071ec4 100644 --- a/docs-xml/smbdotconf/ldap/ldapssl.xml +++ b/docs-xml/smbdotconf/ldap/ldapssl.xml @@ -12,8 +12,14 @@ configure script. + LDAP connections should be secured where possible. This may be + done setting either this parameter to + Start_tls + or by specifying ldaps:// in + the URL argument of . + The can be set to one of - three values: + two values: Off = Never @@ -25,16 +31,7 @@ the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. - - - On = Use SSL - on the ldaps port when contacting the - moreinfo="none">ldap server. Only available when the - backwards-compatiblity - moreinfo="none">--with-ldapsam option is specified - to configure. See . - -start_tls +no -- cgit From 994ef68164c12a3b0494f6491bc9f402c912600f Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 17 Dec 2008 16:28:59 +0100 Subject: docs: Fix typo in man idmap_hash. Karolin --- docs-xml/manpages-3/idmap_hash.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-xml') diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml index 8e452b3c89..fbafd71627 100644 --- a/docs-xml/manpages-3/idmap_hash.8.xml +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -37,7 +37,7 @@ Specifies the absolute path to the name mapping file used by the nss_info API. Entries in the file are of the form "unix name - = qualified domain name"e;. + = qualified domain name". Mapping of both user and group names is supported. -- cgit