Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / notation / input.itely

diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 163d8c05a0a22e3f49a2ad49b2156b63ab10120a..be06eec60948278450f536c89e7704abe38ec57c 100644 (file)
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -1453,21 +1453,15 @@ Here are a few sample bars of music set in LilyPond's Feta font:
 
 @subsubheading Installation Instructions for MacOS
 
-Download and extract the zip file.  Using @code{Terminal.app}, move
-the @code{lilyfonts} directory to
-@file{@var{INSTALLDIR}/LilyPond.app/Contents/Resources/share/lilypond/current}.
+Download and extract the zip file.  Copy the @code{lilyfonts}
+directory to @file{@var{SHARE_DIR}/lilypond/current}; for more
+information, see @rlearning{Other sources of information}.
 Move the existing @code{fonts} directory to @code{fonts_orig} and
 move the @code{lilyfonts} directory to @code{fonts}.  Simply move
 @code{fonts_orig} back to @code{fonts} to revert back to Feta.
 
-@subsubheading Installation Instructions for Windows
-
-Download and extract the zip file.  Using Explorer, copy the @code{lilyfonts}
-directory to
-@file{@var{INSTALLDIR}/LilyPond/usr/share/lilypond/current}. Rename
-the existing @code{fonts} directory to @code{fonts_orig} and
-rename the @code{lilyfonts} directory to @code{fonts}.  Simply rename
-@code{fonts_orig} back to @code{fonts} to revert back to Feta.
+@seealso
+Learning Manual: @rlearning{Other sources of information}.
 
 @knownissues
 
@@ -1522,7 +1516,7 @@ To create a MIDI output file from a LilyPond input file, add a
 
 If there is a @code{\midi} block in a @code{\score} with no
 @code{\layout} block, only MIDI output will be produced.  When
-notation is needed too, a @code{\layout} block must be also be
+notation is needed too, a @code{\layout} block must also be
 present.
 
 @example