X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fgeneral%2Fmanuals.itexi;h=fea6a680243a5b34b72a65eb5766e4573fdf4793;hb=4748a329986a92b730a50a2234a700ba4c093f09;hp=1b7083eae1d79d2947d4696d9c81b640a391302b;hpb=3e36ccd6da6a9c2f326145e49dbf264114025486;p=lilypond.git

diff --git a/Documentation/general/manuals.itexi b/Documentation/general/manuals.itexi
index 1b7083eae1..fea6a68024 100644
--- a/Documentation/general/manuals.itexi
+++ b/Documentation/general/manuals.itexi
@@ -10,7 +10,7 @@
 @unnumbered Manuals
 
 @divClass{heading-center}
-@heading Documentation for LilyPond 2.12.2
+@heading Documentation for LilyPond @version
 
 @divEnd
 
@@ -442,37 +442,43 @@ GNU info format for documentation.  FIXME, link broken.
 @node FAQ
 @unnumberedsec FAQ
 
-@warning{to be moved into the actual Documentation/ in master. Maybe.}
-
+@divClass{column-center-top}
+@subheading Introductory questions
 
-@subheading Where are the graphical canvas, menus, and toolbars?
+@subsubheading Where are the graphical canvas, menus, and toolbars?
 
 LilyPond requires you to write music as text.  Please read about
 our @ref{Text input}.
 
 
-@subheading There's a lot of documentation!  Do I need to read it?
+@subsubheading There's a lot of documentation!  Do I need to read it?
 
-You need to read the @ref{Learning}.  As for the rest of
-documentation, you only need to read the sections which discuss
-the notation that you wish to create.
+You need to read the @ref{Learning, Learning manual}.  As for the
+rest of documentation, you only need to read the sections which
+discuss the notation that you wish to create.
 
 
-@subheading That's still a lot of reading!  Is it worth it?
+@subsubheading That's still a lot of reading!  Is it worth it?
 
 Please decide for yourself; the reasons why you might want to use
 LilyPond are given in the @ref{Introduction}.
 
+@divEnd
+
+@divClass{column-center-bottom}
+@subheading Usage questions
 
-@subheading Something isn't working!  How do I fix it?
+@subsubheading Something isn't working!  How do I fix it?
 
 This is explained in @@ref@{FIXME LM or AU x.y@}.
 
 
-@subheading Why do you change the syntax?
+@subsubheading Why do you change the syntax?
 
 This is explained in @@ref@{FIXME AU x.y@}.
 
+@divEnd
+
 
 @node Changes
 @unnumberedsec Changes
@@ -490,7 +496,7 @@ LilyPond since the previous stable version.
 
 @itemize
 
-@item FIXME @c @rchangesnamed{Top,Changes}:
+@item @rchangesnamed{Top,Changes}:
 read this manual in the same format as this one.
 
 @end itemize
@@ -502,21 +508,24 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-FIXME change to rchanges.
+@c Changes isn't available as a split manual.
+@c  (maybe it should be, but it isn't so far)
+@c @item @uref{../changes/index.html, Changes (split HTML)}:
+@c the manual is split between many HTML pages.
+@c @emph{(small download for each page)}
 
-@item @uref{../learning/index.html, Learning (split HTML)}:
-the manual is split between many HTML pages.
-@emph{(small download for each page)}
+@c @item @uref{../changes-big-page.html, Changes (big HTML)}:
+@c read this manual as one huge HTML page.
+@c @emph{(large single download, around 10? Mb)}
 
-@item @uref{../learning-big-page.html, Learning (big HTML)}:
-read this manual as one huge HTML page.
-@emph{(large single download, around 10? Mb)}
+@item @uref{../changes.html, Changes}:
+read this manual as a HTML page.
 
-@item @uref{../learning.pdf, learning.pdf}:
+@item @uref{../changes.pdf, changes.pdf}:
 download as a PDF file.
-@emph{(large single download, 2.8 Mb)}
+@emph{(small single download, 0.5 ?? Mb)}
 
-@item @uref{FIXME, learning.info}:
+@item @uref{FIXME, changes.info}:
 GNU info format for documentation.  FIXME, link broken.
 
 @end itemize
@@ -588,7 +597,14 @@ GNU info format for documentation.  FIXME, link broken.
 @node Translated
 @unnumberedsec Translated
 
-blah
+@divClass{column-center-bottom}
+@subheading Translation status
+
+TODO: clean up / prettify
+
+@uref{../translations.html}.
+
+@divEnd
 
 
 @node All