[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5306-g6e45c21

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  6e45c21384b8845422967ff1fa46e48de9fee1ab (commit)
      from  acde34bc7d5b038f5965acc0fccaff6f7658f3d5 (commit)

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


- Log -----------------------------------------------------------------
commit 6e45c21384b8845422967ff1fa46e48de9fee1ab
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 16 11:49:54 2009 +0200

    s3/docs: Fix typo.
    
    Karolin

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

Summary of changes:
 docs-xml/manpages-3/net.8.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 9206cb8..c63ec6a 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1663,7 +1663,7 @@ This example would connect to a computer named XP as the local administrator usi
 </refsect2>
 
 <refsect2>
->>>>>>> 80d32b8... s3-docs: Fix Bug #6331. Document "net dom join/net dom unjoin".:docs-xml/manpages-3/net.8.xml
+
 <title>HELP [COMMAND]</title>
 
 <para>Gives usage information for the specified command.</para>


-- 
Samba Shared Repository