web: Remove the use of the modern/stable/classic flags.
authorWerner Koch <wk@gnupg.org>
Tue, 28 Mar 2017 15:37:11 +0000 (17:37 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 28 Mar 2017 15:37:11 +0000 (17:37 +0200)
They are more confusing then helpful.

web/download/index.org
web/download/release_notes.org
web/index.org

index df4a475..302fcc9 100644 (file)
@@ -13,7 +13,7 @@
 #+index: GnuPG!download
 
   Note that you may also download the GNU Privacy Guard from a mirror
-  site close to you. See our [[file:mirrors.org][list of mirrors]].  The table below
+  site close to you.  See our [[file:mirrors.org][list of mirrors]].  The table below
   provides links to the location of the files on the primary server
   only.
 
    knowledge on how to compile and install software is required.
 
    The table lists the different GnuPG packages, followed by required
-   libraries, required tools, and optional software.
+   libraries, required tools, optional software, and legacy versions
+   of GnuPG.
 
    | Name         | Version                | Date                    |                    Size | Tarball                                                                                                | Signature                                                                                                  |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    |              | <l>                    |                         |                     <r> |                                                                                                        |                                                                                                            |
-   | GnuPG modern | {{{gnupg21_ver}}}      | {{{gnupg21_date}}}      |      {{{gnupg21_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2{{{ftpclose}}}                    | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2.sig{{{ftpclose}}}                    |
-   | GnuPG stable | {{{gnupg_ver}}}        | {{{gnupg_date}}}        |        {{{gnupg_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
+   | GnuPG        | {{{gnupg21_ver}}}      | {{{gnupg21_date}}}      |      {{{gnupg21_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2{{{ftpclose}}}                    | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2.sig{{{ftpclose}}}                    |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    | [[../software/libgpg-error/index.org][Libgpg-error]] | {{{libgpg_error_ver}}} | {{{libgpg_error_date}}} | {{{libgpg_error_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2.sig{{{ftpclose}}} |
    | [[../software/libgcrypt/index.org][Libgcrypt]]    | {{{libgcrypt_ver}}}    | {{{libgcrypt_date}}}    |    {{{libgcrypt_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2{{{ftpclose}}}          | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2.sig{{{ftpclose}}}          |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    | [[../software/gpgme/index.org][GPGME]]        | {{{gpgme_ver}}}        | {{{gpgme_date}}}        |        {{{gpgme_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
    | [[../software/gpa/index.org][GPA]]          | {{{gpa_ver}}}          | {{{gpa_date}}}          |          {{{gpa_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gpa/gpa-{{{gpa_ver}}}.tar.bz2{{{ftpclose}}}                            | {{{ftpopen}}}{{{ftp_loc_base}}}/gpa/gpa-{{{gpa_ver}}}.tar.bz2.sig{{{ftpclose}}}                            |
-   | Dirmngr      | {{{dirmngr_ver}}}      | {{{dirmngr_date}}}      |      {{{dirmngr_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2{{{ftpclose}}}                | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2.sig{{{ftpclose}}}                |
+   |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
+   | GnuPG 2.0    | {{{gnupg_ver}}}        | {{{gnupg_date}}}        |        {{{gnupg_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
+   | GnuPG 1.4    | {{{gnupg1_ver}}}       | {{{gnupg1_date}}}       |        {{{gnupg1_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2{{{ftpclose}}}                     | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2.sig{{{ftpclose}}}                     |
+   | Dirmngr 1    | {{{dirmngr_ver}}}      | {{{dirmngr_date}}}      |      {{{dirmngr_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2{{{ftpclose}}}                | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2.sig{{{ftpclose}}}                |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
 
    {{{check_sig_note}}}
 
    Remarks:
 
-   - /GnuPG stable/ (2.0) is the modularized version of GnuPG supporting
-     OpenPGP, S/MIME, and Secure Shell.
-
-   - /GnuPG modern/ (2.1) is the brand new version with enhanced
-     features like support for Elliptic Curve Cryptography.  It will
-     eventually replace the current stable (2.0)
-
-   - /GnuPG classic/ (1.4) is the old, single binary version which may
-     be build even on ancient Unix platforms.  It has no dependencies
-     on the above listed libraries or the Pinnetry.  However, it lacks
-     many modern features.
-
    - /Pinentry/ is a collection of passphrase entry dialogs which is
-     required for almost all usages of GnuPG stable or modern (2.x).
+     required for almost all usages of GnuPG.
 
    - /GPGME/ is the standard library to access GnuPG functions from
      programming languages.
 
    - /GPA/ is a graphical frontend to GnuPG.
 
-   - /Dirmngr/ is an optional tool for use with /GnuPG stable/ (2.0).
-     A modernized version is included in /GnuPG modern/ (2.1)
+   - /GnuPG 2.0/ is an older branch of GnuPG.  This branch will reach
+     end-of-life on 2017-12-31.
+
+   - /GnuPG 1.4/ is the old, single binary version which still support
+     the unsafe PGP-2 keys.  This branch has no dependencies on the
+     above listed libraries or the Pinnetry.  However, it lacks many
+     features and will receive only important updates.
+
+   - /Dirmngr/ is an optional tool for use with /GnuPG 2.0/.  A
+     modernized version is included in the current GnuPG (2.1)
+     version.
 
 
 ** GnuPG binary releases
    | OS      | Where              | Description                                 |
    |---------+--------------------+---------------------------------------------|
    |         | <18>               |                                             |
-   | Windows | [[http://gpg4win.org/download.html][Gpg4win]]            | Installers for /GnuPG stable/               |
-   |         | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG modern/         |
-   |         | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG classic/        |
+   | Windows | [[http://gpg4win.org/download.html][Gpg4win]]            | Installers for /GnuPG 2.0/                  |
+   |         | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for the current /GnuPG/    |
+   |         | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG 1.4/            |
    | OS X    | [[http://gpgtools.org][Mac GPG]]            | Installer from the gpgtools project         |
-   |         | [[https://sourceforge.net/p/gpgosx/docu/Download/][GnuPG for OS X]]     | Installer for /GnuPG modern/                |
-   | Debian  | [[https://www.debian.org][Debian site]]        | GnuPG stable and classic are part of Debian |
+   |         | [[https://sourceforge.net/p/gpgosx/docu/Download/][GnuPG for OS X]]     | Installer for /GnuPG 2.1/                   |
+   | Debian  | [[https://www.debian.org][Debian site]]        | GnuPG is part of Debian                       |
    | RPM     | [[http://rpmfind.net/][rpmfind]]            | RPM packages for different OS               |
-   | Android | [[https://guardianproject.info/code/gnupg/][Guardian project]]   | Provides a GnuPG 2.1 framework              |
-   | VMS     | [[http://www.antinode.info/dec/sw/gnupg.html][antinode.info]]      | A port of GnuPG to OpenVMS                  |
-   | RISC OS | [[http://www.sbellon.de/gnupg.html][home page]]          | Sources and  binaries for RISC OS           |
+   | Android | [[https://guardianproject.info/code/gnupg/][Guardian project]]   | Provides a GnuPG framework                  |
+   | VMS     | [[http://www.antinode.info/dec/sw/gnupg.html][antinode.info]]      | A port of GnuPG 1.4 to OpenVMS              |
+   | RISC OS | [[http://www.sbellon.de/gnupg.html][home page]]          | A port of GnuPG to RISC OS                  |
    |---------+--------------------+---------------------------------------------|
 
 
index 3a9efb4..b581bf0 100644 (file)
@@ -8,9 +8,7 @@
 * Release Notes for GnuPG
 
   Please read the NEWS file for a more complete list. {{{gnupg21_ver}}}
-  is the stable and modern version of GnuPG. (Version {{{gnupg1_ver}}}
-  is from the old GnuPG-1 series, which is useful to decrypt PGP-2
-  encrypted data.)
+  is the current version of GnuPG.
 
   Note that this page will soon be restructed.  The URLs pointing to
   specific releases will thus also change.
index a3ad964..f5c8145 100644 (file)
@@ -13,27 +13,22 @@ GnuPG is a complete and free implementation of the OpenPGP standard as
 defined by [[https://www.ietf.org/rfc/rfc4880.txt][RFC4880]] (also known as /PGP/). GnuPG allows to encrypt and
 sign your data and communication, features a versatile key management
 system as well as access modules for all kinds of public key
-directories. GnuPG, also known as /GPG/, is a command line tool with
+directories.  GnuPG, also known as /GPG/, is a command line tool with
 features for easy integration with other applications. A wealth of
-[[file:software/frontends.html][frontend applications]] and [[file:software/libraries.html][libraries]] are available. Version 2 of GnuPG
-also provides support for S/MIME and Secure Shell (ssh).
+[[file:software/frontends.html][frontend applications]] and [[file:software/libraries.html][libraries]] are available.  GnuPG also
+provides support for S/MIME and Secure Shell (ssh).
 
 GnuPG is [[https://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning that it respects your freedom). It can
 be freely used, modified and distributed under the terms of the
 [[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
 
-There are two major flavours of GnuPG:
+The current version of GnuPG is {{{gnupg21_ver}}}.  See the [[file:download/index.org][download]]
+page for other maintained versions.
 
- - {{{gnupg21_ver}}} is the /modern/ version with support
-   for [[https://en.wikipedia.org/wiki/Elliptic_curve_cryptography][ECC]] and many other new features,
+[[https://www.gpg4win.org][Gpg4win]] provides a Windows version of the older GnuPG 2.0 branch.  It
+is nicely integrated into an installer and features several frontends
+as well as English and German manuals.
 
- - {{{gnupg_ver}}} is the /stable/ version from an often used branch.
-   This branch will reach end-of-life on 2017-12-31.
-
-Project [[https://www.gpg4win.org][Gpg4win]] provides a Windows version of the old GnuPG /stable/. It is
-nicely integrated into an installer and features several frontends as
-well as English and German manuals.  A simple Windows installer for the
-/modern/ version is available at our [[file:download/index.org][download]] page.
 
 * Reconquer your privacy