diff --git a/web/Makefile b/web/Makefile
index e14fbf1f..a588fc4a 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,67 +1,67 @@
# Build html from m4 macrofiles
# $Id$
#
# (c)2005,2006,2015 by Intevation GmbH
# Author(s): Sascha Wilde
#
# This is Free Software licensed under the GPL
# Preprocessor configuration
PP = m4
PPFLAGS = --prefix-builtins
# Build configuration
TARGETS = $(patsubst %.htm4,%.html,$(wildcard *.htm4)) change-history.html change-history-de.html
SUBDIRS =
# Installation configuration
INSTALL_DIR = /tmp/gpg4win-www
-ADD_INST_TYPES = *.css *.png
+ADD_INST_TYPES = *.css *.png *.asc
ADD_INST_DIRS = pix img .well-known
USER=intevation
CURDIR=$(shell pwd)
.SUFFIXES: .html .htm4
.htm4.html:
$(PP) -DNO_LINK_FOR=$@ $(PPFLAGS) $< > $@
all: $(TARGETS) subdirs
$(TARGETS): template.m4 template_header.m4 versions.m4 \
header.m4 gpg4win.css
subdirs: $(SUBDIRS)
@for dir in $^ ; do \
$(MAKE) -C $$dir SUBDIRS="" ; \
done
change-history.htm4: build-history.awk NEWS.last
LC_ALL=de_DE.latin1 awk -f build-history.awk < NEWS.last | \
sed 's@\(T[0-9]\+\)@\1@g' > $@
change-history-de.htm4: build-history.awk NEWS.last
LC_ALL=de_DE.latin1 awk -f build-history.awk -v lang=de < NEWS.last | \
sed 's@\(T[0-9]\+\)@\1@g' > $@
online: all
@echo ""
@echo "Going to put current contents online for www.gpg4win.org ..."
@echo "(ssh fingerprint may be found via https://ssl.intevation.de/)"
@echo ""
rsync -rvPC --perms --chmod=ug+rw,o+r,Dg+s,Da+x,u-s,Fg-s,o-wt --exclude='*.swp' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \
$(USER)@www.gpg4win.org:/srv/gpg4win-www/
install: all
mkdir -p $(INSTALL_DIR) ;\
cp -uf $(TARGETS) $(INSTALL_DIR) ;\
cp -uf $(ADD_INST_TYPES) $(INSTALL_DIR)
cp -urf *$(ADD_INST_DIRS) $(INSTALL_DIR)
find $(INSTALL_DIR) -name ".svn" | xargs rm -rf
tar: install
echo $(CURDIR)
( cd $(INSTALL_DIR) ; tar -czv -f $(CURDIR)/www.gpg4win.org.tar.gz . )
diff --git a/web/gpg4win-professional-key.asc b/web/gpg4win-professional-key.asc
new file mode 100644
index 00000000..bc4d2c18
--- /dev/null
+++ b/web/gpg4win-professional-key.asc
@@ -0,0 +1,61 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+mDHCVTU6i89J
+=7Fgt
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/web/reporting-bugs-de.htm4 b/web/reporting-bugs-de.htm4
index 571ce5b7..e559693a 100644
--- a/web/reporting-bugs-de.htm4
+++ b/web/reporting-bugs-de.htm4
@@ -1,82 +1,96 @@
m4_dnl -*-html-*-
m4_include(`template.m4')
m4_dnl $Id$
m4_define(`DE')
m4_define(`EN_FILE', `reporting-bugs.html')
m4_define(`TITLE', `Probleme melden')
m4_define(`MAIN', `community')
PAGE_START
Probleme melden
Eine Anleitung
1. Prüfen, ob man die aktuellste Version von Gpg4win verwendet
Der Download-Knopf im oberen Brereich der Gpg4win Heimatseite
zeigt die jeweils aktuellste Version von Gpg4win an.
Die Versionsnummer Ihrer installierten Gpg4win-Version finden Sie
in Kleopatra unter Hilfe->Über Kleopatra.
2. Prüfen, ob das Problem bereits bekannt ist
Es ist sinnvoll, die Liste der offenen Fehler
zu durchsuchen, ob einer dieser Einträge bereits
das Problem beschreibt was man selbst hat.
Dort sollte man dann seine ergänzenden Hinweise
einfügen.
Liste der offenen Fehler
3. Fehlerbericht erstellen
Bitte berichten Sie den Fehler in Englisch indem Sie
dieses Formular verwenden.
Beachten Sie dabei folgendes:
3.1 Versionsnummern angeben
Ein neuer Fehlerbericht, aber auch Ergänzungen zu
bestehenden Berichten sollten die exakte Versionsnummer
von Windows, Gpg4win und ggf. von MS Outlook
nennen.
3.2 Anleitung zur Reproduktion des Fehlers
Falls es möglich ist, sollte in einer Schritt-für-Schritt
Anleitung beschrieben werden, wie man den Fehler reproduziert.
3.3 Debug Informationen hinzufügen
Falls es geht und sinnvoll erscheint,
sollte der Bericht um ein Debug-Log ergänzt werden.
Anleitungen für die einzelnen Gpg4win-Komponenten finden Sie im
Gpg4win-Kompendium.
Wer sich in der Lage dazu fühlt, sollte nur die relevanten
Informationen der Logdatei dem Fehlerbericht beilegen.
+
Private Berichte / Sicherheitsprobleme
+
+Wenn Sie ihren Bericht nicht öffentlich machen wollen, da er
+private informationen enthält oder ein gravirendes Sicherheitsproblem
+beschreibt, können Sie unserem Team eine verschlüsselte
+Nachricht an gpg4win-professional@gpg4win.org
+senden.
+
+
+
+Der öffentliche Schlüssel für diese Adresse ist:5BFB FFC6 C040 8D5B B0C9 BDF4 6113 F899 1A8C 17A9.
+
+
diff --git a/web/reporting-bugs.htm4 b/web/reporting-bugs.htm4
index 5d498842..7ba856cf 100644
--- a/web/reporting-bugs.htm4
+++ b/web/reporting-bugs.htm4
@@ -1,78 +1,91 @@
m4_dnl -*-html-*-
m4_include(`template.m4')
m4_dnl $Id$
m4_define(`EN')
m4_define(`DE_FILE', `reporting-bugs-de.html')
m4_define(`TITLE', `Reporting Bugs')
m4_define(`MAIN', `community')
PAGE_START
How to report a problem
Step-by-step instructions.
1. Check whether you are using the latest version of Gpg4win
The download button on top of the Gpg4win homepage shows
the current version.
You can find your installed Gpg4win version number
in Kleopatra under Help->About Kleopatra.
2. Check whether the problem is already reported
Search through the list of open bugs and try to
identify whether one of the entries already describes
your problem. Add your additional comments there.
List of open issues
3. Create a new report
Please report the problem using
this form.
Please note the following:
3.1 Provide version numbers
If you report a new bug or add comments to an existing
bug report, describe the exact version of the Windows System,
Gpg4win and, if appropriate, of MS Office and Outlook.
3.2 Notes on how to reproduce the bug
If possible provide a step by step method
on how you can reproduce the bug.
3.3 Add debug information
If appropriate, attach a debug log of the
procedure where you produced the bug.
Look at the instructions for the several Gpg4win components in the
Gpg4win Compendium.
If you feel able to, just send an excerpt with the relevant
information.
+
+
Private reports / security issues
+
+If you do not want to publicly divulge the contents of a report,
+e.g. because that would leak private information or if you consider
+an issue a severe security problem, you can send an encrypted mail
+to our professional team at gpg4win-professional@gpg4win.org.
+
+
+The public key for this address is 5BFB FFC6 C040 8D5B B0C9 BDF4 6113 F899 1A8C 17A9.
+
+