web: Minor cleanups.
authorWerner Koch <wk@gnupg.org>
Thu, 23 Oct 2014 11:56:22 +0000 (13:56 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 23 Oct 2014 14:09:14 +0000 (16:09 +0200)
web/donate/donate-thanks.org
web/donate/kudos.org
web/download/index.org
web/download/mirrors.org
web/index.org
web/mirrors.org
web/share/ox-gpgweb.el

index b53e3a0..d370aa2 100644 (file)
@@ -6,7 +6,7 @@
 
   *Thank you very much for your donation to our work on GnuPG.*
 
-  Note that the [[/donate/kudos.html][list of donors]] is updated every 30 minutes, thus
+  Note that the [[https://www.gnupg.org/donate/kudos.html][list of donors]] is updated every 30 minutes, thus
   have some patience until you see your name.  If you did not give a
   name you won’t be listed at all.
 
index 2e6e151..df875e4 100644 (file)
 
 ** Donation summary
 
-#+HTML:<p>In
-#+HTML:<!--INSERT-MONTH-DATE--> October 2014
-#+HTML:we received
-#+HTML:<!--INSERT-MONTH-N--> 2
-#+HTML:donations of
-#+HTML:<!--INSERT-MONTH-EURO--> 28 Euro
-#+HTML:.  For the entire year we
-#+HTML:received a total of
-#+HTML:<!--INSERT-YEAR-EURO--> 52 Euro
-#+HTML:from
-#+HTML:<!--INSERT-YEAR-N--> 28
-#+HTML:donations.  Note that these numbers are only for donations via Stripe
-#+HTML:(credit card) and do not yet account for those received via Paypal.
-#+HTML:</p>
+#+BEGIN_HTML
+<p>In
+<!--INSERT-MONTH-DATE--> this month
+we received
+<!--INSERT-MONTH-N--> N
+donations of
+<!--INSERT-MONTH-EURO--> X Euro
+.<br/>
+In this year we received
+<!--INSERT-YEAR-N--> M
+donations of
+<!--INSERT-YEAR-EURO--> Y Euro
+.
+</p>
+#+END_HTML
 
 
+Donations for the previous years:
+
 | Year |   # |  \EUR | net \EUR |
 |      | <r> |   <r> |      <r> |
 |------+-----+-------+----------|
 | 2011 |  21 |   553 |      465 |
 | 2012 |  53 |  5991 |     4963 |
 | 2013 | 148 |  5041 |     4145 |
-| 2014 | 102 |  4742 |     3985 |
 |------+-----+-------+----------|
-|      |     | 16327 |    13558 |
+|      |     | 11585 |     9573 |
 #+TBLFM: $LR3=vsum(@I..@II)::$LR4=vsum(@I..@II)
 
 # In 2014 without the 32641.27 (27429.64) from the Goteo campaign
@@ -57,7 +59,6 @@
 #+HTML: <div id="smallnote">
 The "net" column gives the actual value without VAT and credit card
 fees.\\
-Last update: 2014-10-07
 #+HTML: </div>
 
 * Hardware and service donations
index b67d72f..09483d2 100644 (file)
@@ -9,7 +9,7 @@
 * Download
 
   We suggest that you download the GNU Privacy Guard from a mirror
-  site close to you. See our [[mirrors.org][list of mirrors]] . To locate a /source
+  site close to you. See our [[file:mirrors.org][list of mirrors]] . To locate a /source
   package/ (indicated by an `S') on a mirror, follow the link to
   the *gnupg* directory; to locate a /binary package/ (indicated by a
   `B') follow the link to the *binary*.
index 36f275a..bd24488 100644 (file)
 #+TITLE: GnuPG - FTP Mirrors
 #+STARTUP: showall
 #+SETUPFILE: "../share/setup.inc"
+#+macro: rsync  @@html:<a href="$1">rsync</a>@@
 
 * FTP Mirrors
 
 The primary FTP site [[ftp://ftp.gnupg.org/gcrypt/][ftp.gnupg.org]] is mirrored at several
 sites. Please choose the nearest mirror to you. If you are seeking for
-web site mirrors, please consult the [[../mirrors.en.html][WWW mirror page]] .
-
-
-** Africa
-
-
-** The Americas
-
-*** Canada
-
-    -  [[http://www.gnupg.ca/][GnuPG.ca]] (2/day) ::
-       [[ftp://ftp.gnupg.ca/][ftp://ftp.gnupg.ca/]]
-
-** Australia
-
-
-** Asia
-
-*** Japan
-
-    - [[http://www.ring.gr.jp/][Ring]] ::
-      [[ftp://ftp.ring.gr.jp/pub/net/gnupg/]] \\
-      [[http://www.ring.gr.jp/pub/net/gnupg/][http://www.ring.gr.jp/pub/net/gnupg/]]
-
-
-** Europe
-
-*** Austria
-
-    - [[http://gd.tuwien.ac.at/][TU Wien]] ::
-      [[ftp://gd.tuwien.ac.at/privacy/gnupg/][ftp://gd.tuwien.ac.at/privacy/gnupg/]] \\
-      [[http://gd.tuwien.ac.at/privacy/gnupg/][http://gd.tuwien.ac.at/privacy/gnupg/]]
-
-*** Denmark
-
-    - [[http://dotsrc.org/][dotsrc.org]] (daily) ::
-      [[ftp://mirrors.dotsrc.org/gcrypt/][ftp://mirrors.dotsrc.org/gcrypt/]] \\
-      [[http://mirrors.dotsrc.org/gcrypt/][http://mirrors.dotsrc.org/gcrypt/]]
-
-*** Finland
-
-    - [[http://www.jyu.fi/][JYU]] ::
-      [[ftp://ftp.jyu.fi/pub/crypt/gcrypt/][ftp://ftp.jyu.fi/pub/crypt/gcrypt/]]
-
-*** France
-
-    - [[http://mirror.cict.fr/][CICT Mirror (Universite Paul Sabatier), TOULOUSE]] (1/day) ::
-      [[ftp://mirror.cict.fr/gnupg/][ftp://mirror.cict.fr/gnupg/]]
-
-*** Germany
-
-    - [[http://www.artfiles.de][Artfiles New Media GmbH]] (daily) ::
-      [[http://artfiles.org/gnupg.org][http://artfiles.org/gnupg.org]]
-
-    - [[http://www.franken.de/][Franken]] (daily) ::
-      [[ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/][ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/]]
-
-    - [[http://www.freenet.de/][Freenet.de]] ::
-      [[ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/][ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/]]
-
-*** Hungary
-
-    - [[http://www.crysys.hu/][CrySyS Lab., BUTE]] (daily) ::
-      [[ftp://ftp.crysys.hu/pub/gnupg/][ftp://ftp.crysys.hu/pub/gnupg/]]
-
-*** Iceland
-
-    - [[http://www.hi.is/][HI]] ::
-      [[ftp://ftp.hi.is/pub/mirrors/gnupg/][ftp://ftp.hi.is/pub/mirrors/gnupg/]]
-
-*** Ireland
-
-    - [[http://ftp.heanet.ie/about/][HEAnet]] (4/day) ::
-      [[ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/][ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/]]  \\
-      [[http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/][http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/]] \\
-      [[rsync://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/]]
-
-*** Netherlands
-
-    - [[http://www.bit.nl/][BIT]] ::
-      [[ftp://ftp.bit.nl/mirror/gnupg/][ftp://ftp.bit.nl/mirror/gnupg/]]
-
-    - [[http://www.demon.nl/][Demon]] ::
-      [[ftp://ftp.demon.nl/pub/mirrors/gnupg/][ftp://ftp.demon.nl/pub/mirrors/gnupg/]]
-
-    - [[http://www.surfnet.nl/][SurfNet]] ::
-      [[ftp://ftp.surfnet.nl/pub/security/gnupg/][ftp://ftp.surfnet.nl/pub/security/gnupg/]]
-
-*** Portugal
-
-    - [[http://5coluna.com][5ª Coluna]] (2/day) ::
-      [[http://dist.gnupg.pt/][http://dist.gnupg.pt/]]
-
-*** Romania
-
-    - [[http://www.iasi.roedu.net/][Romanian Education Network, Iasi Branch]] ::
-      [[ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/][ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/]]
-
-*** Sweden
-
-    - [[http://archive.sunet.se/][Sunet]] ::
-      [[ftp://ftp.sunet.se/pub/security/gnupg/][ftp://ftp.sunet.se/pub/security/gnupg/]]
-
-*** Switzerland
-
-    - [[http://mirror.switch.ch/][SWITCHmirror]] ::
-      [[ftp://mirror.switch.ch/mirror/gnupg/][ftp://mirror.switch.ch/mirror/gnupg/]]
-
-*** United Kingdom
-
-    - [[http://gnupg.org.favoritelinks.net/][favoritelinks]] (daily) ::
-      [[http://gnupg.org.favoritelinks.net/]]
-
-    - [[http://mirror.tje.me.uk/][mirror.tje.me.uk]] (4/day) ::
-      [[ftp://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org][ftp://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org]]
-      [[http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/][http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/]]
-
-    - [[http://www.mirrorservice.org/][UK Mirror Service]] ::
-      [[ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt][ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt]] \\
-      [[http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt][http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt]] \\
-      [[rsync://rsync.mirrorservice.org/ftp.gnupg.org/gcrypt/]]
+web site mirrors, please consult the [[../mirrors.html][WWW mirror page]] .
+
+  | Country        | Organisation               | Links                                                                         | Sync  |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  |                |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | The Americas   |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | Canada         | [[http://www.gnupg.ca/][GnuPG.ca]]                   | [[ftp://ftp.gnupg.ca/][ftp]]                                                                           | 2/day |
+  |                |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | Asia           |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | Japan          | [[http://www.ring.gr.jp/][Ring]]                       | [[ftp://ftp.ring.gr.jp/pub/net/gnupg/][ftp]]  [[http://www.ring.gr.jp/pub/net/gnupg/][http]]                                                                     |       |
+  |                |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | Europe         |                            |                                                                               |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
+  | Austria        | [[http://gd.tuwien.ac.at/][TU Wien]]                    | [[ftp://gd.tuwien.ac.at/privacy/gnupg/][ftp]]  [[http://gd.tuwien.ac.at/privacy/gnupg/][http]]                                                                     |       |
+  | Denmark        | [[http://dotsrc.org/][dotsrc.org]]                 | [[ftp://mirrors.dotsrc.org/gcrypt/][ftp]]  [[http://mirrors.dotsrc.org/gcrypt/][http]]                                                                     | daily |
+  | Finland        | [[http://www.jyu.fi/][JYU]]                        | [[ftp://ftp.jyu.fi/pub/crypt/gcrypt/][ftp]]                                                                           |       |
+  | France         | [[http://mirror.cict.fr/][CICT Mirror, Toulouse]]      | [[ftp://mirror.cict.fr/gnupg/][ftp]]                                                                           | daily |
+  | Germany        | [[http://www.artfiles.de][Artfiles New Media GmbH]]    | [[http://artfiles.org/gnupg.org][http]]                                                                          | daily |
+  |                | [[http://www.franken.de/][Franken]]                    | [[ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/][ftp]]                                                                           | daily |
+  |                | [[http://www.freenet.de/][Freenet.de]]                 | [[ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/][ftp]]                                                                           |       |
+  | Hungary        | [[http://www.crysys.hu/][CrySyS Lab., Bute]]          | [[ftp://ftp.crysys.hu/pub/gnupg/][ftp]]                                                                           | daily |
+  | Iceland        | [[http://www.hi.is/][HI]]                         | [[ftp://ftp.hi.is/pub/mirrors/gnupg/][ftp]]                                                                           |       |
+  | Ireland        | [[http://ftp.heanet.ie/about/][HEAnet]]                     | [[ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/][ftp]]  [[http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/][http]]  {{{rsync(rsync://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/)}}}   | 4/day |
+  | Netherlands    | [[http://www.bit.nl/][BIT]]                        | [[ftp://ftp.bit.nl/mirror/gnupg/][ftp]]                                                                           |       |
+  |                | [[http://www.demon.nl/][Demon]]                      | [[ftp://ftp.demon.nl/pub/mirrors/gnupg/][ftp]]                                                                           |       |
+  |                | [[http://www.surfnet.nl/][SurfNet]]                    | [[ftp://ftp.surfnet.nl/pub/security/gnupg/][ftp]]                                                                           |       |
+  | Portugal       | [[http://5coluna.com][5ª Coluna]]                  | [[http://dist.gnupg.pt/][http]]                                                                          | 2/day |
+  | Romania        | [[http://www.iasi.roedu.net/][Romanian Edu., Iasi Branch]] | [[ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/][ftp]]                                                                           |       |
+  | Sweden         | [[http://archive.sunet.se/][Sunet]]                      | [[ftp://ftp.sunet.se/pub/security/gnupg/][ftp]]                                                                           |       |
+  | Switzerland    | [[http://mirror.switch.ch/][SWITCHmirror]]               | [[ftp://mirror.switch.ch/mirror/gnupg/][ftp]]                                                                           |       |
+  | United Kingdom | [[http://gnupg.org.favoritelinks.net/][favoritelinks]]              | [[http://gnupg.org.favoritelinks.net/][http]]                                                                          | daily |
+  |                | [[http://mirror.tje.me.uk/][mirror.tje.me.uk]]           | [[ftp://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org][ftp]]  [[http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/][http]]                                                                     | 4/day |
+  |                | [[http://www.mirrorservice.org/][UK Mirror Service]]          | [[ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt][ftp]]  [[http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt][http]]  {{{rsync(rsync://rsync.mirrorservice.org/ftp.gnupg.org/gcrypt/)}}} |       |
+  |----------------+----------------------------+-------------------------------------------------------------------------------+-------|
index ba5462b..b9eb450 100644 (file)
@@ -58,7 +58,7 @@ all [[file:news.org][news of previous years]] is also available.
 
 ** A beta for GnuPG 2.1.0 released (2014-10-03)
 
-A beta beta release for the forthcoming GnuPG 2.1 version is now
+A beta release for the forthcoming GnuPG 2.1 version is now
 available.  [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q4/000357.html][{more}]]
 
 ** GPA 0.95 released
index ee9d0a2..87633c5 100644 (file)
@@ -4,79 +4,38 @@
 
 * WWW Mirrors
 
-The primary HTTP site [[https://www.gnupg.org/][GnuPG.org]] is mirrored at several sites. Please
-choose the nearest mirror to you. If you are seeking for sources and
-binaries, please consult the [[download/mirrors.en.html][FTP mirror page]] under the [[download][Download]]
-section.
-
-** Africa
-
-** The Americas
-
-*** Canada
-
-    - [[http://www.gnupg.ca/][GnuPG.ca]] (2/day) ::
-      [[http://www.gnupg.ca/][http://www.gnupg.ca/]]
-
-    - [[http://www.raffsoftware.com/][RaffSoftware]] (1/day) ::
-      [[http://gnupg.raffsoftware.com/][http://gnupg.raffsoftware.com/]]
-
-    - [[http://www.parentinginformed.com/][www.parentinginformed.com]] (2/day) ::
-      [[http://gnupg.parentinginformed.com/][http://gnupg.parentinginformed.com/]]
-
-** Australia
-
-
-** Asia
-
-*** Korea
-
-    - [[http://www.snu.ac.kr/][SNU]] (weekly) ::
-      [[http://musicone.snu.ac.kr/webmirror/gnupg/][http://musicone.snu.ac.kr/webmirror/gnupg/]]
-
-
-** Europe
-
-*** Austria
-
-    - [[http://gd.tuwien.ac.at/][TU Wien]] ::
-      [[http://gd.tuwien.ac.at/www.gnupg.org/]]
-
-*** Czechia
-
-    - [[http://www.gnupg.cz/][GnuPG.cz]] ::
-      [[http://www.gnupg.cz/][http://www.gnupg.cz/]]
-
-*** Denmark
-
-    - [[http://www.gnupg.dk/][GnuPG.dk]] ::
-       [[http://www.gnupg.dk/][http://www.gnupg.dk/]]
-
-*** France
-
-    - [[http://mirror.cict.fr/][CICT Mirror (Universite Paul Sabatier),TOULOUSE]] (1/day) ::
-      [[http://gnupg.cict.fr/][http://gnupg.cict.fr/]]
-
-*** Hungary
-
-    - [[http://www.crysys.hu/][CrySyS Lab., BUTE]] (daily) ::
-      [[http://gnupg.mirrors.crysys.hu/][http://gnupg.mirrors.crysys.hu/]]
-
-*** Portugal
-
-    - [[http://5coluna.com][5ª Coluna]] (2/day) ::
-      [[http://mirror.gnupg.pt/][http://mirror.gnupg.pt/]]
-
-*** Sweden
-
-    - [[http://archive.sunet.se/][Sunet]] ::
-      [[http://gnupg.archive.sunet.se/][http://gnupg.archive.sunet.se/]]
-
-*** United Kingdom
-
-    - [[http://mirror.tje.me.uk/][mirror.tje.me.uk]] (4/day) ::
-      [[ftp://mirror.tje.me.uk/pub/mirrors/www.gnupg.org][ftp://mirror.tje.me.uk/pub/mirrors/www.gnupg.org]] \\
-      [[http://mirror.tje.me.uk/pub/mirrors/www.gnupg.org/][http://mirror.tje.me.uk/pub/mirrors/www.gnupg.org/]]
-
-    - [[http://www.mirrorservice.org/][UK Mirror Service]] ::
-      [[http://www.mirrorservice.org/sites/www.gnupg.org/][http://www.mirrorservice.org/sites/www.gnupg.org/]]
+The primary HTTP site [[https://www.gnupg.org/][GnuPG.org]] is mirrored at several sites.  Note
+that some features of this site will not work on the mirrors.  If you
+are seeking mirrors for source or binary packages, please consult the
+[[https://www.gnupg.org/download/mirrors.html][FTP mirror page]] under the [[download/index.html][Download]] section.
+
+
+  | Country        | Organisation          | Links     | Sync   |
+  |----------------+-----------------------+-----------+--------|
+  |                |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | The Americas   |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | Canada         | [[http://www.gnupg.ca/][GnuPG.ca]]              | [[http://www.gnupg.ca/][http]]      | 2/day  |
+  |                | [[http://www.raffsoftware.com/][RaffSoftware]]          | [[http://gnupg.raffsoftware.com/][http]]      | daily  |
+  |                | [[http://www.parentinginformed.com/][parentinginformed]]     | [[http://gnupg.parentinginformed.com/][http]]      | 2/day  |
+  |                |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | Asia           |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | Korea          | [[http://www.snu.ac.kr/][SNU]]                   | [[http://musicone.snu.ac.kr/webmirror/gnupg/][http]]      | weekly |
+  |                |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | Europe         |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
+  | Austria        | [[http://gd.tuwien.ac.at/][TU Wien]]               | [[http://gd.tuwien.ac.at/www.gnupg.org/][http]]      |        |
+  | Czechia        | [[http://www.gnupg.cz/][GnuPG.cz]]              | [[http://www.gnupg.cz/][http]]      |        |
+  | Denmark        | [[http://www.gnupg.dk/][GnuPG.dk]]              | [[http://www.gnupg.dk/][http]]      |        |
+  | France         | [[http://mirror.cict.fr/][CICT Mirror, Toulouse]] | [[http://gnupg.cict.fr/][http]]      | daily  |
+  | Hungary        | [[http://www.crysys.hu/][CrySyS Lab., Bute]]     | [[http://gnupg.mirrors.crysys.hu/][http]]      | daily  |
+  | Portugal       | [[http://5coluna.com][5ª Coluna]]             | [[http://mirror.gnupg.pt/][http]]      | 2/day  |
+  | Sweden         | [[http://archive.sunet.se/][Sunet]]                 | [[http://gnupg.archive.sunet.se/][http]]      |        |
+  | United Kingdom | [[http://mirror.tje.me.uk/][mirror.tje.me.uk]]      | [[http://mirror.tje.me.uk/pub/mirrors/www.gnupg.org/][http]]  [[ftp://mirror.tje.me.uk/pub/mirrors/www.gnupg.org][ftp]] | 4/day  |
+  |                | [[http://www.mirrorservice.org/][UK Mirror Service]]     | [[http://www.mirrorservice.org/sites/www.gnupg.org/][http]]      |        |
+  |                |                       |           |        |
+  |----------------+-----------------------+-----------+--------|
index e1dfded..a48985c 100644 (file)
@@ -1618,9 +1618,9 @@ INFO is a plist holding contextual information.  See
                  (funcall link-org-files-as-html-maybe raw-path info))
            ;; If file path is absolute, prepend it with protocol
            ;; component - "file:".
-           (cond
-            ((file-name-absolute-p raw-path)
-             (setq raw-path (concat "file:" raw-path))))
+           ;(cond
+           ; ((file-name-absolute-p raw-path)
+           ;  (setq raw-path (concat "file:" raw-path))))
            ;; Add search option, if any.  A search option can be
            ;; relative to a custom-id or a headline title.  Append
            ;; a hash sign to any unresolved option, as it might point