Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / user / programming-interface.itely

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 1a657b60d6609575c7486e7f34c931c803f8ae7a..2783c79a6a1956b7f478b1d51cbc32f33bf80f07 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -251,7 +251,7 @@ noPointAndClick =
 @subsection Functions without arguments
 
 In most cases a function without arguments should be written
-with an identifier,
+with an variable,
 
 @example
 dolce = \markup@{ \italic \bold dolce @}
@@ -391,7 +391,7 @@ define some Scheme code in a macro (to be called later), use
 
 @refbugs
 
-Mixing Scheme and LilyPond identifiers is not possible with the
+Mixing Scheme and LilyPond variables is not possible with the
 @code{--safe} option.
 
 
@@ -404,12 +404,12 @@ it takes up time.  Time is a rational number that measures the length
 of a piece of music in whole notes.
 
 A music object has three kinds of types:
-@itemize @bullet
+@itemize
 @item
 music name: Each music expression has a name.  For example, a note
 leads to a @internalsref{NoteEvent}, and @code{\simultaneous} leads to
 a @internalsref{SimultaneousMusic}.  A list of all expressions
-available is in the Program reference manual, under
+available is in the Internals Reference manual, under
 @internalsref{Music expressions}.
 
 @item
@@ -417,7 +417,7 @@ available is in the Program reference manual, under
 interfaces, for example, a note is an @code{event}, but it is also a
 @code{note-event}, a @code{rhythmic-event}, and a
 @code{melodic-event}.  All classes of music are listed in the
-Program reference, under
+Internals Reference, under
 @internalsref{Music classes}.
 
 @item
@@ -589,7 +589,7 @@ d'
 @subsection Doubling a note with slurs (example)
 
 Suppose we want to create a function which translates
-input like @samp{a} into @samp{a( a)}.  We begin
+input like @code{a} into @code{a( a)}.  We begin
 by examining the internal representation of the music
 we want to end up with.
 
@@ -1219,7 +1219,7 @@ where @var{proc} is a Scheme function, taking three arguments.
 When interpreted, the function @var{proc} is called for every layout
 object found in the context @var{context}, with the following
 arguments:
-@itemize @bullet
+@itemize
 @item the layout object itself,
 @item the context where the layout object was created, and
 @item the context where @code{\applyOutput} is processed.