From dd9481f44a4d73ae5c9cb2b2d0fcd7ac4a35d693 Mon Sep 17 00:00:00 2001
From: Mark Polesky <markpolesky@yahoo.com>
Date: Tue, 7 Dec 2010 19:57:46 -0800
Subject: [PATCH] Run update-with-convert-ly.sh.

---
 Documentation/de/learning/fundamental.itely   |  6 ++---
 .../de/notation/changing-defaults.itely       | 12 ++++-----
 Documentation/de/notation/spacing.itely       | 26 +++++++++----------
 .../es/notation/changing-defaults.itely       | 12 ++++-----
 Documentation/es/notation/spacing.itely       | 26 +++++++++----------
 Documentation/fr/notation/spacing.itely       | 26 +++++++++----------
 .../notation/changing-defaults.itely          | 12 ++++-----
 Documentation/notation/spacing.itely          | 26 +++++++++----------
 .../adjusting-lyrics-vertical-spacing.ly      |  4 +--
 .../new/adjusting-lyrics-vertical-spacing.ly  |  4 +--
 10 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely
index ddff36f77c..88e3abbd4a 100644
--- a/Documentation/de/learning/fundamental.itely
+++ b/Documentation/de/learning/fundamental.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 @c Translators: Till Paala, Reinhold Kainhofer
 
 @node Grundbegriffe
@@ -3124,7 +3124,7 @@ sind.
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with @{
         \override VerticalAxisGroup
-          #'staff-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((basic-distance . 9)
                                      (minimum-distance . 8)
                                      (padding . 1)
                                      (stretchability . 5))
@@ -3193,7 +3193,7 @@ PedalOrganMusic = \relative c {
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with {
         \override VerticalAxisGroup
-          #'staff-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((basic-distance . 9)
                                      (minimum-distance . 8)
                                      (padding . 1)
                                      (stretchability . 5))
diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely
index 50796f832f..6217833bde 100644
--- a/Documentation/de/notation/changing-defaults.itely
+++ b/Documentation/de/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.40"
+@c \version "2.13.42"
 
 @c Translators: Till Paala
 
@@ -2097,7 +2097,7 @@ haben zu Beginn Standardwerte, die in der Datei @file{scm/define-grobs.scm}
 
 @example
 (staff-staff-spacing . ((padding . 1)
-                          (space . 9)
+                          (basic-distance . 9)
                           (minimum-distance . 7)))
 @end example
 
@@ -2116,7 +2116,7 @@ Schlüssel zu verändern, wird ein geschachtelter Aufruf benutzt:
 
 % reduced space between staves
 \new PianoStaff \with {
-  \override StaffGrouper #'staff-staff-spacing #'space = #7
+  \override StaffGrouper #'staff-staff-spacing #'basic-distance = #7
 } <<
   \new Staff { \clef treble c''1 }
   \new Staff { \clef bass   c1   }
@@ -2137,7 +2137,7 @@ kann mit einem Aufruf als Aliste vollständig verändert werden:
 \new PianoStaff \with {
   \override StaffGrouper #'staff-staff-spacing =
     #'((padding . 0)
-       (space . 0)
+       (basic-distance . 0)
        (minimum-distance . 0)
        (stretchability . 0))
 } <<
@@ -2156,11 +2156,11 @@ folgende Aufrufe äquivalent:
 
 @example
 \override StaffGrouper #'staff-staff-spacing =
-  #'((space . 7))
+  #'((basic-distance . 7))
 
 \override StaffGrouper #'staff-staff-spacing =
   #'((padding . 0)
-     (space . 7)
+     (basic-distance . 7)
      (minimum-distance . 0)
      (stretchability . 7))
 @end example
diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely
index fa0b1430f9..35e2734832 100644
--- a/Documentation/de/notation/spacing.itely
+++ b/Documentation/de/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @c Translators: Till Paala
 
@@ -284,7 +284,7 @@ wird der Schlüssel innerhalb der @code{\paper}-Umgebung aufgerufen:
 
 @example
 \paper @{
-  system-system-spacing #'space = #10
+  system-system-spacing #'basic-distance = #10
 @}
 @end example
 
@@ -297,7 +297,7 @@ Aliste notiert:
 \paper @{
   system-system-spacing =
     #'((padding . 1)
-       (space . 12)
+       (basic-distance . 12)
        (minimum-distance . 8)
        (stretchability . 12))
 @}
@@ -310,11 +310,11 @@ Darum sind folgende zwei Aufrufe identisch:
 
 @example
 system-system-spacing =
-  #'((space . 10))
+  #'((basic-distance . 10))
 
 system-system-spacing =
   #'((padding . 0)
-     (space . 10)
+     (basic-distance . 10)
      (minimum-distance . 0)
      (stretchability . 10))
 @end example
@@ -1601,20 +1601,20 @@ einen Wert von @code{Abstand - minimum-distance}.
   % between this staff and the next will be determined by padding.
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
-      #'((space . 1) (padding . 1))
+      #'((basic-distance . 1) (padding . 1))
   }
   { \clef bass c, }
   % Since space is small and nothing sticks out very far, the distance
   % between this staff and the next will be determined by minimum-distance.
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
-      #'((space . 1) (minimum-distance . 12))
+      #'((basic-distance . 1) (minimum-distance . 12))
   }
   { \clef bass c, }
   % By setting padding to a negative value, staves can be made to collide.
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
-      #'((space . 4) (padding . -10))
+      #'((basic-distance . 4) (padding . -10))
   }
   { \clef bass c, }
   \new Staff { \clef bass c, }
@@ -1640,9 +1640,9 @@ wird, wird @var{default-staff-staff-spacing} aus der jeweiligen
 #(set-global-staff-size 16)
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1
     \override StaffGrouper #'staff-staff-spacing #'padding = #0
-    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
+    \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20
   }
   <<
     \new Staff c'1
@@ -1650,7 +1650,7 @@ wird, wird @var{default-staff-staff-spacing} aus der jeweiligen
   >>
 
   \new StaffGroup \with {
-    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1
     \override StaffGrouper #'staff-staff-spacing #'padding = #0
   }
   <<
@@ -1723,7 +1723,7 @@ Notensystem zu verlangen.
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30)) }
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((basic-distance . 30)) }
     { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP }
@@ -2968,7 +2968,7 @@ dann so anordnen, dass kein weißer Rand unten auf der Seite entsteht.
 
 @example
 \paper @{
-  system-system-spacing = #'((padding . 0) (space . 0.1))
+  system-system-spacing = #'((padding . 0) (basic-distance . 0.1))
   ragged-last-bottom = ##f
   ragged-bottom = ##f
 @}
diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely
index aec2471f8a..8fb056a5d9 100644
--- a/Documentation/es/notation/changing-defaults.itely
+++ b/Documentation/es/notation/changing-defaults.itely
@@ -8,7 +8,7 @@ Translation of GIT committish: 7ba0a22641cb0c7f5949d66a06d1e2e1fd0b3033
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @node Cambiar los valores por omisión
 @chapter Cambiar los valores por omisión
@@ -2003,7 +2003,7 @@ predeterminados en el inicio; éstos se relacionan en la sección
 @file{scm/define-grobs.scm}:
 
 @example
-'((space . 9) (minimum-distance . 7) (padding . 1))
+'((basic-distance . 9) (minimum-distance . 7) (padding . 1))
 @end example
 
 Una forma de acercar los pentagramas entre sí es reducir el valor de
@@ -2021,7 +2021,7 @@ de forma individual, utilice una @emph{declaración anidada}:
 % reduced space between staves
 \new PianoStaff \with {
   % this is the nested declaration
-  \override StaffGrouper #'staff-staff-spacing #'space = #7
+  \override StaffGrouper #'staff-staff-spacing #'basic-distance = #7
 } <<
   \new Staff { \clef treble c''1 }
   \new Staff { \clef bass   c1   }
@@ -2044,7 +2044,7 @@ completamente la propiedad con una sola declaración, como una lista-A:
 \new PianoStaff \with {
   \override StaffGrouper #'staff-staff-spacing =
     #'((padding . 0)
-       (space . 0)
+       (basic-distance . 0)
        (minimum-distance . 0)
        (stretchability . 0))
 } <<
@@ -2063,11 +2063,11 @@ son equivalentes:
 
 @example
 \override StaffGrouper #'staff-staff-spacing =
-  #'((space . 7))
+  #'((basic-distance . 7))
 
 \override StaffGrouper #'staff-staff-spacing =
   #'((padding . 0)
-     (space . 7)
+     (basic-distance . 7)
      (minimum-distance . 0)
      (stretchability . 7))
 @end example
diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely
index 16f3476d1f..4e466456fd 100644
--- a/Documentation/es/notation/spacing.itely
+++ b/Documentation/es/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @node Problemas de espaciado
 @chapter Problemas de espaciado
@@ -443,10 +443,10 @@ segunda redefine la variable completamente:
 
 @example
 \paper @{
-  system-system-spacing #'space = #8
+  system-system-spacing #'basic-distance = #8
   score-system-spacing =
     #'((padding . 1)
-       (space . 12)
+       (basic-distance . 12)
        (minimum-distance . 6)
        (stretchability . 12))
 @}
@@ -1796,7 +1796,7 @@ En la siguiente imagen, las líneas horizontales indican las posiciones
 de estos puntos de referencia:
 
 @lilypond[quote,noragged-right,line-width=110\mm]
-#(define zero-space '((padding . -inf.0) (space . 0)))
+#(define zero-space '((padding . -inf.0) (basic-distance . 0)))
 
 alignToZero = \with {
   \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #zero-space
@@ -1893,13 +1893,13 @@ forma individual, y la segunda redefine la propiedad completamente:
 
 @example
 \new Staff \with @{
-  \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+  \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
 @} @{ @dots{} @}
 
 \new Staff \with @{
   \override VerticalAxisGroup #'staff-staff-spacing =
     #'((padding . 1)
-       (space . 10)
+       (basic-distance . 10)
        (minimum-distance . 9)
        (stretchability . 10))
 @} @{ @dots{} @}
@@ -1912,7 +1912,7 @@ póngalos dentro del bloque @code{\layout}:
 \layout @{
   \context @{
     \Staff
-    \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+    \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
   @}
 @}
 @end example
@@ -2062,7 +2062,7 @@ agrupadas:
     \Staff
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . 1)
-         (space . 8)
+         (basic-distance . 8)
          (minimum-distance . 7))
   }
 }
@@ -2084,7 +2084,7 @@ agrupadas:
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . -10)
-         (space . 3.5))
+         (basic-distance . 3.5))
   } { \clef bass g2 r | }
   \new Staff { \clef bass g2 r | }
 >>
@@ -2140,13 +2140,13 @@ grob @code{StaffGrouper} al espaciado de las pautas agrupadas:
   \context {
     \Score
     \override StaffGrouper #'staff-staff-spacing #'padding = #0
-    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1
   }
 }
 
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
+    \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20
   } <<
     \new Staff { c'1 }
     \new Staff { c'1 }
@@ -2214,7 +2214,7 @@ la línea de letra es capaz de ampliarse mucho más de lo que es usual:
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30))
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((basic-distance . 30))
   } { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP
@@ -3406,7 +3406,7 @@ parte baja del papel.
 
 @example
 \paper @{
-  system-system-spacing = #'((padding . 0) (space . 0.1))
+  system-system-spacing = #'((padding . 0) (basic-distance . 0.1))
   ragged-last-bottom = ##f
   ragged-bottom = ##f
 @}
diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely
index 874ccc6910..b48495f7e5 100644
--- a/Documentation/fr/notation/spacing.itely
+++ b/Documentation/fr/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 
@@ -514,11 +514,11 @@ deuxième redéfinit complètement la variable.
 
 @example
 \paper @{
-  system-system-spacing #'space = #8
+  system-system-spacing #'basic-distance = #8
 
   score-system-spacing =
     #'((padding . 1)
-       (space . 12)
+       (basic-distance . 12)
        (minimum-distance . 6)
        (stretchability . 12))
 @}
@@ -1925,7 +1925,7 @@ En voici une représentation graphique@tie{}:
 
 @c KEEP LY
 @lilypond[quote,noragged-right,line-width=110\mm]
-#(define zero-space '((padding . -inf.0) (space . 0)))
+#(define zero-space '((padding . -inf.0) (basic-distance . 0)))
 
 alignToZero = \with {
   \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #zero-space
@@ -2023,13 +2023,13 @@ alors que la seconde redéfinit la propriété dans son intégralité.
 
 @example
 \new Staff \with @{
-  \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+  \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
 @} @{ @dots{} @}
 
 \new Staff \with @{
   \override VerticalAxisGroup #'staff-staff-spacing =
     #'((padding . 1)
-       (space . 10)
+       (basic-distance . 10)
        (minimum-distance . 9)
        (stretchability . 10))
 @} @{ @dots{} @}
@@ -2042,7 +2042,7 @@ bloc @code{\layout}@tie{}:
 \layout @{
   \context @{
     \Staff
-    \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+    \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
   @}
 @}
 @end example
@@ -2198,7 +2198,7 @@ isolées à l'aide de la propriété @code{staff-staff-spacing}@tie{}:
     \Staff
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . 1)
-         (space . 8)
+         (basic-distance . 8)
          (minimum-distance . 7))
   }
 }
@@ -2220,7 +2220,7 @@ isolées à l'aide de la propriété @code{staff-staff-spacing}@tie{}:
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . -10)
-         (space . 3.5))
+         (basic-distance . 3.5))
   } { \clef bass g2 r | }
   \new Staff { \clef bass g2 r | }
 >>
@@ -2279,13 +2279,13 @@ regroupes, à l'aide des propriétés de l'objet graphique
   \context {
     \Score
     \override StaffGrouper #'staff-staff-spacing #'padding = #0
-    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1
   }
 }
 
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
+    \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20
   } <<
     \new Staff { c'1 }
     \new Staff { c'1 }
@@ -2354,7 +2354,7 @@ Vous noterez que la valeur élevée attribuée à la clé
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30))
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((basic-distance . 30))
   } { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP
@@ -3549,7 +3549,7 @@ suffisamment pour éviter le blanc en bas de page.
 
 @example
 \paper @{
-  system-system-spacing = #'((padding . 0) (space . 0.1))
+  system-system-spacing = #'((padding . 0) (basic-distance . 0.1))
   ragged-last-bottom = ##f
   ragged-bottom = ##f
 @}
diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index c5bc49731b..4f1aaf2122 100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @node Changing defaults
 @chapter Changing defaults
@@ -2005,7 +2005,7 @@ default values; these are listed in the @qq{Backend} section of
 the Internals Reference (see @rinternals{StaffGrouper}):
 
 @example
-'((space . 9) (minimum-distance . 7) (padding . 1))
+'((basic-distance . 9) (minimum-distance . 7) (padding . 1))
 @end example
 
 One way to bring the staves closer together is by reducing the
@@ -2023,7 +2023,7 @@ individually, use a @emph{nested declaration}:
 % reduced space between staves
 \new PianoStaff \with {
   % this is the nested declaration
-  \override StaffGrouper #'staff-staff-spacing #'space = #7
+  \override StaffGrouper #'staff-staff-spacing #'basic-distance = #7
 } <<
   \new Staff { \clef treble c''1 }
   \new Staff { \clef bass   c1   }
@@ -2044,7 +2044,7 @@ completely re-defined with one declaration, as an alist:
 \new PianoStaff \with {
   \override StaffGrouper #'staff-staff-spacing =
     #'((padding . 0)
-       (space . 0)
+       (basic-distance . 0)
        (minimum-distance . 0)
        (stretchability . 0))
 } <<
@@ -2062,11 +2062,11 @@ are equivalent:
 
 @example
 \override StaffGrouper #'staff-staff-spacing =
-  #'((space . 7))
+  #'((basic-distance . 7))
 
 \override StaffGrouper #'staff-staff-spacing =
   #'((padding . 0)
-     (space . 7)
+     (basic-distance . 7)
      (minimum-distance . 0)
      (stretchability . 7))
 @end example
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 2853b60140..b9aecb3dac 100644
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.39"
+@c \version "2.13.42"
 
 @ignore
 GDP TODO list
@@ -473,10 +473,10 @@ redefines the variable:
 
 @example
 \paper @{
-  system-system-spacing #'space = #8
+  system-system-spacing #'basic-distance = #8
   score-system-spacing =
     #'((padding . 1)
-       (space . 12)
+       (basic-distance . 12)
        (minimum-distance . 6)
        (stretchability . 12))
 @}
@@ -1778,7 +1778,7 @@ In the following image, horizontal lines indicate the positions
 of these reference points:
 
 @lilypond[quote,noragged-right,line-width=110\mm]
-#(define zero-space '((padding . -inf.0) (space . 0)))
+#(define zero-space '((padding . -inf.0) (basic-distance . 0)))
 
 alignToZero = \with {
   \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #zero-space
@@ -1874,13 +1874,13 @@ individually, and the second completely re-defines the property:
 
 @example
 \new Staff \with @{
-  \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+  \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
 @} @{ @dots{} @}
 
 \new Staff \with @{
   \override VerticalAxisGroup #'staff-staff-spacing =
     #'((padding . 1)
-       (space . 10)
+       (basic-distance . 10)
        (minimum-distance . 9)
        (stretchability . 10))
 @} @{ @dots{} @}
@@ -1893,7 +1893,7 @@ To change any spacing settings globally, put them in the
 \layout @{
   \context @{
     \Staff
-    \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
+    \override VerticalAxisGroup #'staff-staff-spacing #'basic-distance = #10
   @}
 @}
 @end example
@@ -2036,7 +2036,7 @@ property can affect the spacing of ungrouped staves:
     \Staff
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . 1)
-         (space . 8)
+         (basic-distance . 8)
          (minimum-distance . 7))
   }
 }
@@ -2058,7 +2058,7 @@ property can affect the spacing of ungrouped staves:
   \new Staff \with {
     \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . -10)
-         (space . 3.5))
+         (basic-distance . 3.5))
   } { \clef bass g2 r | }
   \new Staff { \clef bass g2 r | }
 >>
@@ -2113,13 +2113,13 @@ The following example shows how properties of the
   \context {
     \Score
     \override StaffGrouper #'staff-staff-spacing #'padding = #0
-    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1
   }
 }
 
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
+    \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20
   } <<
     \new Staff { c'1 }
     \new Staff { c'1 }
@@ -2186,7 +2186,7 @@ able to stretch much more than usual:
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30))
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((basic-distance . 30))
   } { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP
@@ -3320,7 +3320,7 @@ there is no blank space at the bottom of the page.
 
 @example
 \paper @{
-  system-system-spacing = #'((padding . 0) (space . 0.1))
+  system-system-spacing = #'((padding . 0) (basic-distance . 0.1))
   ragged-last-bottom = ##f
   ragged-bottom = ##f
 @}
diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index d624f7e928..32fd5e49c5 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.39
-\version "2.13.40"
+\version "2.13.42"
 
 \header {
 %% Translation of GIT committish: 0b3f8eb5000541aacdb027a93db57c199fd8ba04
@@ -50,7 +50,7 @@ This snippet shows how to bring the lyrics line closer to the staff.
     }
   }
   \new Lyrics \with {
-    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((space . 1))
+    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((basic-distance . 1))
   }
   \lyricsto melody { aa aa aa aa aa aa aa aa aa }
 >>
diff --git a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
index bd389cf88b..e31a0aeb16 100644
--- a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
@@ -1,4 +1,4 @@
-\version "2.13.39"
+\version "2.13.42"
 
 \header {
   lsrtags = "text, vocal-music, spacing"
@@ -27,7 +27,7 @@ This snippet shows how to bring the lyrics line closer to the staff.
     }
   }
   \new Lyrics \with {
-    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((space . 1))
+    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((basic-distance . 1))
   }
   \lyricsto melody { aa aa aa aa aa aa aa aa aa }
 >>
-- 
2.39.2