[git] gnupg-doc - branch, master, updated. 656273a5058d41c3f3419a3751f59a2e03507d9f

[by Werner Koch]

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 "The GnuPG website and other docs".

The branch, master has been updated
       via  656273a5058d41c3f3419a3751f59a2e03507d9f (commit)
      from  959ca8a73c9719eb6d153b3a5486466c1b6467ee (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 656273a5058d41c3f3419a3751f59a2e03507d9f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 21 18:18:15 2014 +0200

    web: Rename Miscellaneous to Archive
    
    Also move old stuff to there.

diff --git a/web/misc/index.org b/web/misc/index.org
index 9084c3e..fa5d7e5 100644
--- a/web/misc/index.org
+++ b/web/misc/index.org
@@ -2,12 +2,15 @@
 #+STARTUP: showall
 #+SETUPFILE: "../share/setup.inc"
 
-* Miscellaneous
+* Archive
 
-  Any respectful site features a misc section.  We are not an exception:
+  This is a list of pages we used in the past.  The content is
+  not anymore relevant for the project but we keep them here in case
+  people like to dive into old times.
 
+  - [[file:thanks.org][Thanks]] - We have to thank many people for making GnuPG possible.
   - [[file:links.org][Links]] - Cryptography is a wide-spread science and other people
     have something to tell about.
   - [[file:logo-contest.org][Logo Contest]] - GnuPG needs a new Logo.
-  - [[http://www-old.gnupg.org][The old GnuPG website]] - in case something is missing at the new one.
-  - [[file:thanks.org][Thanks]] - We have to thank many people for making GnuPG possible.
+  - [[http://www-old.gnupg.org][The old GnuPG website]] - In case something is missing at the new one.
+  - [[file:~/s/gnupg-doc/web/legal.org][Law survey]] - Info on the legal issues of using cryptography.
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index b5f3ae3..6d5b827 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -70,7 +70,6 @@
         <li><a href=\"/features.html\" >Features</a></li>
         <li><a href=\"/news.html\"     >News</a></li>
         <li><a href=\"/service.html\"  >Service</a></li>
-        <li><a href=\"/legal.html\"    >Legal</a></li>
       </ul>
     <li><a href=\"/donate/index.html\"          >Donate</a></li>
       <ul>
@@ -105,14 +104,9 @@
         <li><a href=\"/related_software/libraries.html\" >Libraries</a></li>
         <li><a href=\"/related_software/swlist.html\"    >All</a></li>
       </ul>
-    <li><a href=\"/misc/index.html\"            >Miscellaneous</a></li>
-      <ul>
-        <li><a href=\"/misc/links.html\"         >Links</a></li>
-        <li><a href=\"/misc/logo-contest.html\"  >Logo Contest</a></li>
-        <li><a href=\"/misc/thanks.html\"        >Thanks</a></li>
-      </ul>
     <li><a href=\"/blog/index.html\"            >Blog</a></li>
     <li><a href=\"/privacy-policy.html\"        >Privacy Policy</a></li>
+    <li><a href=\"/misc/index.html\"            >Archive</a></li>
     <li><a href=\"/sitemap.html\"               >Sitemap</a></li>
   </ul>
   </nav>
@@ -205,7 +199,7 @@
              "werner at trithemius.gnupg.org:"
              "/var/www/www/www.gnupg.org/htdocs/ ;"
              " ssh werner at trithemius.gnupg.org"
-             " touch /var/www/www/www.gnupg.org/htdocs/donate/donors.dat"))
+             " touch /var/www/www/www.gnupg.org/htdocs/donate/donors.dat"))))
 
 (provide 'gpgweb)
 

-----------------------------------------------------------------------

Summary of changes:
 web/misc/index.org  |   11 +++++++----
 web/share/gpgweb.el |   10 ++--------
 2 files changed, 9 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org