Run convert-ly on docs.

diff --git a/Documentation/user/README.txt b/Documentation/user/README.txt
index b10f6607f18e4cec3c50951fd8fba5ac048405a9..a0715b57dd957d8e0a3829dbb1f2d3d2e3cc4a77 100644 (file)
--- a/Documentation/user/README.txt
+++ b/Documentation/user/README.txt
@@ -1,7 +1,7 @@
 Info for Documentation
 ----------------------
 
-Current version of the manual: 2.11.10 ?
+Current version of the manual: 2.11.15
 *** Please update this whenever you run convert-ly on the docs.
 
 convert-ly --from=... --to=... --no-version *.itely

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 4c19a55f27ae8a90d05001dfdfd0a4b2f5d352c6..06ac1b5580f52f2a41656638561204d54c74660c 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2260,9 +2260,10 @@ For more information about @code{make-moment}, see
 @ref{Time administration}.
 
 Line breaks are normally forbidden when beams cross bar lines.  This
-behavior can be changed by setting @code{allowBeamBreak}.
+behavior can be changed by setting @code{breakable}.
+
+@funindex breakable
 
-@funindex allowBeamBreak
 @cindex beams and line breaks
 @cindex beams, kneed
 @cindex kneed beams

diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely
index f167c6cb2248b80d291d730529a0442d51d3dc28..7569c5a71cc5f5d73438375d56ef5a5292da26cd 100644 (file)
--- a/Documentation/user/non-music.itely
+++ b/Documentation/user/non-music.itely
@@ -49,7 +49,7 @@ these files end with @samp{.ly}.
 A basic example of a lilypond input file is
 
 @example
-\version "2.9.13"
+\version "2.11.15"
 \score @{
   @{ @}     % this is a single music expression;
             % all the music goes in here.

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index 1dd8222330d718ae29cb41d2a95ca9a61d8fdc43..e1e2b0b2b118f30020c10bc864e4c881278e6d0b 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -35,7 +35,7 @@ cello.  In this case, we would start with @q{Notes and lyrics} (for the
 soprano part).
 
 @example
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -64,7 +64,7 @@ text = \lyricmode @{
 Now we want to add a cello part.  Let's look at the @q{Notes only} example:
 
 @example
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -100,7 +100,7 @@ normally use bass clef.  We'll also give the cello some different
 notes.
 
 @example
-\version "2.9.13"
+\version "2.11.15"
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -170,7 +170,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index c223bd1fcd25e55e1b03ffde8f4ef9ec32f504ab..a1934a90c6d3ad5be63f05f9c964bfcaf6865f4a 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -118,7 +118,7 @@ The default layout responds to the following settings in the
 @item first-page-number
 The value of the page number of the first page.  Default is@tie{}1.
 
-@funindex printfirst-page-number
+@funindex print-first-page-number
 @item print-first-page-number
 If set to true, will print the page number in the first page.  Default is
 false.

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index 51c27f4f573c702492c11ef2d807cd6f39324ffd..bcdfadcd16d542c68d0b868517150f4bcb5474cc 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -35,7 +35,7 @@ instrument or a melodic fragment.  Cut and paste this into a file,
 add notes, and you're finished!
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -60,7 +60,7 @@ automatic beaming, you'll have to change or comment out the relevant
 line.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -91,7 +91,7 @@ text = \lyricmode {
 Want to prepare a lead sheet with a melody and chords?  Look no further!
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -124,7 +124,7 @@ harmonies = \chordmode {
 This template allows you to prepare a song with melody, words, and chords.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -165,7 +165,7 @@ harmonies = \chordmode {
 Here is a simple piano staff.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -199,7 +199,7 @@ Here is a typical song format: one staff with the melody and lyrics, with
 piano accompaniment underneath.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 melody = \relative c'' {
    \clef treble
    \key c \major
@@ -255,7 +255,7 @@ Instead of having a full staff for the melody and lyrics, you can place
 the lyrics between the piano staff (and omit the separate melody staff).
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -302,7 +302,7 @@ since the template is right here, you don't have to do the
 tweaking yourself.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 upper = \relative c'' {
   \clef treble
   \key c \major
@@ -398,7 +398,7 @@ This template demonstrates a string quartet.  It also uses a @code{\global}
 section for time and key signatures.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 
 global= {
   \time 4/4
@@ -458,7 +458,7 @@ contains all the music definitions.  The other files -- @code{score.ly},
 
 @verbatim
 %%%%% piece.ly
-\version "2.9.13"
+\version "2.11.15"
 
 global= {
   \time 4/4
@@ -504,7 +504,7 @@ music = {
 
 
 %%%%% score.ly
-\version "2.9.13"
+\version "2.11.15"
 \include "piece.ly"
 #(set-global-staff-size 14)
 \score {
@@ -515,7 +515,7 @@ music = {
 
 
 %%%%% vn1.ly
-\version "2.9.13"
+\version "2.11.15"
 \include "piece.ly"
 \score {
   \keepWithTag #'vn1 \music
@@ -524,7 +524,7 @@ music = {
 
 
 %%%%% vn2.ly
-\version "2.9.13"
+\version "2.11.15"
 \include "piece.ly"
 \score {
   \keepWithTag #'vn2 \music
@@ -533,7 +533,7 @@ music = {
 
 
 %%%%% vla.ly
-\version "2.9.13"
+\version "2.11.15"
 \include "piece.ly"
 \score {
   \keepWithTag #'vla \music
@@ -542,7 +542,7 @@ music = {
 
 
 %%%%% vlc.ly
-\version "2.9.13"
+\version "2.11.15"
 \include "piece.ly"
 \score {
   \keepWithTag #'vlc \music
@@ -562,7 +562,7 @@ parts.  For example, the time signature and key signatures are almost
 always the same for all parts.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 global = {
    \key c \major
    \time 4/4
@@ -643,7 +643,7 @@ to the vocal notes (say, tenorMusic), then the changes will also
 apply to the piano reduction.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.9.13"
+\version "2.11.15"
 global = {
    \key c \major
    \time 4/4
@@ -736,7 +736,7 @@ Here all the lyrics lines are placed using @code{alignAboveContext}
 and @code{alignBelowContext}.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.10.0"
+\version "2.11.15"
 global = {
   \key c \major
   \time 4/4
@@ -860,7 +860,7 @@ notes.  As a compromise, bar lines are often printed between the
 staves rather than on the staves.
 
 @lilypond[quote,verbatim,line-width=11.0\cm]
-\version "2.9.13"
+\version "2.11.15"
 
 global = {
   \set Score.skipBars = ##t
@@ -1100,7 +1100,7 @@ quarter noteheads, and special marks, indicating rests of different length.
 
 @lilypond[quote,verbatim,ragged-right]
 \include "gregorian-init.ly"
-\version "2.9.13"
+\version "2.11.15"
 
 chant = \relative c' {
   \set Score.timing = ##f
@@ -1160,7 +1160,7 @@ is within a @code{\transpose} section.
 @c The `line-width' argument is for the \header.
 
 @lilypond[quote,verbatim,ragged-right,line-width]
-\version "2.9.13"
+\version "2.11.15"
 \header {
   title = "Song"
   subtitle = "(tune)"
@@ -1436,7 +1436,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `line-width' is for \header.
 @li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.9.13"
+\version "2.11.15"
 \header {
   dedication = "dedication"
   title = "Title"

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 93a5db0ec07e7ad0f2f4dd1cc744196e8341067f..b9dbf6853ba2f40b2dd4d670bbe7643ad802c590 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1294,7 +1294,7 @@ The @code{\version} statement marks for which version of LilyPond the file
 was written.  To mark a file for version 2.10.1, place
 
 @example
-\version "2.10.1"
+\version "2.11.15"
 @end example
 
 @noindent
@@ -1315,7 +1315,7 @@ music expression; the @code{\header} block is usually placed underneath
 the @ref{Version number}.
 
 @example
-\version "2.10.1"
+\version "2.11.15"
 \header @{
   title = "Symphony"
   composer = "Me"

diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely
index abdfdda5f6b4136f31e96fe016fe89e234deadef..9a3809d5c0a4cfa93c68df2d44409be783f329e0 100644 (file)
--- a/Documentation/user/working.itely
+++ b/Documentation/user/working.itely
@@ -70,7 +70,7 @@ problems:
 
 @itemize @bullet
 @item @strong{Include @code{\version} numbers in every file}.  Note that all
-templates contain a @code{\version "2.9.13"} string.  We
+templates contain a @code{\version "2.11.15"} string.  We
 highly recommend that you always include the @code{\version}, no matter
 how small your file is.  Speaking from personal experience, it's
 quite frustrating to try to remember which version of LilyPond you were
@@ -537,7 +537,7 @@ file with @code{\include "../global.ly"}, which contains
 
 @example
 %%%   global.ly
-\version "2.9.13"
+\version "2.11.15"
 #(ly:set-option 'point-and-click #f)
 \include "../init/init-defs.ly"
 \include "../init/init-layout.ly"