[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  f4d8716... s3-docs: Unify capitalization.
       via  4b55c32... s3-docs: Add documentation of the net g_lock subcommand.
      from  b737434... s3-docs: Move -D option to the right paragraph in man winbindd.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit f4d87160444eaa4f5a0239ad58159f13e03a851e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 12 16:21:56 2010 +0200

    s3-docs: Unify capitalization.
    
    Karolin
    (cherry picked from commit da64913f55fa2c3d0b34cda3b8c4953894c4ed66)

commit 4b55c32a614f47849f8e6e12eccdd06fbbea5e96
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 12 16:17:33 2010 +0200

    s3-docs: Add documentation of the net g_lock subcommand.
    
    Karolin
    (cherry picked from commit ad6f63822915463011074c9e5f3ed938b48579f4)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/net.8.xml |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 76ef51f..51971c8 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1790,6 +1790,46 @@ This example would connect to a computer named XP as the local administrator usi
 </refsect2>
 
 <refsect2>
+<title>G_LOCK</title>
+
+<para>Manage global locks.</para>
+
+<refsect3>
+<title>G_LOCK DO <replaceable>lockname</replaceable> <replaceable>timeout</replaceable> <replaceable>command</replaceable></title>
+
+<para>
+Execute a shell command under a global lock. This might be useful to define the
+order in which serveral shell commands will be executed. The locking information
+is stored in a file called <filename>g_lock.tdb</filename>. In setups with CTDB
+running, the locking information will be available on all cluster nodes.
+</para>
+
+<itemizedlist>
+<listitem><para><replaceable>LOCKNAME</replaceable> defines the name of the global lock.</para></listitem>
+<listitem><para><replaceable>TIMEOUT</replaceable> defines the timeout.</para></listitem>
+<listitem><para><replaceable>COMMAND</replaceable> defines the shell command to execute.</para></listitem>
+</itemizedlist>
+</refsect3>
+
+<refsect3>
+<title>G_LOCK LOCKS</title>
+
+<para>
+Print a list of all currently existing locknames.
+</para>
+</refsect3>
+
+<refsect3>
+<title>G_LOCK DUMP <replaceable>lockname</replaceable></title>
+
+<para>
+Dump the locking table of a certain global lock.
+</para>
+</refsect3>
+
+</refsect2>
+
+<refsect2>
 <title>HELP [COMMAND]</title>
 
 <para>Gives usage information for the specified command.</para>


-- 
Samba Shared Repository