summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-09-09 08:40:31 +0200
committerJeremy Allison <jra@samba.org>2015-09-09 21:34:15 +0200
commitd7a617f2f00c4a2b5294523fa651915c85de0d8b (patch)
treeba845b9066e54325587c2019e6cfe0f07fde7121 /docs-xml
parentae81a40b1193ef93add61666ace6fff1a1e0676a (diff)
downloadsamba-d7a617f2f00c4a2b5294523fa651915c85de0d8b.tar.gz
docs: mention new --no-dns-updates parameter in manpage of net.
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/manpages/net.8.xml12
1 files changed, 10 insertions, 2 deletions
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index a2bca95805a..f459bf46503 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -371,6 +371,13 @@
</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>--no-dns-updates</term>
+ <listitem><para>Do not perform DNS updates as part of
+ "net ads join".
+ </para></listitem>
+ </varlistentry>
+
&stdarg.encrypt;
&popt.common.samba.client;
@@ -439,8 +446,9 @@ The remote server must be specified with the -S option.
</refsect2>
<refsect2>
-<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN]
-[createcomputer=OU] [machinepass=PASS] [osName=string osVer=string] [options]</title>
+<title>[RPC|ADS] JOIN [TYPE] [--no-dns-updates] [-U username[%password]]
+[createupn=UPN] [createcomputer=OU] [machinepass=PASS]
+[osName=string osVer=string] [options]</title>
<para>
Join a domain. If the account already exists on the server, and