* make/lilypond.redhat.spec.in: don't dist input/ separately

anymore

* Documentation/topdocs/README.texi: small fixes.

diff --git a/ChangeLog b/ChangeLog
index e8aa585e67362e9025943b3539d2a0cf7ffc7f61..6c889e0eb2c26b330cfa9d6575126ab283a6c7fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
        * VERSION: release 1.6.0 
 
+       * make/lilypond.redhat.spec.in: don't dist input/ separately
+       anymore
+
        * Documentation/user/latex-example.latex: restore from old version
 
        * Documentation/topdocs/index.tely: remove @settitle

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index 6f642e537680541da08ca54d75489ac080fc5aad..21ea734aa50358b7021c93b0487b3214b148ce35 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -9,12 +9,12 @@
 @node Top, , , 
 @top
 
-@chapter This is the toplevel README to LilyPond
+@chapter Toplevel README
 
 
-LilyPond is a music typesetter.  It produces beautiful sheet music
-using a high level description file as input.  LilyPond is part of 
-the GNU Project.
+LilyPond  is a music  typesetter.  It  produces beautiful  sheet music
+using  a description  file as  input.   LilyPond  is  part of  the  GNU
+Project.
 
 @section Versioning
 
@@ -41,8 +41,8 @@ lilypond, as @file{lilypond-x.y.z/INSTALL.txt}. They are also
 available on the web at
 @uref{http://lilypond.org/Documentation/topdocs/out-www/INSTALL.html}.
 
-NOTE: If you downloaded a binary (@file{.rpm} or a W95/NT @file{.zip}
-file), you don't have to compile LilyPond.
+NOTE: If you downloaded a binary (@file{.rpm} or use the Cygwin
+@file{setup.exe} program, then you don't have to compile LilyPond.
 
 
 @section Documentation
@@ -58,7 +58,7 @@ website' in the installation instructions.
 
 LilyPond is a long way from finished so we appreciate your criticism,
 comments, bugreports, patches, etc. Please send them to the mailing
-list, @emph{not} to us personally.
+list, not to us personally.
 
 @html
 <a name="mailing-lists">
@@ -92,13 +92,6 @@ If you have bugreports, you should send them to this list.
 You can search the lists from the following page:
 @uref{http://lilypond.org/search, searching facilities}.
 
-@section Windows 32
-
-If you have received this file as part of a DOS/Window32 distribution
-(@file{LilyPond-*.zip}), it is advisable to also download the
-@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,source package}, since it
-might contain more documentation
-
 @section Caveats
 
 If you have installed a previous version, be sure to remove old font

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index 3dce5d09049a3e391f15bfec73354f7eb81fe450..4738a845e968f5a8615b70153aca99598a9f08f4 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -54,7 +54,7 @@ example input files and the files from the Mutopia project.
 # -- not sure what this comment means; it's a relic from the PPC spec file -- mbrown@fensystems.co.uk
 ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
 make
-make local-web
+make web-doc
 
 %install
 

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 4518216fb7680061cb185ce6ae541f48e30d7f98..763d1f0c8a179a965ea9b54ffe225918c17dff25 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -145,5 +145,5 @@ chkfontpath --remove=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %files documentation
 
 %doc web/
-%doc input/
+
 

diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in
index 7fd4c33cd015ba7ea17bff7dc3c1cf6ff210e7af..c5e68f391e2594e853dbe3921c55a3f2e41a2a6f 100644 (file)
--- a/make/lilypond.suse.spec.in
+++ b/make/lilypond.suse.spec.in
@@ -261,7 +261,7 @@ touch var/adm/SuSEconfig/run-texhash
 %files doc
 # this gets too messy...
 
-%doc input/
+
 %doc web/
 # verbatim include of input: list the directory without issuing a %dir