diff options
| -rw-r--r-- | doc/FAQ | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 23 |
2 files changed, 4 insertions, 25 deletions
@@ -3,11 +3,11 @@ GnuPG Frequently Asked Questions A FAQ is a fast moving target and thus we don't distribute it anymore with GnuPG. You may retrieve the current FAQ in HTML format at - http://www.gnupg.org/faq/GnuPG-FAQ.html + https://gnupg.org/faq/gnupg-faq.html -or in plain text format at the FTP server: +or in plain text format at - ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt + https://gnupg.org/faq/gnupg-faq.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index a30844464..240bcf38b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -75,7 +75,7 @@ man_MANS = $(myman_pages) gnupg.7 watchgnupg_SOURCE = gnupg.texi -CLEANFILES = yat2m faq.txt faq.html +CLEANFILES = yat2m DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ $(myman_pages) gnupg.7 @@ -139,24 +139,3 @@ online: gnupg.html gnupg.pdf cd gnupg.html ; \ rsync -vr --exclude='.git' . \ $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/ - -# Note that you need a recent version of emacs23 with org-mode 7.01h -faq.txt faq.html: faq.org - @set -e; expopt="t nil nil nil \"$$(pwd)\""; \ - emacs --batch \ - --eval "(require 'org)" \ - --visit "$(srcdir)/faq.org" \ - --eval "(setq org-export-ascii-entities 'utf8)" \ - --eval "(org-export-as-ascii org-export-headline-levels $${expopt})"\ - --visit "$(srcdir)/faq.org" \ - --eval "(setq org-export-html-style-include-default nil)" \ - --eval "(setq org-export-html-style-include-scripts nil)" \ - --eval "(org-export-as-html org-export-headline-levels $${expopt})" - -faq-online: faq.txt faq.html - set -e; \ - user=werner ; webhost="ftp.gnupg.org" ; ftphost="ftp.gnupg.org" ; \ - echo "Uploading current FAQ to {www,ftp}.gnupg.org ..."; \ - scp faq.html $${user}@$${webhost}:webspace/manuals/GnuPG-FAQ.html ; \ - scp faq.txt $${user}@$${ftphost}:gcrypt/gnupg/GnuPG-FAQ.txt ; \ - echo "...ready" |