The branch, v3-2-stable has been updated via ab07c252d73534b50101975f742117477c92490e (commit) via 16adac4ea96e2234fd1253d0b866b0654bed9f8e (commit) from 1162b4f5a16b937ead40ee7787489a22c868875f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log ----------------------------------------------------------------- commit ab07c252d73534b50101975f742117477c92490e Author: Karolin Seeger <[EMAIL PROTECTED]> Date: Tue May 20 11:03:33 2008 +0200 man pages: Add documentation for new cluster parameters. Karolin (cherry picked from commit 029875d8c9b2f9448f5299faaa3a48e8bccbca53) commit 16adac4ea96e2234fd1253d0b866b0654bed9f8e Author: Karolin Seeger <[EMAIL PROTECTED]> Date: Sun May 4 06:48:31 2008 +0200 Developer's Guide: Fix typos. Karolin (cherry picked from commit e206ffb8562c821735555c9b426d76e49986fefe) ----------------------------------------------------------------------- Summary of changes: docs-xml/Samba3-Developers-Guide/vfs.xml | 4 ++-- docs-xml/smbdotconf/misc/clusteraddresses.xml | 17 +++++++++++++++++ docs-xml/smbdotconf/misc/clustering.xml | 17 +++++++++++++++++ docs-xml/smbdotconf/misc/ctdbdsocket.xml | 16 ++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 docs-xml/smbdotconf/misc/clusteraddresses.xml create mode 100644 docs-xml/smbdotconf/misc/clustering.xml create mode 100644 docs-xml/smbdotconf/misc/ctdbdsocket.xml Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-Developers-Guide/vfs.xml b/docs-xml/Samba3-Developers-Guide/vfs.xml index 44e0bd6..96d512c 100644 --- a/docs-xml/Samba3-Developers-Guide/vfs.xml +++ b/docs-xml/Samba3-Developers-Guide/vfs.xml @@ -553,7 +553,7 @@ you can set this function pointer to NULL.</para></listitem> <title>Upgrading to the New VFS Interface</title> <sect2> -<title>Upgrading from 2.2.* and 3.0aplha modules</title> +<title>Upgrading from 2.2.* and 3.0alpha modules</title> <orderedlist> <listitem><para> @@ -833,7 +833,7 @@ static int example_close(vfs_handle_struct *handle, files_struct *fsp, int fd) </para></listitem> <listitem><para> -To make it easy to build 3rd party modules it would be usefull to provide +To make it easy to build 3rd party modules it would be useful to provide configure.in, (configure), install.sh and Makefile.in with the module. (Take a look at the example in <filename>examples/VFS</filename>.) </para> diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml b/docs-xml/smbdotconf/misc/clusteraddresses.xml new file mode 100644 index 0000000..d34d550 --- /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 0000000..b85934e --- /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 0000000..a478553 --- /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> -- Samba Shared Repository