*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index de6d6422512e223461120aa70cef5e23f4d0f69e..a1c40b2c09efd4a593c6c2de498979a6e2219555 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/user/*: strip out-www from paths.
+
 2005-12-05  Heikki Junes  <hjunes@cc.hut.fi>
 
        * Documentation/user/lilypond.tely (direntry): remove empty lines;
@@ -5,8 +9,14 @@
 
 2005-12-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/GNUmakefile: idem.
+
+       * Documentation/user/macros.itexi: strip out-www
+
        * python/rational.py: python 2.3 compat.
 
+       * VERSION (PATCH_LEVEL): release 2.7.21
+
        * scripts/musicxml2ly.py (NonDentedHeadingFormatter.format_headi):
        option formatting, lilypond style.
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 6ab1df325b77cee00bdafa3720a248e2caad1d38..f88316a0ad2a984bca458a4e4b4e5842655e095d 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -210,15 +210,15 @@ source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossa
 
 $(outdir)/source:
        @rm -f $(@)
-       ln -sf ../../../ $(@)
+       ln -sf ../../ $(@)
 
 $(outdir)/lilypond/source:
        @rm -f $(@)
-       ln -sf ../../../../ $(@)
+       ln -sf ../../../ $(@)
 
 $(outdir)/music-glossary/source:
        @rm -f $(@)
-       ln -sf ../../../../ $(@)
+       ln -sf ../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
  $(datafiles) $(PDF_FILES) $(source-links) info info-dir

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index f1a8a491eaa3e4ae790676057b155e37f6d8d352..8f03e9461d0400ad275503c138bda663409f9053 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -759,7 +759,7 @@ available in
 a big HTML page,
 @end iftex
 @ifhtml
-@uref{source/Documentation/user/out-www/lilypond.html, one big page},
+@uref{source/Documentation/user/lilypond.html, one big page},
 @end ifhtml
 which can be searched easily using the search facility of a web
 browser.
@@ -823,7 +823,7 @@ Various input examples.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/test,Various input examples}.
-@uref{source/input/test/out-www/collated-files.html,Various input examples}.
+@uref{source/input/test/collated-files.html,Various input examples}.
 @end ifhtml
 
 This collection of files shows various tips and tricks, and is
@@ -837,7 +837,7 @@ The regression tests.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/regression,The regression tests}.
-@uref{source/input/regression/out-www/collated-files.html,The regression tests}.
+@uref{source/input/regression/collated-files.html,The regression tests}.
 @end ifhtml
 
 This collection of files tests each notation and engraving feature of

diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index e698d13a3aefdab83d3db4c540c0eb928530ff4d..3a2becd5055e8efe0cca6e16b6b2937e727f9742 100644 (file)
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -574,7 +574,7 @@ and syntax coloring, handy compile short-cuts and reading LilyPond
 manuals using Info.  If @file{lilypond-mode} is not installed on your
 platform, then read the
 @ifhtml
-@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}.
+@uref{source/Documentation/topdocs/INSTALL.html,installation instructions}.
 @end ifhtml
 @ifnothtml
 installation instructions.
@@ -585,7 +585,7 @@ installation instructions.
 For @uref{http://@/www@/.vim@/.org,VIM}, a @file{vimrc} is supplied, along
 with syntax coloring tools.  For more information, refer to the
 @ifhtml
-@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}.
+@uref{source/Documentation/topdocs/INSTALL.html,installation instructions}.
 @end ifhtml
 @ifnothtml
 installation instructions.

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 55bc53ce7bc884d179a6863fc817c17be7a85920..01b61c190fae726ff091526341c01d4b8e1921f0 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -168,7 +168,7 @@ HINTS FOR STYLE
 @end ignore
 
 @ifhtml
-This document is also available in @uref{source/Documentation/user/out-www/lilypond.pdf,PDF}.
+This document is also available in @uref{source/Documentation/user/lilypond.pdf,PDF}.
 @end ifhtml
 
 

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index d711749fb70eb402c01fa3da9e847c67bcc9806c..443d8a7bacf920897dd8eb8ca4e3aba67627b40c 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -61,7 +61,7 @@
 
 @c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
 @macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
 @macro rglos{NAME}@c
@@ -82,7 +82,7 @@
 @end macro
  
 @macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
 @macro rglos{NAME}@c

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index f89f7c62690e4e67f15c1b453f1d83a43ea94d3d..f24c412a25ad454d8808fdf6b6d3fdee908bc309 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -12,8 +12,8 @@
 @end direntry
 
 @ifhtml
-This document is also available in @uref{source/Documentation/user/out-www/music-glossary.pdf,PDF}
-and as @uref{source/Documentation/user/out-www/music-glossary.html,one big page}.
+This document is also available in @uref{source/Documentation/user/music-glossary.pdf,PDF}
+and as @uref{source/Documentation/user/music-glossary.html,one big page}.
 @end ifhtml
 
 @titlepage

diff --git a/VERSION b/VERSION
index 70214b6bd28ace4338d3927513d74766deba0311..b95b53613f2899ad8e758e2e2236346ce2200a9c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=21
+PATCH_LEVEL=22
 MY_PATCH_LEVEL=