From ca30b9ff3e66134f9d9d741e9c752ab4f6522f4e Mon Sep 17 00:00:00 2001
From: Giampaolo Lauria <lauria2@yahoo.com>
Date: Tue, 2 Aug 2011 13:50:15 -0400
Subject: samba-tool: Expanded acronym descriptions

Expanded command acronym descriptions
Added footnote for "server connection needed"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
---
 source4/scripting/python/samba/netcmd/__init__.py   | 1 +
 source4/scripting/python/samba/netcmd/delegation.py | 2 +-
 source4/scripting/python/samba/netcmd/drs.py        | 2 +-
 source4/scripting/python/samba/netcmd/fsmo.py       | 2 +-
 source4/scripting/python/samba/netcmd/gpo.py        | 2 +-
 source4/scripting/python/samba/netcmd/rodc.py       | 2 +-
 source4/scripting/python/samba/netcmd/spn.py        | 2 +-
 source4/scripting/python/samba/netcmd/time.py       | 2 +-
 source4/scripting/python/samba/netcmd/user.py       | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'source4')

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index 3b7b982459..d4f9b4b710 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -165,6 +165,7 @@ class SuperCommand(Command):
         max_length = len(max(subcmds, key=len))
         for cmd in subcmds:
             print "  %*s  - %s" % (-max_length, cmd, self.subcommands[cmd].description)
+        print " *  server connection needed"
         if subcommand in [None]:
             raise CommandError("You must specify a subcommand")
         if subcommand in ['help', '-h', '--help']:
diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/source4/scripting/python/samba/netcmd/delegation.py
index 9aa8287785..48ec7ca25b 100644
--- a/source4/scripting/python/samba/netcmd/delegation.py
+++ b/source4/scripting/python/samba/netcmd/delegation.py
@@ -228,7 +228,7 @@ class cmd_delegation_del_service(Command):
             raise CommandError(err)
 
 class cmd_delegation(SuperCommand):
-    """Delegation management [server connection needed]"""
+    """Delegation management *"""
 
     subcommands = {}
     subcommands["show"] = cmd_delegation_show()
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py
index e9cd540603..94029405ae 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/source4/scripting/python/samba/netcmd/drs.py
@@ -477,7 +477,7 @@ class cmd_drs_options(Command):
 
 
 class cmd_drs(SuperCommand):
-    """DRS commands"""
+    """Directory Replication Services (DRS) management"""
 
     subcommands = {}
     subcommands["bind"] = cmd_drs_bind()
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
index d709cc8fda..c2b0101a46 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -33,7 +33,7 @@ from samba.netcmd import (
 from samba.samdb import SamDB
 
 class cmd_fsmo(Command):
-    """Manage flexible single master (FSMO) roles [server connection needed]"""
+    """Flexible Single Master Operations (FSMO) roles management *"""
 
     synopsis = "(show | transfer <options> | seize <options>)"
 
diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py
index cef711d2d9..06fa01c142 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/source4/scripting/python/samba/netcmd/gpo.py
@@ -956,7 +956,7 @@ class cmd_create(Command):
 
 
 class cmd_gpo(SuperCommand):
-    """Group Policy Object (GPO) commands"""
+    """Group Policy Object (GPO) management"""
 
     subcommands = {}
     subcommands["listall"] = cmd_listall()
diff --git a/source4/scripting/python/samba/netcmd/rodc.py b/source4/scripting/python/samba/netcmd/rodc.py
index 75c326f950..f9e2aa9117 100644
--- a/source4/scripting/python/samba/netcmd/rodc.py
+++ b/source4/scripting/python/samba/netcmd/rodc.py
@@ -104,7 +104,7 @@ class cmd_rodc_preload(Command):
 
 
 class cmd_rodc(SuperCommand):
-    """RODC commands"""
+    """Read-Only Domain Controller (RODC) management"""
 
     subcommands = {}
     subcommands["preload"] = cmd_rodc_preload()
diff --git a/source4/scripting/python/samba/netcmd/spn.py b/source4/scripting/python/samba/netcmd/spn.py
index 672f1401e9..d43b0afd02 100644
--- a/source4/scripting/python/samba/netcmd/spn.py
+++ b/source4/scripting/python/samba/netcmd/spn.py
@@ -192,7 +192,7 @@ class cmd_spn_delete(Command):
             raise CommandError("Service principal %s not affected" % name)
 
 class cmd_spn(SuperCommand):
-    """SPN management [server connection needed]"""
+    """Service Principal Name (SPN) management *"""
 
     subcommands = {}
     subcommands["add"] = cmd_spn_add()
diff --git a/source4/scripting/python/samba/netcmd/time.py b/source4/scripting/python/samba/netcmd/time.py
index af4e177ed7..2d9e225935 100644
--- a/source4/scripting/python/samba/netcmd/time.py
+++ b/source4/scripting/python/samba/netcmd/time.py
@@ -28,7 +28,7 @@ from samba.netcmd import (
     )
 
 class cmd_time(Command):
-    """Retrieve the time on a remote server [server connection needed]"""
+    """Retrieve the time on a remote server *"""
     synopsis = "%prog time <server-name>"
 
     takes_args = ["server_name?"]
diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index b9c562dbc6..281f2cfdcd 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -287,7 +287,7 @@ class cmd_user_setpassword(Command):
 
 
 class cmd_user(SuperCommand):
-    """User management [server connection needed]"""
+    """User management *"""
 
     subcommands = {}
     subcommands["add"] = cmd_user_add()
-- 
cgit