summaryrefslogtreecommitdiff
path: root/docs-xml/manpages
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-02-28 23:30:16 +1100
committerJeremy Allison <jra@samba.org>2013-03-07 01:36:01 +0100
commit33a72968e566f47a3dcb5e8d752d47847d464337 (patch)
tree36865b2b79357c27ea89f502f29925ddeb163c73 /docs-xml/manpages
parentc66632046d62786dd19c8978847bfc6470da4e89 (diff)
downloadsamba-33a72968e566f47a3dcb5e8d752d47847d464337.tar.gz
samba-33a72968e566f47a3dcb5e8d752d47847d464337.tar.bz2
samba-33a72968e566f47a3dcb5e8d752d47847d464337.zip
docs: Add documentation for osName and osVer
This was previously documented only in the online help. Andrew Bartlett Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Mar 7 01:36:01 CET 2013 on sn-devel-104
Diffstat (limited to 'docs-xml/manpages')
-rw-r--r--docs-xml/manpages/net.8.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 0cdadea9e2..82849f2ee7 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -195,7 +195,7 @@ the remote server using <command>/bin/date</command>. </para>
<refsect2>
<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN]
-[createcomputer=OU] [machinepass=PASS] [options]</title>
+[createcomputer=OU] [machinepass=PASS] [osName=string osVer=string] [options]</title>
<para>
Join a domain. If the account already exists on the server, and
@@ -225,6 +225,11 @@ and it is not used as a delimiter.
[PASS] (ADS only) Set a specific password on the computer account
being created by the join.
</para>
+<para>
+[osName=string osVer=String] (ADS only) Set the operatingSystem and
+operatingSystemVersion attribute during the join. Both parameters
+must be specified for either to take effect.
+</para>
</refsect2>
<refsect2>