Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / Documentation / user / setup.itely

diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index 0283957fa5fe1ac046d140e49e7897a864f674de..1294cddeaec2bcc9a9d6fd81d6b756f0a0cceddf 100644 (file)
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -36,7 +36,7 @@ operating systems.
 @subsection MacOS X on the command-line
 
 The scripts (such as lilypond-book, convert-ly, abc2ly, and even
-lilypond itself) are included inside MacOS X .app. They can be run from
+lilypond itself) are included inside the .app file for MacOS@tie{}X.  They can be run from
 the command line by invoking them directly, e.g.
 
 @example
@@ -158,7 +158,7 @@ set runtimepath+=/usr/local/share/lilypond/$@{LILYPOND_VERSION@}/vim/
 @end example
 
 @noindent
-where $@{LILYPOND_VERSION@} is your lilypond version.  If Lilypond was not
+where $@{LILYPOND_VERSION@} is your LilyPond version.  If LilyPond was not
 installed in @file{/usr/local/}, then change this path accordingly.
 
 
@@ -178,7 +178,7 @@ installation instructions, visit
 @subsection TexShop
 
 The @uref{http://@/www@/.uoregon@/.edu/~koch/texshop/index@/.html,TexShop}
-editor for Mac OS X can be extended to run LilyPond, lilypond-book and
+editor for MacOS@tie{}X can be extended to run LilyPond, lilypond-book and
 convert-ly from within the editor, using the extensions available at 
 @uref{http://@/www@/.dimi@/.uniud@/.it/vitacolo/freesoftware@/.html}.
 
@@ -206,15 +206,15 @@ in the PDF viewer.  This makes it easier to find input that causes
 some error in the sheet music.
 
 When this functionality is active, LilyPond adds hyperlinks to the PDF
-file. These hyperlinks are sent to the web-browser, which opens a
+file.  These hyperlinks are sent to the web-browser, which opens a
 text-editor with the cursor in the right place.
 
 To make this chain work, you should configure your PDF viewer to
 follow hyperlinks using the @file{lilypond-invoke-editor} script
 supplied with LilyPond.
 
-For Xpdf on Unix, the following should be present in
-@file{xpdfrc}@footnote{On unix, this file is found either in
+For Xpdf on UNIX, the following should be present in
+@file{xpdfrc}@footnote{On UNIX, this file is found either in
 @file{/etc/xpdfrc} or as @file{.xpdfrc} in your home directory.}
 
 @example
@@ -222,7 +222,7 @@ urlCommand     "lilypond-invoke-editor %s"
 @end example
 
 The program @file{lilypond-invoke-editor} is a small helper
-program. It will invoke an editor for the special @code{textedit}
+program.  It will invoke an editor for the special @code{textedit}
 URIs, and run a web browser for others.  It tests the environment
 variable @code{EDITOR} for the following patterns,
 
@@ -245,10 +245,10 @@ this will invoke
 @end example
 @end table
 
-The environment variable @code{LYEDITOR} is used to override this. It
+The environment variable @code{LYEDITOR} is used to override this.  It
 contains the command line to start the editor, where @code{%(file)s},
 @code{%(column)s}, @code{%(line)s} is replaced with the file, column
-and line respectively. The  setting
+and line respectively.  The  setting
 
 @example
 emacsclient --no-wait +%(line)s:%(column)s %(file)s
@@ -261,7 +261,7 @@ invocation.
 
 @cindex file size, output
 
-The point and click links enlarge the output files significantly. For
+The point and click links enlarge the output files significantly.  For
 reducing the size of PDF and PS files, point and click may be switched
 off by issuing