web: Do not mention GnuPG 1.4 too prominent.
authorWerner Koch <wk@gnupg.org>
Tue, 18 Oct 2016 17:52:14 +0000 (19:52 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 18 Oct 2016 17:57:06 +0000 (19:57 +0200)
web/download/git.org
web/download/index.org
web/download/integrity_check.org
web/download/release_notes.org
web/index.org

index 2b727a6..399edb0 100644 (file)
@@ -35,7 +35,7 @@
   also checks that you have all required tools installed. Please read
   the GIT manual pages before doing so. The =master= revision is the
   development branch; the stable 2.0 version (currently version
-  {{{gnupg_ver}}}) is known as =STABLE-BRANCH-2-0=; the stable 1.4
+  {{{gnupg_ver}}}) is known as =STABLE-BRANCH-2-0=; the old 1.4
   version of GnuPG ({{{gnupg1_ver}}}) is known as =STABLE-BRANCH-1-4=.
 
   Bug reports should go to the developers mailing list. See the page
index 3e1d602..c7b8a04 100644 (file)
@@ -44,9 +44,8 @@
    | Name          | Version                | Date                    |                    Size | Tarball                                                                                                | Signature                                                                                                  |
    |---------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    |               | <l>                    |                         |                     <r> |                                                                                                        |                                                                                                            |
-   | 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 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 classic | {{{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}}}                     |
+   | 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}}}                      |
    |---------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
    | [[../related_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}}} |
    | [[../related_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}}}          |
index ba4d393..9689ef6 100644 (file)
    that can be downloaded from [[ftp://ftp.gnupg.org/][our site]], have been gathered below.
 
    {{{begin_chksum}}}
-   {{{gnupg_sha1}}}  gnupg-{{{gnupg_ver}}}.tar.bz2
    {{{gnupg21_sha1}}}  gnupg-{{{gnupg21_ver}}}.tar.bz2
    {{{gnupg21_w32_sha1}}}  gnupg-w32-{{{gnupg21_w32_ver}}}.exe
-   {{{gnupg1_sha1}}}  gnupg-{{{gnupg1_ver}}}.tar.bz2
-   {{{gnupg1_sha1_gz}}}  gnupg-{{{gnupg1_ver}}}.tar.gz
-   {{{gnupg1_w32cli_sha1}}}  gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe
+   {{{gnupg_sha1}}}  gnupg-{{{gnupg_ver}}}.tar.bz2
    {{{libgpg_error_sha1}}}  libgpg-error-{{{libgpg_error_ver}}}.tar.bz2
    {{{libgcrypt_sha1}}}  libgcrypt-{{{libgcrypt_ver}}}.tar.bz2
    {{{libksba_sha1}}}  libksba-{{{libksba_ver}}}.tar.bz2
    {{{gpgme_sha1}}}  gpgme-{{{gpgme_ver}}}.tar.bz2
    {{{gpa_sha1}}}  gpa-{{{gpa_ver}}}.tar.bz2
    {{{dirmngr_sha1}}}  dirmngr-{{{dirmngr_ver}}}.tar.bz2
+   {{{gnupg1_sha1}}}  gnupg-{{{gnupg1_ver}}}.tar.bz2
+   {{{gnupg1_w32cli_sha1}}}  gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe
    {{{end_chksum}}}
 
 
index d0e9aa1..6f27b28 100644 (file)
@@ -8,12 +8,8 @@
 
   Please read the NEWS file for a more complete list. {{{gnupg_ver}}}
   is the stable and modern version of GnuPG. (Version {{{gnupg1_ver}}}
-  is from the old GnuPG-1 series, which is still maintained and useful
-  on some platforms: It is smaller than versions from the GnuPG-2
-  series, easier to build and also better portable to ancient
-  platforms. In contrast to GnuPG-2 it comes with no support for
-  S/MIME, Secure Shell, or other tools useful for desktop
-  environments.
+  is from the old GnuPG-1 series, which is useful to decrypt PGP-2
+  encrypted data.)
 
 ** GnuPG-2
 
index d9f4aee..63c0717 100644 (file)
@@ -22,18 +22,15 @@ GnuPG is [[https://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning
 be freely used, modified and distributed under the terms of the
 [[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
 
-GnuPG comes in three flavours:
+There are two major flavours of GnuPG:
 
  - {{{gnupg21_ver}}} is the /modern/ version with support
    for [[https://en.wikipedia.org/wiki/Elliptic_curve_cryptography][ECC]] and many other new features,
 
- - {{{gnupg_ver}}} is the /stable/ version from the currently mostly
-   used branch.  This branch will reach end-of-life on 2017-12-31,
+ - {{{gnupg_ver}}} is the /stable/ version from an often used branch.
+   This branch will reach end-of-life on 2017-12-31.
 
- - and {{{gnupg1_ver}}} is the /classic/ portable version for use on
-   very old platforms or to decrypt data created with PGP-2 keys.
-
-Project [[https://www.gpg4win.org][Gpg4win]] provides a Windows version of GnuPG /stable/. It is
+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.