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:53:47 +0200
commit57a019524d0d2bd434ac7382ed355f69c510ff14 (patch)
tree92d4f803979e5cbdeeb1181650eeab428f868f44
parent26b5cb2df0fbf2d0c004da4872c3733f3b75fd62 (diff)
downloadsamba-57a019524d0d2bd434ac7382ed355f69c510ff14.tar.gz
samba-57a019524d0d2bd434ac7382ed355f69c510ff14.tar.xz
samba-57a019524d0d2bd434ac7382ed355f69c510ff14.zip
s3/docs: Fix typo.
Karolin (cherry picked from commit 6e45c21384b8845422967ff1fa46e48de9fee1ab) (cherry picked from commit aa97504f0358dcc23de7a65f39a1c4d24f0709b7)
-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>