Merge of Jelmer's usage updates for net.

(This used to be commit 6a5b88c95b3fd17431cda79e9aa2a593fef85100)

4 files changed, 8 insertions, 5 deletions

diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 4000a248ff..07409aec22 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -42,11 +42,12 @@ int net_common_flags_usage(int argc, const char **argv)
 	d_printf("Valid miscellaneous options are:\n"); /* misc options */
 	d_printf("\t-p or --port=<port>\t\tconnection port on target\n");
 	d_printf("\t-W or --myworkgroup=<wg>\tclient workgroup\n");
-	d_printf("\t-d or --debug=<level>\t\tdebug level (0-10)\n");
+	d_printf("\t-d or --debuglevel=<level>\t\tdebug level (0-10)\n");
 	d_printf("\t-n or --myname=<name>\t\tclient name\n");
 	d_printf("\t-U or --user=<name>\t\tuser name\n");
-	d_printf("\t-s or --conf=<path>\t\tpathname of smb.conf file\n");
+	d_printf("\t-s or --configfile=<path>\t\tpathname of smb.conf file\n");
 	d_printf("\t-l or --long\t\t\tDisplay full information\n");
+	d_printf("\t-V or --version\t\tPrint samba version information\n");
 	d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
 	return -1;
 }
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index f52eabf494..6e691a1f60 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -260,6 +260,9 @@ int net_rap_session_usage(int argc, const char **argv)
 	 "\tor"\
 	 "\nnet rap session CLOSE <client_name> [misc. options] [targets]"\
 	 "\n\tDeletes (closes) a session from specified client to server\n");
+	d_printf(
+	"\nnet rap session INFO <client_name>"\
+	"\n\tEnumerates all open files in specified session\n");
 
 	net_common_flags_usage(argc, argv);
 	return -1;
@@ -460,7 +463,6 @@ int net_rap_printq_usage(int argc, const char **argv)
 	 "\tprinter queue if no job number is specified\n");
 
 	net_common_flags_usage(argc, argv);
-        d_printf("\t-j or --jobid=<job id>\t\tjob id\n");
 
 	return -1;
 }	
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index b0eb335986..e2fd9aa434 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -63,7 +63,7 @@ int net_rpc_join_ok(const char *domain)
 
 	if (!secrets_fetch_trust_account_password(domain,
 						  stored_md4_trust_password, NULL)) {
-		DEBUG(0,("Could not reterive domain trust secret"));
+		DEBUG(0,("Could not retreive domain trust secret"));
 		goto done;
 	}
 	
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index f811d76f68..0b78cd54ce 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -362,7 +362,7 @@ sam_account_from_delta(SAM_ACCOUNT *account, SAM_ACCOUNT_INFO *delta)
 	}
 
 #if 0
-        /* No kickoff time in the delta? */
+/*	No kickoff time in the delta? */
 	if (!nt_time_is_zero(&delta->kickoff_time)) {
 		unix_time = nt_time_to_unix(&delta->kickoff_time);
 		stored_time = pdb_get_kickoff_time(account);