Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook

Conflicts:

	source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)

4 files changed, 50 insertions, 33 deletions

diff --git a/docs-xml/smbdotconf/filename/mangledmap.xml b/docs-xml/smbdotconf/filename/mangledmap.xml
deleted file mode 100644
index b4be3a80d2..0000000000
--- a/docs-xml/smbdotconf/filename/mangledmap.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<samba:parameter name="mangled map"
-				 type="string"
-                 context="S"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-	This is for those who want to directly map UNIX file names which cannot be represented on 
-	Windows/DOS.  The mangling of names is not always what is needed.  In particular you may have 
-	documents with file extensions that differ between DOS and UNIX. 
-	For example, under UNIX it is common to use <filename moreinfo="none">.html</filename> 
-	for HTML files, whereas under Windows/DOS <filename moreinfo="none">.htm</filename> 
-	is more commonly used.
-	</para>
-
-	<para>
-	So to map <filename moreinfo="none">html</filename> to <filename moreinfo="none">htm</filename> 
-	you would use:
-	</para>
-		
-	<para>
-	<smbconfoption name="mangled map">(*.html *.htm)</smbconfoption>.
-	</para>
-
-	<para>
-	One very useful case is to remove the annoying <filename moreinfo="none">;1</filename> off 
-	the ends of filenames on some CDROMs (only visible under some UNIXes). To do this use a map of 
-	(*;1 *;).
-	</para>
-</description>
-
-<value type="default"><comment>no mangled map</comment></value>
-<value type="example">(*;1 *;)</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml b/docs-xml/smbdotconf/misc/clusteraddresses.xml
new file mode 100644
index 0000000000..d34d5503d3
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="cluster addresses"
+	         context="G"
+			 type="list"
+		 developer="1"
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>With this parameter you can add additional addresses
+	nmbd will register with a WINS server. These addresses are not
+	necessarily present on all nodes simultaneously, but they will
+	be registered with the WINS server so that clients can contact
+	any of the nodes.
+	</para>
+</description>
+
+<value type="default"></value>
+<value type="example">10.0.0.1 10.0.0.2 10.0.0.3</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/clustering.xml b/docs-xml/smbdotconf/misc/clustering.xml
new file mode 100644
index 0000000000..b85934e78e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="clustering"
+                 context="G"
+				 type="boolean"
+                 advanced="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>This parameter specifies whether Samba should contact
+	ctdb for accessing its tdb files and use ctdb as a backend
+	for its messaging backend.
+	</para>
+
+	<para>Set this parameter to <value type="example">yes</value> only if
+	you have a cluster setup with ctdb running.
+	</para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
new file mode 100644
index 0000000000..a478553ec1
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -0,0 +1,16 @@
+<samba:parameter name="ctdbd socket"
+                 context="G"
+                 advanced="1"
+				 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>default</synonym>
+<description>
+	<para>If you set <value type="example">clustering=yes</value>,
+	you need to tell Samba where ctdbd listens on its unix domain
+	socket. The default path as of ctdb 1.0 is /tmp/ctdb.socket which
+	you have to explicitly set for Samba in smb.conf.
+	</para>
+</description>
+<value type="default"></value>
+<value type="example">/tmp/ctdb.socket</value>
+</samba:parameter>