From: John Mandereau <john.mandereau@gmail.com>
Date: Thu, 20 Aug 2009 09:56:59 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: release/2.13.4-1~180
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=1efdabf3b2349ea7fa3183dca5bba5104c347c36

Merge commit 'origin/master'

Conflicts:
	Documentation/ja/learning/introduction.itely
---

1efdabf3b2349ea7fa3183dca5bba5104c347c36
diff --cc Documentation/ja/learning/introduction.itely
index 8be381a9b4,acaa58940f..e9efeed4da
--- a/Documentation/ja/learning/introduction.itely
+++ b/Documentation/ja/learning/introduction.itely
@@@ -7,27 -7,8 +7,27 @@@
      version that you are working on.  See TRANSLATION for details.
  @end ignore
  
- @c \version "2.12.0"
+ @c \version "2.13.4"
  
 +@ignore
 +Tutorial guidelines:  (different from policy.txt!)
 +- unless you have a really good reason, use either
 +    @lilypond[verbatim,quote]
 +  or
 +    @lilypond[verbatim,quote,relative=2]
 +
 +  Don't use any other relative=X commands.
 +
 +- use "aes" and "ees" instead of "as" and "es".  I know it's not
 +  correct Dutch naming, but let's not confuse people with this
 +  until we get to the Basic notation chapter.
 +
 +- Add "Music Glossary: @rglos{foo}" to the *top* of the relevant
 +  portions of the tutorial.
 +
 +@end ignore
 +
 +
  @c Translators: Yoshiki Sawada
  @c Translation status: post-GDP