Attic: Announce for 2.14, descriptive changes for 1.6 - 2.14

Add links to the announcement for 2.14 and changes for 1.6 - 2.14.
Also, remove links to lilypond.org/web/ and normalize links.

5 files changed, 26 insertions, 16 deletions

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 37422c7ed4..baff739e3c 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -182,7 +182,7 @@ UNTRANSLATED NODE: IGNORE ME
 @end ifset
 
 @macro miscLink{MISC-FILE,MISC-TEXT}
-@uref{http://www.lilypond.org/website/misc/\MISC-FILE\,\MISC-TEXT\}
+@uref{http://lilypond.org/website/misc/\MISC-FILE\,\MISC-TEXT\}
 @end macro
 
 @macro spanClass {CLASS}
diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 2a76a63ba8..7cc26d9cd7 100644
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -1192,28 +1192,38 @@ the @ref{Attic}}
 @subheading Announcements
 
 Announcements and news by version:
+@uref{http://lilypond.org/doc/v2.14/Documentation/web/index#LilyPond-2_002e14_002e0-released_0021-June-6_002c-2011,v2.14},
 @miscLink{announce-v2.12,v2.12},
-@miscLink{announce-v2.12.de,v2.12 (German)},
-@miscLink{announce-v2.12.es,v2.12 (Spanish)},
-@miscLink{announce-v2.12.fr,v2.12 (French)},
 @miscLink{announce-v2.10,v2.10},
 @miscLink{announce-v2.8,v2.8},
 @miscLink{announce-v2.6,v2.6},
 @miscLink{announce-v2.4,v2.4},
 @miscLink{announce-v2.2,v2.2},
 @miscLink{announce-v2.0,v2.0},
-@miscLink{NEWS-1.4,v1.4},
-@miscLink{NEWS-1.2,v1.2 (1)},
-@miscLink{ANNOUNCE-1.2,v1.2 (2)},
+@miscLink{ANNOUNCE-1.2,v1.2},
 @miscLink{ANNOUNCE-1.0,v1.0},
 @miscLink{ANNOUNCE-0.1,v0.1}
 
+Descriptive list of changes by version:
+@uref{http://lilypond.org/doc/v2.14/Documentation/changes/index.html,v2.14},
+@uref{http://lilypond.org/doc/v2.12/Documentation/topdocs/NEWS,v2.12},
+@uref{http://lilypond.org/doc/v2.10/Documentation/topdocs/NEWS,v2.10},
+@uref{http://lilypond.org/doc/v2.8/Documentation/topdocs/NEWS,v2.8},
+@uref{http://lilypond.org/doc/v2.6/Documentation/topdocs/NEWS,v2.6},
+@uref{http://lilypond.org/doc/v2.4/Documentation/topdocs/out-www/NEWS,v2.4},
+@uref{http://lilypond.org/doc/v2.2/Documentation/topdocs/out-www/NEWS,v2.2},
+@uref{http://lilypond.org/doc/v2.0/Documentation/topdocs/out-www/NEWS,v2.0},
+@uref{http://lilypond.org/doc/v1.8/Documentation/topdocs/out-www/NEWS,v1.8},
+@uref{http://lilypond.org/doc/v1.6/Documentation/out-www/NEWS,v1.6},
+@miscLink{NEWS-1.4,v1.4},
+@miscLink{NEWS-1.2,v1.2}
+
 @divEnd
 
 @divClass{column-center-bottom}
 @subheading Changelogs
 
-Changelogs by version:
+Developpers' changelogs by version:
 @miscLink{ChangeLog-2.10,v2.10},
 @miscLink{ChangeLog-2.3,v2.3},
 @miscLink{ChangeLog-2.1,v2.1},
diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index 11e7124515..1ab3fed9b1 100644
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -2176,9 +2176,9 @@ This release has some documentation updates.
 @subsubheading Traduction de la documentation en français - @emph{25 février 2007}
 Les chapitres 1 à 4 et 6 du manuel de l'utilisateur sont désormais traduits, et
 disponibles en ligne ---
-@uref{/doc/v2.10/Documentation/user/lilypond/index.fr.html,version 2.10},
-@uref{/doc/v2.11/Documentation/user/lilypond/index.fr.html,version 2.11}.  Les
-traductions sont également incluses dans la
+@uref{http://lilypond.org/doc/v2.10/Documentation/user/lilypond/index.fr.html,version 2.10},
+@uref{http://lilypond.org/doc/v2.11/Documentation/user/lilypond/index.fr.html,version 2.11}.
+Les traductions sont également incluses dans la
 @uref{install,documentation téléchargeable}.
 @newsEnd
 
@@ -2467,8 +2467,8 @@ From now on, our GUB binary builds include support for Linux/PPC.  (@ref{Old dow
 @subsubheading Traduction du tutoriel en français.  @emph{December 13, 2006}
 Fruit du travail d'une équipe de traducteurs, le tutoriel en français est
 maintenant disponible en ligne.
-@uref{/doc/v2.10/Documentation/user/lilypond/Tutorial.fr.html,Version 2.10},
-@uref{/doc/v2.11/Documentation/user/lilypond/Tutorial.fr.html,Version 2.11}.
+@uref{http://lilypond.org/doc/v2.10/Documentation/user/lilypond/Tutorial.fr.html,Version 2.10},
+@uref{http://lilypond.org/doc/v2.11/Documentation/user/lilypond/Tutorial.fr.html,Version 2.11}.
 @newsEnd
 
 
@@ -4656,7 +4656,7 @@ More information in the
 @subsubheading January 4, 2004
 LilyPond 2.1.6 continues to improve the layout of  lyrics.  More
 information in the
-@uref{/doc/v2.1/Documentation/topdocs/out-www/NEWS.html,release
+@uref{http://lilypond.org/doc/v2.1/Documentation/topdocs/out-www/NEWS.html,release
 notes} and download @uref{install/#2.1,here}.
 @newsEnd
 
diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index cb42048b4d..022f3f3369 100644
--- a/input/regression/page-breaks.ly
+++ b/input/regression/page-breaks.ly
@@ -64,7 +64,7 @@
       }
       \with-url
       %% todo: lilypond.org/music-engraving
-      #"http://lilypond.org/web/"
+      #"http://lilypond.org/"
       \fill-line {
 	"www.lilypond.org"
       }
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 858ea7f3a5..0f53296584 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -249,7 +249,7 @@ the PDF backend.
 
 @lilypond[verbatim,quote]
 \\markup {
-  \\with-url #\"http://lilypond.org/web/\" {
+  \\with-url #\"http://lilypond.org/\" {
     LilyPond ... \\italic {
       music notation for everyone
     }