[Pkg-gnupg-commit] [gnupg2] 02/02: improve documentation about dirmngr --homedir

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 0fbc9c4d6e3167e7e912035dc6de39e1d660d071
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Nov 21 14:13:09 2016 -0500

    improve documentation about dirmngr --homedir
---
 .../0014-doc-Clarify-dirmngr-homedir-option.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/0014-doc-Clarify-dirmngr-homedir-option.patch b/debian/patches/0014-doc-Clarify-dirmngr-homedir-option.patch
new file mode 100644
index 0000000..bc04985
--- /dev/null
+++ b/debian/patches/0014-doc-Clarify-dirmngr-homedir-option.patch
@@ -0,0 +1,29 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Sun, 20 Nov 2016 21:35:13 -0500
+Subject: doc: Clarify dirmngr --homedir option.
+
+--
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 2c97fa84c11f6087872392d83bbf17fbd4f6fb0f)
+---
+ doc/dirmngr.texi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
+index be4e97a..963dff8 100644
+--- a/doc/dirmngr.texi
++++ b/doc/dirmngr.texi
+@@ -142,10 +142,10 @@ per-user configuration file.  The default configuration file is named
+ @item --homedir @var{dir}
+ @opindex options
+ Set the name of the home directory to @var{dir}.  This option is only
+-effective when used on the command line.  The default os
++effective when used on the command line.  The default is
+ the directory named @file{.gnupg} directly below the home directory
+ of the user unless the environment variable @code{GNUPGHOME} has been set
+-in which case its value will be used.  All kind of data is stored below
++in which case its value will be used.  Many kinds of data are stored within
+ this directory.
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fd02327..71ab57d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
 gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 0013-agent-Fix-npth-daemon-mode-problem.patch
+0014-doc-Clarify-dirmngr-homedir-option.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git