[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-334-g74be307
by Emanuel Schuetze
cvs at cvs.gnupg.org
Thu Sep 21 11:10:35 CEST 2017
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 "GnuPG for Windows".
The branch, website has been updated
via 74be307a09f2e48117ca4c7f63f3d6814923748a (commit)
via 93e1837544923898303800ac12a49948ca761974 (commit)
via 59cfe6aa10b1683b1b7de3d0172f83da4e06ed13 (commit)
from 61a4d697a0da01e55ad94b74596a953daa5e0e74 (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 74be307a09f2e48117ca4c7f63f3d6814923748a
Merge: 93e1837 61a4d69
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Sep 21 11:09:35 2017 +0200
Merge branch 'website' of git+ssh://playfair.gnupg.org/git/gpg4win into website
commit 93e1837544923898303800ac12a49948ca761974
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Sep 21 11:09:19 2017 +0200
Updated .gitignore.
diff --git a/.gitignore b/.gitignore
index b074790..4968811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,8 @@ src/mingwm10.dll
/web/news-20151125.html
/web/newsarchive-de.html
/web/newsarchive.html
+/web/next-steps.html
+/web/next-steps-de.html
/web/package-integrity-de.html
/web/package-integrity.html
/web/pm-20151125-de.html
commit 59cfe6aa10b1683b1b7de3d0172f83da4e06ed13
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Sep 21 10:45:46 2017 +0200
Use new 'next steps' section in thanks pages.
Improved download and get-gpg4win pages.
diff --git a/web/download-de.htm4 b/web/download-de.htm4
index 3f4d8d6..8efbe52 100644
--- a/web/download-de.htm4
+++ b/web/download-de.htm4
@@ -68,14 +68,14 @@ kann hier herunter geladen werden:</p>
<a href="change-history-de.html">Änderungshistorie</a>
</p>
-<h4>Weitere Gpg4win-VERSION Varianten</h4>
+<h4>Weitere Gpg4win-VERSION Downloads</h4>
<ul>
- <li>Gpg4win Quellcodepaket:<br>
+ <li>Gpg4win-Quellcodepaket:<br>
<a href="SDOWNLOAD_URL">gpg4win-VERSION.tar.bz2</a> (Größe: SDL_SIZE)<br>
<a href="https://files.gpg4win.org/gpg4win-VERSION.tar.bz2.sig">OpenPGP-Signatur</a><br>
SHA256-Prüfsumme: <code>SHA2_SRC</code></li>
- <li>Alle Versionen und OpenPGP-Signaturen (auch per https) unter <a
+ <li>Alle Versionen und OpenPGP-Signaturen unter <a
href="https://files.gpg4win.org/">https://files.gpg4win.org</a>.</li>
<li>Zur Erstellung einer <b>portablen Gpg4win-Version</b> nutzen
@@ -100,12 +100,10 @@ kann hier herunter geladen werden:</p>
<p>Nach Beendigung des
Downloads <a href="package-integrity-de.html">verifizieren</a> Sie
- bitte die Integrität des Gpg4win Paketes, dass sie heruntergeladen
+ bitte die Integrität des Gpg4win-Paketes, dass Sie heruntergeladen
haben. Anschließend folgen Sie den Hinweisen zur Installation
- im <a href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a>.
- </p>
- <p>Lesen Sie die aktuelle <a
- href="https://files.gpg4win.org/README-VERSION.de.txt">README-Datei</a>.
+ im <a href="documentation-de.html">Gpg4win-Kompendium</a> und
+ lesen Sie die aktuelle <a href="https://files.gpg4win.org/README-VERSION.de.txt">README-Datei</a>.
<h2>Gpg4win-Kompendium COMPENDIUM_VERSION_DE
(Veröffentlicht: COMPENDIUM_DATE_DE)</h2>
diff --git a/web/download.htm4 b/web/download.htm4
index ea153ca..c0237db 100644
--- a/web/download.htm4
+++ b/web/download.htm4
@@ -68,7 +68,7 @@ of Gpg4win VERSION here:</p>
<a href="change-history.html">Changelog</a>
</p>
-<h4>More Gpg4win-VERSION variants</h4>
+<h4>More Gpg4win-VERSION downloads</h4>
<ul>
<li>Gpg4win source code package:<br>
<a href="SDOWNLOAD_URL">gpg4win-VERSION.tar.bz2</a> (Size: SDL_SIZE)<br>
@@ -99,11 +99,9 @@ of Gpg4win VERSION here:</p>
<p>After downloading
please <a href="package-integrity.html">verify</a> the integrity of
your Gpg4win package. Then double-click on the file you have downloaded and
- follow the instructions on the screen (or look at the <a
- href="documentation.html">documentation</a>).</p>
- </p>
- <p>Read the current <a
- href="https://files.gpg4win.org/README-VERSION.en.txt">README file</a>.
+ follow the instructions on the screen (or look at the
+ <a href="documentation.html">documentation</a>) and read the current
+ <a href="https://files.gpg4win.org/README-VERSION.en.txt">README file</a>.
<h2>Gpg4win Compendium COMPENDIUM_VERSION_EN
(Released: COMPENDIUM_DATE_EN)</h2>
diff --git a/web/get-gpg4win-de.htm4 b/web/get-gpg4win-de.htm4
index fe5edf8..77c7847 100644
--- a/web/get-gpg4win-de.htm4
+++ b/web/get-gpg4win-de.htm4
@@ -17,5 +17,5 @@ PAGE_START
<div id="main">
m4_include(`donation-form-de.htm4')
+ <p><small><a href="download-de.html">OpenPGP-Signaturen und Quellcodepaket »</a></small></p>
</div>
-
diff --git a/web/get-gpg4win.htm4 b/web/get-gpg4win.htm4
index ccc65b1..d594d84 100644
--- a/web/get-gpg4win.htm4
+++ b/web/get-gpg4win.htm4
@@ -18,5 +18,6 @@ PAGE_START
<div id="main">
m4_include(`donation-form.htm4')
+ <p><small><a href="download.html">OpenPGP signatures and source code package »</a></small></p>
</div>
diff --git a/web/next-steps-de.htm4 b/web/next-steps-de.htm4
new file mode 100644
index 0000000..a83df6d
--- /dev/null
+++ b/web/next-steps-de.htm4
@@ -0,0 +1,16 @@
+<h2>Ihre nächsten Schritte:</h2>
+<ol>
+ <li><a target="_blank" href="package-integrity-de.html">Prüfen Sie die Integrität</a> des heruntergeladenen Gpg4win-Installers!
+
+ <li>Installieren Sie Gpg4win.
+
+ <li>Erstellen Sie sich ein OpenPGP-Schlüsselpaar mit Kleopatra.
+ Signieren/verschlüsseln Sie zum Test eine Datei und E-Mail an sich
+ selbst (siehe Kapitel 7+8 im
+ <a target="_blank" href="https://files.gpg4win.org/doc/gpg4win-compendium-de.pdf">Gpg4win-Kompendium</a>).
+
+ <li>Erfahren Sie mehr über die Funktionsweise der „Public-Key“-Methode (siehe
+insbesondere Kapitel 1-5 im <a target="_blank" href="https://files.gpg4win.org/doc/gpg4win-compendium-de.pdf">Gpg4win-Kompendium</a>).
+
+ <li>Richten Sie Fragen und Probleme an die <a target="_blank" href="community-de.html">Gpg4win-Gemeinschaft</a>.
+</ol>
diff --git a/web/next-steps.htm4 b/web/next-steps.htm4
new file mode 100644
index 0000000..027d675
--- /dev/null
+++ b/web/next-steps.htm4
@@ -0,0 +1,13 @@
+<h2>Get started – your next steps:</h2>
+
+<ol>
+ <li><a target="_blank" href="package-integrity.html">Check integrity</a> of the downloaded Gpg4win installer!
+
+ <li>Install Gpg4win.
+
+ <li>Create an OpenPGP key pair with Kleopatra. Sign/encrypt a file and email to yourself for testing.
+
+ <li><a href="documentation.html">Read more about the public key method (see chapter 1-5 in <a target="_blank" href="https://files.gpg4win.org/doc/gpg4win-compendium-en.pdf">Gpg4win Compendium</a>).
+
+ <li>Ask your questions and report your problems to <a target="_blank" href="community.html">Gpg4win Community</a>.
+</ol>
diff --git a/web/thanks-for-donation-de.htm4 b/web/thanks-for-donation-de.htm4
index 2515757..eaa8e9a 100644
--- a/web/thanks-for-donation-de.htm4
+++ b/web/thanks-for-donation-de.htm4
@@ -19,12 +19,6 @@ PAGE_START
</div>
<div id="main">
-<h2>Einstieg – die ersten Schritte:</h2>
-<ul>
-<li><a href="documentation.html">Lesen Sie das Gpg4win-Kompendium</a></li>
-<li><a href="community.html">Treten Sie der Gpg4win-Gemeinschaft bei</a></li>
-</ul>
-
-
+m4_include(`next-steps-de.htm4')
</div>
diff --git a/web/thanks-for-donation.htm4 b/web/thanks-for-donation.htm4
index f8df2c6..53d1756 100644
--- a/web/thanks-for-donation.htm4
+++ b/web/thanks-for-donation.htm4
@@ -19,13 +19,6 @@ PAGE_START
</div>
<div id="main">
-<h2>Get started – your next steps:</h2>
-If you are interested in getting involved, then take a look at these pages:
-<ul>
-<li><a href="documentation.html">Read the Gpg4win Compendium</a></li>
-<li><a href="community.html">Join the Community</a></li>
-</ul>
-
-
+m4_include(`next-steps.htm4')
</div>
diff --git a/web/thanks-for-download-de.htm4 b/web/thanks-for-download-de.htm4
index 01932b2..45feb7a 100644
--- a/web/thanks-for-download-de.htm4
+++ b/web/thanks-for-download-de.htm4
@@ -19,12 +19,6 @@ PAGE_START
</div>
<div id="main">
-<h2>Einstieg – die ersten Schritte:</h2>
-<ul>
-<li><a href="documentation.html">Lesen Sie das Gpg4win-Kompendium</a></li>
-<li><a href="community.html">Treten Sie der Gpg4win-Gemeinschaft bei</a></li>
-</ul>
-
-
+m4_include(`next-steps-de.htm4')
</div>
diff --git a/web/thanks-for-download.htm4 b/web/thanks-for-download.htm4
index bb843e8..9c2e28d 100644
--- a/web/thanks-for-download.htm4
+++ b/web/thanks-for-download.htm4
@@ -19,13 +19,6 @@ PAGE_START
</div>
<div id="main">
-<h2>Get started – your next steps:</h2>
-If you are interested in getting involved, then take a look at these pages:
-<ul>
-<li><a href="documentation.html">Read the Gpg4win Compendium</a></li>
-<li><a href="community.html">Join the Community</a></li>
-</ul>
-
-
+m4_include(`next-steps.htm4')
</div>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
web/download-de.htm4 | 14 ++++++--------
web/download.htm4 | 10 ++++------
web/get-gpg4win-de.htm4 | 2 +-
web/get-gpg4win.htm4 | 1 +
web/next-steps-de.htm4 | 16 ++++++++++++++++
web/next-steps.htm4 | 13 +++++++++++++
web/thanks-for-donation-de.htm4 | 8 +-------
web/thanks-for-donation.htm4 | 9 +--------
web/thanks-for-download-de.htm4 | 8 +-------
web/thanks-for-download.htm4 | 9 +--------
11 files changed, 47 insertions(+), 45 deletions(-)
create mode 100644 web/next-steps-de.htm4
create mode 100644 web/next-steps.htm4
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list