Merge James Rowe's quilt-help.diff patch that fixes several help messages.

11 files changed, 19 insertions, 17 deletions

diff --git a/bin/quilt.in b/bin/quilt.in
index ad46877..bd7eeed 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -9,7 +9,7 @@
 usage()
 {
 
-	echo "Usage: quilt command [-h] ..." >&2
+	echo "Usage: quilt command [-h] ..."
 	#echo "Commands are:" $(
 	#	local command
 	#	for command in @QUILT@/*
diff --git a/quilt.changes b/quilt.changes
index 425f192..7f3d29c 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sat Feb  8 15:43:26 +0100 2003 - agruen@suse.de
+
+- Merge James Rowe <Jay@jnrowe.uklinux.net>'s quilt-help.diff
+  patch that fixes several help messages.
+
+-------------------------------------------------------------------
 Thu Feb  6 01:22:52 +0100 2003 - agruen@suse.de
 
 - Quilt refresh: Create sub-directories in patches directory
diff --git a/quilt/delete.in b/quilt/delete.in
index bc2cc2a..bc7060b 100644
--- a/quilt/delete.in
+++ b/quilt/delete.in
@@ -24,9 +24,9 @@ usage()
 	then
 		cat <<EOF
 
-Remove the specified or topmost patchfrom the series file. If the patch
-is applied, it is first tried to remove it. (Only the topmost patch can
-be removed right now.)
+Remove the specified or topmost patch from the series file. If the 
+patch is applied, quilt will attempt to remove it first. (Only the 
+topmost patch can be removed right now.)
 
 EOF
 		exit 0
diff --git a/quilt/diff.in b/quilt/diff.in
index a57eb8a..45357e0 100644
--- a/quilt/diff.in
+++ b/quilt/diff.in
@@ -34,10 +34,6 @@ Produces a diff of the specified file(s) in the topmost or
 specified patch. If no files are specified, all files that
 are modified are included.
 
-
-Produce a diff of the specified patch, or the topmost patch
-by default.
-
 -p n	Create a -p n style patch (-p0 or -p1 are supported).
 
 -P patch
diff --git a/quilt/patches.in b/quilt/patches.in
index 88a1f0c..51e055e 100644
--- a/quilt/patches.in
+++ b/quilt/patches.in
@@ -19,7 +19,7 @@ fi
 
 usage()
 {
-	echo "Usage: quilt contains {file}"
+	echo "Usage: quilt patches {file}"
 	if [ x$1 = x-h ]
 	then
 		cat <<EOF
diff --git a/quilt/pop.in b/quilt/pop.in
index 4ae716f..bc2c271 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -28,7 +28,7 @@ Remove patch(es) from the current stack. A number of
 patches to remove, or a patch name can be specified. If a
 patch name is given, remove all patches up to and
 including the named patch. If neither a number nor a patch
-name is specified, remove the next patch.
+name is specified, remove the next patch from the series file.
 
 -a	Remove all patches in the series file.
 
diff --git a/quilt/push.in b/quilt/push.in
index ca91940..7665f3a 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -28,7 +28,7 @@ Apply patch(es) from the series file. A number of patches
 to apply, or a patch name can be specified. If a patch
 name is given, apply all patches up to and including the
 named patch. If neither a number nor a patch name is
-specified, apply the next patch.
+specified, apply the next patch from the series file.
 
 -a	Apply all patches in the series file.
 
@@ -40,7 +40,7 @@ specified, apply the next patch.
 
 --leave-rejects
 	Leave around the reject files patch produced, even if
-	the a patch is not actually applied.
+	the patch is not actually applied.
 	
 EOF
 		exit 0
diff --git a/quilt/refresh.in b/quilt/refresh.in
index d9e41ae..fc197c6 100644
--- a/quilt/refresh.in
+++ b/quilt/refresh.in
@@ -44,7 +44,7 @@ ignored, and only changes in files that have not been
 modified by any more recent patches will end up in the
 specified patch.
 
--p n	Create a -pn style patch (-p0 or -p1 supported).
+-p n	Create a -p n style patch (-p0 or -p1 supported).
 	
 -f	Force refresh, even if more recent patches modify
 	some of the same files.
diff --git a/quilt/remove.in b/quilt/remove.in
index 168d369..20e6bf2 100644
--- a/quilt/remove.in
+++ b/quilt/remove.in
@@ -24,7 +24,7 @@ usage()
 	then
 		cat <<EOF
 
-Remove one or more files to the topmost or named patch.
+Remove one or more files from the topmost or named patch.
 Files that are modified by patches on top of the specified
 patch cannot be removed.
 
diff --git a/quilt/series.in b/quilt/series.in
index ec4dddb..bbc0ea1 100644
--- a/quilt/series.in
+++ b/quilt/series.in
@@ -24,11 +24,11 @@ usage()
 	then
 		cat <<EOF
 
-Print the names of all patches in the file series.
+Print the names of all patches in the series file.
 
 -n	Print patch file names instead patch names.
 
--v	Verbose, more user friendly output
+-v	Verbose, more user friendly output.
 
 EOF
 		exit 0
diff --git a/quilt/unapplied.in b/quilt/unapplied.in
index 4df3367..0f091a3 100644
--- a/quilt/unapplied.in
+++ b/quilt/unapplied.in
@@ -19,7 +19,7 @@ fi
 
 usage()
 {
-	echo "Usage: quilt rest [patch]"
+	echo "Usage: quilt unapplied [patch]"
 	if [ x$1 = x-h ]
 	then
 		cat <<EOF