summaryrefslogtreecommitdiffstats
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 11:52:50 +0200
commitaa97504f0358dcc23de7a65f39a1c4d24f0709b7 (patch)
tree2b9c8b4abd66a8c762bdbecb6ce3278cfcc07208
parent557f9175c3a94ee6904ff7e1af0c361071d80258 (diff)
downloadsamba-3.3.5.tar.gz
samba-3.3.5.tar.xz
samba-3.3.5.zip
s3/docs: Fix typo.samba-3.3.5
Karolin (cherry picked from commit 6e45c21384b8845422967ff1fa46e48de9fee1ab)
-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 9206cb804df..c63ec6ada1b 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>