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

[lilypond.git] / Documentation / fr / user / macros.itexi

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 52c0c0d89438a31d3352f5d72a774bf131487d58..9fd2bcce9c1d9f592b746f6cc246eb99db83ce54 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -6,6 +6,10 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@macro version
+@value{version}
+@end macro
+
 
 @c   ***** Displaying text *****
 
@@ -173,6 +177,7 @@
 @c WARNING: new @lsr macro in English docs takes 3 arguments
 @c and new @lsrdir takes two arguments
 
+@c obsolete
 @c usage: @lsr{ancient,custodes.ly}
 @macro lsr{DIR,TEXT}
 @ifhtml
@@ -183,6 +188,7 @@
 @end ifnothtml
 @end macro
 
+@c don't update until this macro is correctly set up in English docs
 @macro lsrdir{DIR}
 @ifhtml
 @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
@@ -205,14 +211,6 @@
 @ifhtml
 @c ***** HTML *****
 
-@c makeinfo-4.7 encodes html names, which means that nodes that
-@c contain nonalphanum characters will be broken links on the website.
-@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c
-@c @inforef{} adds ``See'' to the sentence, which is annoying, but
-@c better than a broken link.
-@c @inforef{\TEXT\,,lilypond-internals}@c
-@c using @ref without punctuation is OK without for formats other than info
-
 @ifset bigpage
 
 @macro internalsref{TEXT}