resolve merge

[lilypond.git] / Documentation / topdocs / README.texi

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index 5fd731643cb28e86320aababb0cd5e7df78ddf5c..20a051f983d79a0c86d19e5eac90a962acdcf9bb 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -30,7 +30,7 @@ The primary download site for sourcecode is
 
 For compiling and running LilyPond see the installation instructions.
 These instructions can be found when you unpack lilypond, as
 
 For compiling and running LilyPond see the installation instructions.
 These instructions can be found when you unpack lilypond, as

-@file{lilypond-x.y.z/INSTALL.txt}. They are also available on the web
+@file{lilypond-x.y.z/INSTALL.txt}.  They are also available on the web

 at
 @uref{http://lilypond.org/doc/v2.12/Documentation/topdocs/INSTALL.html}.
 
 at
 @uref{http://lilypond.org/doc/v2.12/Documentation/topdocs/INSTALL.html}.
 


@@ -55,24 +55,24 @@ list, not to us personally.
 We have the following mailing lists:
 
 @itemize @bullet
 We have the following mailing lists:
 
 @itemize @bullet

-@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org}
+@item @uref{http://lists.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org}

 is a low-volume list for information on LilyPond project.
 is a low-volume list for information on LilyPond project.

-    This list is moderated; ask 
+    This list is moderated; ask

     @email{drl@@gnu.org, David R. Linn} or
     @email{hanwen@@xs4all.nl, Han-Wen} to send announcements for this
 list.
 
 @item
     @email{drl@@gnu.org, David R. Linn} or
     @email{hanwen@@xs4all.nl, Han-Wen} to send announcements for this
 list.
 
 @item

-@uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org}
+@uref{http://lists.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org}

   for discussions about developing LilyPond, in particular the unstable series.
 
   for discussions about developing LilyPond, in particular the unstable series.
 

-@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org}
+@item @uref{http://lists.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org}

   for discussions about using LilyPond, in particular the stable series.
 
   for discussions about using LilyPond, in particular the stable series.
 

-@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org}
+@item @uref{http://lists.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org}

 for sending bugreports.
 
 for sending bugreports.
 

-@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-cvs,lilypond-cvs@@gnu.org}
+@item @uref{http://lists.gnu.org/mailman/listinfo/lilypond-cvs,lilypond-cvs@@gnu.org}

  for log files from the
 autobuild.
 @end itemize
  for log files from the
 autobuild.
 @end itemize