Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / contributor / introduction.itexi

diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi
index b15b4291d0727c36a2e00ea935a5479d9b5c2be1..b6530b4ffdcdfa99a3e5fe2520034a58320e71ae 100644 (file)
--- a/Documentation/contributor/introduction.itexi
+++ b/Documentation/contributor/introduction.itexi
@@ -112,8 +112,12 @@ hosted by GNU savannah.
 @uref{http://git.savannah.gnu.org/gitweb/?p=lilypond.git}
 @end example
 
+@item @strong{environment variables}:
+many maintenance scripts, and many instructions in this guide rely on
+predefined @ref{Environment variables}.
+
 @item @strong{mailing lists}:
-given on @rweb{Contacts}.
+given on @rweb{Contact}.
 
 @item @strong{branches}:
 
@@ -124,7 +128,7 @@ base your work from this, but do @strong{not push} to it.
 @item @code{staging}:
 after a successful review (see below), push here.
 
-@item @code{lilypond/translation}:
+@item @code{translation}:
 translators should base their work from this, and also push to it.
 
 @item @code{dev/foo}:
@@ -183,7 +187,7 @@ who will push it for you.
 @end enumerate
 
 @advanced{Yes, this process means that most patches wait between
-60-120 hours before reaching master.  This is unfortunate, but
+60-120 hours before reaching @code{master}.  This is unfortunate, but
 given our limited resources for reviewing patches and a history of
 unintended breakage in @code{master}, this is the best compromise
 we have found.}