[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4378-g0d874b2

Kai Blin kai at samba.org
Mon Nov 17 07:48:14 GMT 2008

The branch, v3-3-test has been updated
       via  0d874b23a43778931c0c570c5aa77bec6888d21d (commit)
      from  c9c50ced497476ef43ec0cc5a205a89c2b9318ba (commit)


- Log -----------------------------------------------------------------
commit 0d874b23a43778931c0c570c5aa77bec6888d21d
Author: Kai Blin <kai at samba.org>
Date:   Mon Nov 17 08:37:21 2008 +0100

    net: Fix net rap printq info documentation (bug #5892)
    Carsten Dumke <carsten at cdumke.de> reported and provided a patch
    for v3.0 and v3.2. (See 0a7fb721cdc)
    This fixes the same issue in v3.3 and also changes the auto-generated usage
    information to give better help about net rap printq info.


Summary of changes:
 docs-xml/manpages-3/net.8.xml |    2 +-
 source/utils/net_rap.c        |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 31fe69d..75f85e1 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -395,7 +395,7 @@ current network.</para>
 <title>RAP PRINTQ</title>
-<title>RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable></title>
+<title>RAP PRINTQ INFO <replaceable>QUEUE_NAME</replaceable></title>
 <para>Lists the specified print queue and print jobs on the server.
 If the <replaceable>QUEUE_NAME</replaceable> is omitted, all 
diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c
index 570e951..dd757ab 100644
--- a/source/utils/net_rap.c
+++ b/source/utils/net_rap.c
@@ -612,7 +612,7 @@ int net_rap_printq_usage(struct net_context *c, int argc, const char **argv)
 	 "net rap printq [misc. options] [targets]\n"
-	 "net rap printq list [<queue_name>] [misc. options] [targets]\n"
+	 "net rap printq info [<queue_name>] [misc. options] [targets]\n"
 	 "\tlists the specified queue and jobs on the target server.\n"
 	 "\tIf the queue name is not specified, all queues are listed.\n\n");
@@ -726,9 +726,10 @@ int net_rap_printq(struct net_context *c, int argc, const char **argv)
-			"Display info about print job",
-			"net rap printq info\n"
-			"    Display info about print job"
+			"Display info about print queues and jobs",
+			"net rap printq info [queue]\n"
+			"    Display info about print jobs in queue.\n"
+			"    If queue is not specified, all queues are listed"

Samba Shared Repository

More information about the samba-cvs mailing list