summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2009-06-16 11:49:54 +0200
committerKarolin Seeger <kseeger@samba.org>2009-06-16 12:01:32 +0200
commita3d27deaa6c20d5764a511384d75ee481c92e13d (patch)
tree6b6ce1b8b91878afa61fe301788720c01a7f5f37
parent21be6f7f0aa8004ebbb6c85299b159baefa8d325 (diff)
downloadsamba-3.2.12.tar.gz
s3/docs: Fix typo.samba-3.2.12
Karolin (cherry picked from commit 6e45c21384b8845422967ff1fa46e48de9fee1ab) (cherry picked from commit aa97504f0358dcc23de7a65f39a1c4d24f0709b7) (cherry picked from commit 57a019524d0d2bd434ac7382ed355f69c510ff14)
-rw-r--r--docs-xml/manpages-3/net.8.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 97c6c861af4..3db3533fcfb 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>