[PATCH] reformat usage text for net ads join

[Michael Adam]

Attached, to be applied after the patch to introduce
--no-dns-updates

Review appreciated!

Thanks - Michael
-------------- next part --------------
From 79d23ed9a364b87ec22387300a61cee6d823104e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 9 Sep 2015 08:58:43 +0200
Subject: [PATCH] net: reformat usage text for 'net ads join'

Make the items nicely aligned again and do not exceed 80 columns.
A few typos are fixed along the way.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/utils/net_ads.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8a2985c..5cc07a0 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1320,24 +1320,27 @@ static int net_ads_join_usage(struct net_context *c, int argc, const char **argv
 {
 	d_printf(_("net ads join [--no-dns-updates] [options]\n"
 	           "Valid options:\n"));
-	d_printf(_("   createupn[=UPN]    Set the userPrincipalName attribute during the join.\n"
-		   "                      The deault UPN is in the form host/netbiosname at REALM.\n"));
-	d_printf(_("   createcomputer=OU  Precreate the computer account in a specific OU.\n"
-		   "                      The OU string read from top to bottom without RDNs and delimited by a '/'.\n"
-		   "                      E.g. \"createcomputer=Computers/Servers/Unix\"\n"
-		   "                      NB: A backslash '\\' is used as escape at multiple levels and may\n"
-		   "                          need to be doubled or even quadrupled.  It is not used as a separator.\n"));
-	d_printf(_("   machinepass=PASS   Set the machine password to a specific value during the join.\n"
-		   "                      The deault password is random.\n"));
-	d_printf(_("   osName=string      Set the operatingSystem attribute during the join.\n"));
-	d_printf(_("   osVer=string       Set the operatingSystemVersion attribute during the join.\n"
-		   "                      NB: osName and osVer must be specified together for either to take effect.\n"
-		   "                          Also, the operatingSystemService attribute is also set when along with\n"
-		   "                          the two other attributes.\n"));
-
-	d_printf(_("   osServicePack=string Set the operatingSystemServicePack "
-		   "attribute during the join. Note: if not specified then by "
-		   "default the samba version string is used instead.\n"));
+	d_printf(_("   createupn[=UPN]       Set the userPrincipalName attribute during the join.\n"
+		   "                         The default UPN is in the form host/netbiosname at REALM.\n"));
+	d_printf(_("   createcomputer=OU     Precreate the computer account in a specific OU.\n"
+		   "                         The OU string read from top to bottom without RDNs\n"
+		   "                         and delimited by a '/'.\n"
+		   "                         E.g. \"createcomputer=Computers/Servers/Unix\"\n"
+		   "                         NB: A backslash '\\' is used as escape at multiple\n"
+		   "                             levels and may need to be doubled or even\n"
+		   "                             quadrupled. It is not used as a separator.\n"));
+	d_printf(_("   machinepass=PASS      Set the machine password to a specific value during\n"
+		   "                         the join. The default password is random.\n"));
+	d_printf(_("   osName=string         Set the operatingSystem attribute during the join.\n"));
+	d_printf(_("   osVer=string          Set the operatingSystemVersion attribute during join.\n"
+		   "                         NB: osName and osVer must be specified together for\n"
+		   "                             either to take effect. The operatingSystemService\n"
+		   "                             attribute is then also set along with the two\n"
+		   "                             other attributes.\n"));
+	d_printf(_("   osServicePack=string  Set the operatingSystemServicePack attribute\n"
+		   "                         during the join.\n"
+		   "                         NB: If not specified then by default the samba\n"
+		   "                             version string is used instead.\n"));
 	return -1;
 }
 
-- 
2.4.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150909/22229a4c/attachment.sig>