From: Kevin McCarthy <kevin@8t8.us>
Date: Thu, 9 May 2019 20:25:25 +0000 (-0700)
Subject: Change sample muttrc path to match other manual references.
X-Git-Tag: mutt-1-12-rel~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=471fc11a523e3c7f5093f058ec26ade298e31863;p=mutt

Change sample muttrc path to match other manual references.

The other parts of the manual refer to /usr/local/share/doc in their
examples.  For consistency, change the starter muttrc and manual entry
to do the same.

In the future, we may wish to have a config variable instead, so users
don't have to worry about system vs locally installed paths when
sourcing the gpg.rc, for instance.
---

diff --git a/contrib/sample.muttrc-starter b/contrib/sample.muttrc-starter
index 4cbf5a6a..fbc1f906 100644
--- a/contrib/sample.muttrc-starter
+++ b/contrib/sample.muttrc-starter
@@ -100,7 +100,7 @@ set query_command = "/usr/bin/lbdbq"
 # GnuPG
 #
 unset crypt_use_gpgme
-source /usr/share/doc/mutt/samples/gpg.rc
+source /usr/local/share/doc/mutt/samples/gpg.rc
 set pgp_default_key = "0x1234567890ABCDEF"
 set crypt_opportunistic_encrypt
 set postpone_encrypt
diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 35c9c305..7f364029 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -1868,18 +1868,18 @@ GnuPG project's GPGME library.
 To enable <quote>classic mode</quote>, ensure GPGME is disabled and
 use the <literal>gpg.rc</literal> or <literal>smime.rc</literal> files
 that come with mutt.  These are typically installed under
-<literal>/usr/share/doc/mutt/samples/</literal>.  Source them, either
+<literal>/usr/local/share/doc/mutt/samples/</literal>.  Source them, either
 directly or by copying them to your .mutt directory and sourcing them.
 Sourcing them directly from
-<literal>/usr/share/doc/mutt/samples/</literal> has the benefit of
+<literal>/usr/local/share/doc/mutt/samples/</literal> has the benefit of
 automatically using fixes and security improvements to the command
 invocations, and is recommended.
 </para>
 
 <screen>
 unset crypt_use_gpgme
-source /usr/share/doc/mutt/samples/gpg.rc
-source /usr/share/doc/mutt/samples/smime.rc
+source /usr/local/share/doc/mutt/samples/gpg.rc
+source /usr/local/share/doc/mutt/samples/smime.rc
 </screen>
 
 <para>