[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-432-g50cd3d4

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  50cd3d40aec3b94cfddec94361ed1aafc999d61b (commit)
      from  958e5f292fa3f8e127f54bc088c56780c564dcae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50cd3d40aec3b94cfddec94361ed1aafc999d61b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 3 08:58:20 2014 +0200

    doc: Minor texi updates.
    
    --

diff --git a/doc/gpg.texi b/doc/gpg.texi
index bc12cbc..9463bb5 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1503,8 +1503,8 @@ mechanisms, in the order they are to be tried:
   required if @code{local} is also used.
 
   @item clear
-  Clear all defined mechanisms.  This is usefule to override
-  mechanisms fiven in a config file.
+  Clear all defined mechanisms.  This is useful to override
+  mechanisms given in a config file.
 
 @end table
 
diff --git a/doc/tools.texi b/doc/tools.texi
index 2a1d38f..32ab1e4 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -305,6 +305,7 @@ Reload all or the given component. This is basically the same as sending
 a SIGHUP to the component.  Components which don't support reloading are
 ignored.
 
+ at ifset gpgtwoone
 @item --launch [@var{component}]
 @opindex launch
 If the @var{component} is not already running, start it.
@@ -319,6 +320,7 @@ Kill the given component.  Components which support killing are
 gpg-agent and scdaemon.  Components which don't support reloading are
 ignored.  Note that as of now reload and kill have the same effect for
 scdaemon.
+ at end ifset
 
 @end table
 

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi   |    4 ++--
 doc/tools.texi |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org