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

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  57a019524d0d2bd434ac7382ed355f69c510ff14 (commit)
      from  26b5cb2df0fbf2d0c004da4872c3733f3b75fd62 (commit)

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


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

    s3/docs: Fix typo.
    
    Karolin
    (cherry picked from commit 6e45c21384b8845422967ff1fa46e48de9fee1ab)
    (cherry picked from commit aa97504f0358dcc23de7a65f39a1c4d24f0709b7)

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

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 97c6c86..3db3533 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1650,7 +1650,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