From: Jan Nieuwenhuizen Date: Wed, 17 Jan 2001 13:13:30 +0000 (+0100) Subject: patch::: 1.3.122.jcn4 X-Git-Tag: release/1.3.123~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f8b84e885e376874252c2da3b667c29e3bb5c9ca;p=lilypond.git patch::: 1.3.122.jcn4 1.3.122.jcn4 ============ * More website link fixes, split and nonsplit. --- Generated by janneke@gnu.org, From = lilypond-1.3.122.jcn3, To = lilypond-1.3.122.jcn4 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.122.jcn4.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- diff --git a/CHANGES b/CHANGES index 4e1b423cc2..1f55d48cc8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,19 @@ ---- ../lilypond-1.3.122.jcn2/CHANGES Wed Jan 10 18:35:53 2001 +--- ../lilypond-1.3.122.jcn3/CHANGES Tue Jan 16 22:33:27 2001 +++ b/CHANGES Wed Jan 17 14:13:30 2001 +@@ -1,7 +1,13 @@ +1.3.122.jcn4 +============ + +* More website link fixes, split and nonsplit. + + 1.3.122.jcn3 + ============ + + * Non-splitting makeinfo website fix. + + + 1.3.122.jcn2 + ============--- ../lilypond-1.3.122.jcn2/CHANGES Wed Jan 10 18:35:53 2001 ++ b/CHANGES Tue Jan 16 22:33:27 2001 @@ -1,3 +1,8 @@ 1.3.122.jcn3 diff --git a/Documentation/index.texi b/Documentation/index.texi index 8c25bba595..7235f307f4 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -22,19 +22,19 @@ @itemize @bullet @item @uref{../user/out-www/lilypond/lilypond.html,LilyPond user manual} -@item @uref{../user/out-www/lilypond/Reference-Manual.html,LilyPond reference manual} +@item @uref{../user/out-www/lilypond/Reference-Manual.html#Reference Manual,LilyPond reference manual} also available in @uref{../user/out-www/lilypond.ps.gz,Postscript} @item LilyPond @uref{../user/out-www/lilypond-internals/lilypond-internals.html,internals} -@item @uref{../user/out-www/lilypond/Features.html, LilyPond features} +@item @uref{../user/out-www/lilypond/Features.html#Features, LilyPond features} work in progress, to me merged with reference manual. @item @uref{../user/out-www/glossary.html,A glossary of musical terms}, includes translations. Also available in @uref{../user/out-www/glossary.ps.gz,Postscript}) @item @uref{../user/out-www/lilypond-book.html,lilypond-book}, a tool for integrating text and music in LaTeX and texinfo; also available in @uref{../user/out-www/lilypond-book.ps.gz,Postscript} -@item @uref{../user/out-www/ly2dvi.html,ly2dvi} does page layout for +@item @uref{../user/out-www/lilypond/Ly2dvi.html#Ly2dvi,ly2dvi} does page layout for LilyPond printout. -@item @uref{../user/out-www/midi2ly.html,midi2ly} +@item @uref{../user/out-www/lilypond/Midi2ly.html#Midi2ly,midi2ly} converts MIDI files to LilyPond input @item @uref{regression-test.html, LilyPond test document} Also available in @uref{regression-test.ps.gz,Postscript} diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 125ce6ff10..604b23b5b6 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -71,10 +71,16 @@ DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html local-WWW: deep-symlinks + + +# Links referred to by Documentation index +LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html + deep-symlinks: cd $(outdir) && rm -f lilypond && ln -s . lilypond cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals - + cd $(outdir) && $(foreach i, $(LILYPOND_LINKS), + rm -f $(i) && ln -s $(i) lilypond.html &&) && : endif diff --git a/VERSION b/VERSION index 65109eb340..9bd5603454 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=122 -MY_PATCH_LEVEL=jcn3 +MY_PATCH_LEVEL=jcn4 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version.