14 files changed, 16 insertions, 16 deletions
diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py
index ecd835ddd2..f7e67a2eda 100644
--- a/source4/scripting/python/samba/netcmd/domainlevel.py
+++ b/source4/scripting/python/samba/netcmd/domainlevel.py
@@ -47,7 +47,7 @@ from samba.dsdb import (
     )
 
 class cmd_domainlevel(Command):
-    """Raises domain and forest function levels."""
+    """Raises domain and forest function levels"""
 
     synopsis = "(show | raise <options>)"
 
diff --git a/source4/scripting/python/samba/netcmd/enableaccount.py b/source4/scripting/python/samba/netcmd/enableaccount.py
index 0e57b5714c..3849f60814 100644
--- a/source4/scripting/python/samba/netcmd/enableaccount.py
+++ b/source4/scripting/python/samba/netcmd/enableaccount.py
@@ -27,7 +27,7 @@ from samba.netcmd import Command, CommandError, Option
 from samba.samdb import SamDB
 
 class cmd_enableaccount(Command):
-    """Enable an account."""
+    """Enables a user"""
 
     synopsis = "enableaccount [username] [options]"
 
diff --git a/source4/scripting/python/samba/netcmd/export.py b/source4/scripting/python/samba/netcmd/export.py
index 9f1ff3d133..08fa4bf8df 100644
--- a/source4/scripting/python/samba/netcmd/export.py
+++ b/source4/scripting/python/samba/netcmd/export.py
@@ -28,7 +28,7 @@ from samba.netcmd import (
     )
 
 class cmd_export_keytab(Command):
-    """Dumps kerberos keys of the domain into a keytab."""
+    """Dumps kerberos keys of the domain into a keytab"""
     synopsis = "%prog export keytab <keytab>"
 
     takes_optiongroups = {
@@ -50,7 +50,7 @@ class cmd_export_keytab(Command):
 
 
 class cmd_export(SuperCommand):
-    """Dumps the sam of the domain we are joined to."""
+    """Dumps the sam of the domain we are joined to [server connection needed]"""
 
     subcommands = {}
     subcommands["keytab"] = cmd_export_keytab()
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
index 688602012b..6b421fa214 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -32,7 +32,7 @@ from samba.netcmd import (
 from samba.samdb import SamDB
 
 class cmd_fsmo(Command):
-    """Makes the targer DC transfer or seize a fsmo role"""
+    """Makes the targer DC transfer or seize a fsmo role [server connection needed]"""
 
     synopsis = "(show | transfer <options> | seize <options>)"
 
diff --git a/source4/scripting/python/samba/netcmd/join.py b/source4/scripting/python/samba/netcmd/join.py
index 981161d8ba..8438f755db 100644
--- a/source4/scripting/python/samba/netcmd/join.py
+++ b/source4/scripting/python/samba/netcmd/join.py
@@ -26,7 +26,7 @@ from samba.dcerpc.netr import SEC_CHAN_WKSTA, SEC_CHAN_BDC
 
 
 class cmd_join(Command):
-    """Joins domain as either member or backup domain controller."""
+    """Joins domain as either member or backup domain controller [server connection needed]"""
 
     synopsis = "%prog join <domain> [BDC | MEMBER] [options]"
 
diff --git a/source4/scripting/python/samba/netcmd/machinepw.py b/source4/scripting/python/samba/netcmd/machinepw.py
index 8788e06a60..f156f9752a 100644
--- a/source4/scripting/python/samba/netcmd/machinepw.py
+++ b/source4/scripting/python/samba/netcmd/machinepw.py
@@ -25,7 +25,7 @@ from samba.netcmd import Command, CommandError
 
 
 class cmd_machinepw(Command):
-    """Get a machine password out of our SAM."""
+    """Gets a machine password out of our SAM"""
 
     synopsis = "%prog machinepw <accountname>"
 
diff --git a/source4/scripting/python/samba/netcmd/newuser.py b/source4/scripting/python/samba/netcmd/newuser.py
index 0d400bf745..9ffc0e6525 100644
--- a/source4/scripting/python/samba/netcmd/newuser.py
+++ b/source4/scripting/python/samba/netcmd/newuser.py
@@ -28,7 +28,7 @@ from samba.auth import system_session
 from samba.samdb import SamDB
 
 class cmd_newuser(Command):
-    """Create a new user."""
+    """Creates a new user"""
 
     synopsis = "newuser [options] <username> [<password>]"
 
diff --git a/source4/scripting/python/samba/netcmd/pwsettings.py b/source4/scripting/python/samba/netcmd/pwsettings.py
index 8748bc5e0d..3030248e4b 100644
--- a/source4/scripting/python/samba/netcmd/pwsettings.py
+++ b/source4/scripting/python/samba/netcmd/pwsettings.py
@@ -31,7 +31,7 @@ from samba.dcerpc.samr import DOMAIN_PASSWORD_COMPLEX
 from samba.netcmd import Command, CommandError, Option
 
 class cmd_pwsettings(Command):
-    """Sets password settings.
+    """Sets password settings
 
     Password complexity, history length, minimum password length, the minimum 
     and maximum password age) on a Samba4 server.
diff --git a/source4/scripting/python/samba/netcmd/setexpiry.py b/source4/scripting/python/samba/netcmd/setexpiry.py
index b95192aa9c..c424c08ca8 100644
--- a/source4/scripting/python/samba/netcmd/setexpiry.py
+++ b/source4/scripting/python/samba/netcmd/setexpiry.py
@@ -28,7 +28,7 @@ from samba.auth import system_session
 from samba.samdb import SamDB
 
 class cmd_setexpiry(Command):
-    """Set the expiration of a user account."""
+    """Sets the expiration of a user account"""
 
     synopsis = "setexpiry [username] [options]"
 
diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py
index a1fe75c029..098b3cb9b8 100644
--- a/source4/scripting/python/samba/netcmd/setpassword.py
+++ b/source4/scripting/python/samba/netcmd/setpassword.py
@@ -28,7 +28,7 @@ from samba.auth import system_session
 from samba.samdb import SamDB
 
 class cmd_setpassword(Command):
-    """Change the password of a user."""
+    """(Re)sets the password on a user account"""
 
     synopsis = "setpassword [username] [options]"
 
diff --git a/source4/scripting/python/samba/netcmd/time.py b/source4/scripting/python/samba/netcmd/time.py
index 163887a57e..710f4b6d15 100644
--- a/source4/scripting/python/samba/netcmd/time.py
+++ b/source4/scripting/python/samba/netcmd/time.py
@@ -27,7 +27,7 @@ from samba.netcmd import (
     )
 
 class cmd_time(Command):
-    """Retrieve the time on a remote server."""
+    """Retrieve the time on a remote server [server connection needed]"""
     synopsis = "%prog time <server-name>"
 
     takes_optiongroups = {
diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 54ddfe2322..bf63b49b90 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -68,7 +68,7 @@ class cmd_user_delete(Command):
 
 
 class cmd_user(SuperCommand):
-    """User management."""
+    """User management [server connection needed]"""
 
     subcommands = {}
     subcommands["add"] = cmd_user_add()
diff --git a/source4/scripting/python/samba/netcmd/vampire.py b/source4/scripting/python/samba/netcmd/vampire.py
index fcf969490a..ffcfbce3d0 100644
--- a/source4/scripting/python/samba/netcmd/vampire.py
+++ b/source4/scripting/python/samba/netcmd/vampire.py
@@ -29,7 +29,7 @@ from samba.netcmd import (
     )
 
 class cmd_vampire(Command):
-    """Join and synchronise a remote AD domain to the local server."""
+    """Join and synchronise a remote AD domain to the local server [server connection needed]"""
     synopsis = "%prog vampire [options] <domain>"
 
     takes_optiongroups = {
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 0354131204..5727b5308f 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -196,8 +196,8 @@ int net_run_usage(struct net_context *ctx,
 
 /* main function table */
 static const struct net_functable net_functable[] = {
-	{"password", "change password\n", net_password, net_password_usage},
-	{"join", "join a domain\n", net_join, net_join_usage},
+	{"password", "Changes/Sets the password on a user account [server connection needed]\n", net_password, net_password_usage},
+	{"join", "Joins a domain [server connection needed]\n", net_join, net_join_usage},
 	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
 	{"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
 	{"drs", "Implements functionality offered by repadmin.exe utility in Windows\n", net_drs, net_drs_usage},