3 files changed, 12 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e0064657b..d8c173038 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-12  Werner Koch  <[email protected]>
+
+	* gpgsm.texi (General GPGSM Commands): Fix --help, --version and
+	--warranty wording.
+
 2008-12-08  Werner Koch  <[email protected]>
 
 	* DETAILS: Clarify the use of "trust" and "validity" as suggested
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 7489b035e..d514c5631 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -149,7 +149,7 @@ cannot abbreviate this command.
 @itemx -h
 @opindex help
 Print a usage message summarizing the most useful command line options.
-Not that you cannot abbreviate this command.
+Note that you cannot abbreviate this command.
 
 @item --warranty
 @opindex warranty
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index ab2aae850..b4c92bbfa 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -77,21 +77,22 @@ only one command is allowed.
 @table @gnupgtabopt
 @item --version
 @opindex version
-Print the program version and licensing information.  Not that you can
-abbreviate this command.
+Print the program version and licensing information.  Note that you
+cannot abbreviate this command.
 
 @item --help, -h
 @opindex help
 Print a usage message summarizing the most usefule command-line options.
-Not that you can abbreviate this command.
+Note that you cannot abbreviate this command.
 
 @item --warranty
 @opindex warranty
-Print warranty information.
+Print warranty information.  Note that you cannot abbreviate this
+command.
 
 @item --dump-options
 @opindex dump-options
-Print a list of all available options and commands.  Not that you can
+Print a list of all available options and commands.  Note that you cannot
 abbreviate this command.
 @end table