Skip to content

Commit 007d9d5

Browse files
committed
doc: Fix FAQ stub and remove faq build rules.
-- The FAQ is maintained in the gnupg-doc repo.
1 parent 82146af commit 007d9d5

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

doc/FAQ

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ GnuPG Frequently Asked Questions
33
A FAQ is a fast moving target and thus we don't distribute it anymore
44
with GnuPG. You may retrieve the current FAQ in HTML format at
55

6-
http://www.gnupg.org/faq/GnuPG-FAQ.html
6+
https://gnupg.org/faq/gnupg-faq.html
77

8-
or in plain text format at the FTP server:
8+
or in plain text format at
99

10-
ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt
10+
https://gnupg.org/faq/gnupg-faq.txt
1111

1212

1313

doc/Makefile.am

+1-22
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ man_MANS = $(myman_pages) gnupg.7
7575
watchgnupg_SOURCE = gnupg.texi
7676

7777

78-
CLEANFILES = yat2m faq.txt faq.html
78+
CLEANFILES = yat2m
7979

8080
DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
8181
$(myman_pages) gnupg.7
@@ -139,24 +139,3 @@ online: gnupg.html gnupg.pdf
139139
cd gnupg.html ; \
140140
rsync -vr --exclude='.git' . \
141141
$${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/
142-
143-
# Note that you need a recent version of emacs23 with org-mode 7.01h
144-
faq.txt faq.html: faq.org
145-
@set -e; expopt="t nil nil nil \"$$(pwd)\""; \
146-
emacs --batch \
147-
--eval "(require 'org)" \
148-
--visit "$(srcdir)/faq.org" \
149-
--eval "(setq org-export-ascii-entities 'utf8)" \
150-
--eval "(org-export-as-ascii org-export-headline-levels $${expopt})"\
151-
--visit "$(srcdir)/faq.org" \
152-
--eval "(setq org-export-html-style-include-default nil)" \
153-
--eval "(setq org-export-html-style-include-scripts nil)" \
154-
--eval "(org-export-as-html org-export-headline-levels $${expopt})"
155-
156-
faq-online: faq.txt faq.html
157-
set -e; \
158-
user=werner ; webhost="ftp.gnupg.org" ; ftphost="ftp.gnupg.org" ; \
159-
echo "Uploading current FAQ to {www,ftp}.gnupg.org ..."; \
160-
scp faq.html $${user}@$${webhost}:webspace/manuals/GnuPG-FAQ.html ; \
161-
scp faq.txt $${user}@$${ftphost}:gcrypt/gnupg/GnuPG-FAQ.txt ; \
162-
echo "...ready"

0 commit comments

Comments
 (0)