[git] gnupg-doc - branch, master, updated. ef82711275cb07232c685d1f4bbc2ab04571201d

[by Robert J. Hansen]

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 GnuPG website and other docs".

The branch, master has been updated
       via  ef82711275cb07232c685d1f4bbc2ab04571201d (commit)
       via  9f62c504b4565be97f2f603fc4876276d8da0a6b (commit)
      from  40a42e1f14f43914a06a8d18c492cf9161c12518 (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 ef82711275cb07232c685d1f4bbc2ab04571201d
Merge: 9f62c50 40a42e1
Author: Robert J. Hansen <rjh at sixdemonbag.org>
Date:   Tue Oct 10 11:30:09 2017 -0400

    Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc


commit 9f62c504b4565be97f2f603fc4876276d8da0a6b
Author: Robert J. Hansen <rjh at sixdemonbag.org>
Date:   Tue Oct 10 11:29:50 2017 -0400

    Added a couple of references to FSF literature.

diff --git a/web/faq/gnupg-faq.org b/web/faq/gnupg-faq.org
index 16f6472..d62e270 100644
--- a/web/faq/gnupg-faq.org
+++ b/web/faq/gnupg-faq.org
@@ -26,6 +26,7 @@ very litigious.
    :END:
 
 - Linux is a trademark of Linus Torvalds.
+- GNU is a trademark of the Free Software Foundation.
 - Macintosh, OS X and Mac OS X are all trademarks of the Apple
   Corporation.
 - PGP is a trademark of Symantec Corporation.
@@ -148,8 +149,7 @@ Yes.
    :CUSTOM_ID: last_checked
    :END:
 
-February 2016.
-
+October 2017.
 
 * General questions
   :PROPERTIES:
@@ -261,6 +261,14 @@ Linux systems.  The good news is that it’s usually installed by
 default, so nothing needs to be downloaded!
 
 
+**** … for Android?
+     :PROPERTIES:
+     :CUSTOM_ID: get_gnupg_android
+     :END:
+
+Both OpenKeychain and the Android Privacy Guard are available in the
+Android app store.
+
 **** … for Debian GNU/Linux or Ubuntu?
      :PROPERTIES:
      :CUSTOM_ID: get_gnupg_debian
@@ -276,8 +284,6 @@ At a terminal window type =sudo apt-get install gnupg2=.
 
 At a terminal window type =sudo zypper install gnupg2=.
 
-installation.
-
 
 **** … for Fedora, CentOS, or RHEL?
      :PROPERTIES:
@@ -352,9 +358,9 @@ binary is required to give you the source code upon your request.
    :END:
 
 The word “free” should evoke ideas of liberty, not price.  An awful
-lot of the software industry does not respect your freedoms: your
-freedom to use the software for any purpose, your freedom to study and
-learn from how it works, your freedom to share it with others who
+lot of the software industry does not <a href="https://gnu.org/philosophy/free-software-even-more-important.html">respect your freedoms</a>:
+your freedom to use the software for any purpose, your freedom to study
+and learn from how it works, your freedom to share it with others who
 might benefit from it, and more.  Free Software is the antithesis of
 this: Free Software is meant to respect your rights.  You may use the
 software for any purpose: you may inspect and modify the source code:
@@ -711,9 +717,9 @@ is actively developed.
     is a known bug and people are working on it.
 
 
-** … Linux or FreeBSD?
+** … Free UNIX systems?
    :PROPERTIES:
-   :CUSTOM_ID: email_clients_linux
+   :CUSTOM_ID: email_clients_free_unix
    :END:
 
 | Name        | Plugins        | see |

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

Summary of changes:
 web/faq/gnupg-faq.org | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org