From 33a72968e566f47a3dcb5e8d752d47847d464337 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 28 Feb 2013 23:30:16 +1100 Subject: docs: Add documentation for osName and osVer This was previously documented only in the online help. Andrew Bartlett Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Mar 7 01:36:01 CET 2013 on sn-devel-104 --- docs-xml/manpages/net.8.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docs-xml/manpages') 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 /bin/date. [RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN] -[createcomputer=OU] [machinepass=PASS] [options] +[createcomputer=OU] [machinepass=PASS] [osName=string osVer=string] [options] 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. + +[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. + -- cgit