From 3e582e04da236af19655c537663358c05db4ba2d Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 4 Jan 2010 02:10:50 +0100
Subject: [PATCH 1/1] Web: rename web/examples to web/ly-examples

On websites with automatic content negotiation, this avoids the name
clash of this directory with the page web/examples[.html|.LANG.html].
---
 Documentation/GNUmakefile                              | 10 +++++-----
 Documentation/contributor/website-work.itexi           |  2 +-
 Documentation/es/macros.itexi                          |  4 ++--
 Documentation/fr/macros.itexi                          |  4 ++--
 Documentation/hu/macros.itexi                          |  4 ++--
 Documentation/macros.itexi                             |  8 ++++----
 Documentation/web/GNUmakefile                          |  2 +-
 .../web/{examples => ly-examples}/GNUmakefile          |  0
 .../web/{examples => ly-examples}/ancient-headword.ly  |  0
 .../web/{examples => ly-examples}/aucun-snippet.ly     |  0
 .../web/{examples => ly-examples}/bach-bwv610.ly       |  0
 .../web/{examples => ly-examples}/bach-schenker.ly     |  0
 .../web/{examples => ly-examples}/cary-layout.ily      |  0
 Documentation/web/{examples => ly-examples}/cary.ly    |  0
 Documentation/web/{examples => ly-examples}/chart.ly   |  0
 .../web/{examples => ly-examples}/example-header.ily   |  0
 .../web/{examples => ly-examples}/granados.ly          |  0
 .../web/{examples => ly-examples}/orchestra.ly         |  0
 .../web/{examples => ly-examples}/sesto-full.ly        |  0
 .../web/{examples => ly-examples}/sesto-piano.ly       |  0
 .../web/{examples => ly-examples}/sesto-violin.ly      |  0
 Documentation/web/{examples => ly-examples}/sesto.ily  |  0
 .../web/{examples => ly-examples}/tab-example.ly       |  0
 Documentation/web/{examples => ly-examples}/theory.ly  |  0
 24 files changed, 17 insertions(+), 17 deletions(-)
 rename Documentation/web/{examples => ly-examples}/GNUmakefile (100%)
 rename Documentation/web/{examples => ly-examples}/ancient-headword.ly (100%)
 rename Documentation/web/{examples => ly-examples}/aucun-snippet.ly (100%)
 rename Documentation/web/{examples => ly-examples}/bach-bwv610.ly (100%)
 rename Documentation/web/{examples => ly-examples}/bach-schenker.ly (100%)
 rename Documentation/web/{examples => ly-examples}/cary-layout.ily (100%)
 rename Documentation/web/{examples => ly-examples}/cary.ly (100%)
 rename Documentation/web/{examples => ly-examples}/chart.ly (100%)
 rename Documentation/web/{examples => ly-examples}/example-header.ily (100%)
 rename Documentation/web/{examples => ly-examples}/granados.ly (100%)
 rename Documentation/web/{examples => ly-examples}/orchestra.ly (100%)
 rename Documentation/web/{examples => ly-examples}/sesto-full.ly (100%)
 rename Documentation/web/{examples => ly-examples}/sesto-piano.ly (100%)
 rename Documentation/web/{examples => ly-examples}/sesto-violin.ly (100%)
 rename Documentation/web/{examples => ly-examples}/sesto.ily (100%)
 rename Documentation/web/{examples => ly-examples}/tab-example.ly (100%)
 rename Documentation/web/{examples => ly-examples}/theory.ly (100%)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 88700e1531..5916e83bf3 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -32,7 +32,7 @@ README_TOP_FILES= DEDICATION THANKS
 IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
 SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
 
-EXTRA_DIST_FILES = $(call src-wildcard,*.init) search-box.html
+EXTRA_DIST_FILES = $(call src-wildcard,*.init) search-box.ihtml
 
 ### Out files
 
@@ -168,11 +168,11 @@ $(outdir)/pictures:
 	$(MAKE) -C pictures WWW-1
 	ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/examples
+$(outdir)/web.texi: $(outdir)/ly-examples
 
-$(outdir)/examples:
-	$(MAKE) -C web/examples
-	ln -sf ../web/examples/$(outdir) $@
+$(outdir)/ly-examples:
+	$(MAKE) -C web/ly-examples
+	ln -sf ../web/ly-examples/$(outdir) $@
 endif
 
 # Ugh, using '%' twice not possible
diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi
index c6eb6f6e1c..a6cbbe5e9e 100644
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -63,7 +63,7 @@ scripts/build/extract_texi_filenames.py
 
 To reduce the CPU burden on the shared host (as well as some
 security concerns), the @file{Documentation/pictures/} and
-@file{Documentation/web/examples/} directories are @strong{not}
+@file{Documentation/web/ly-examples/} directories are @strong{not}
 compiled.  If you modify any files in those directories, a user in
 the @code{lilypond} group must upload them to @file{~graham/media}
 on the host.  This is done by running (locally) @code{make doc},
diff --git a/Documentation/es/macros.itexi b/Documentation/es/macros.itexi
index 6557213e25..eb8e0f7051 100644
--- a/Documentation/es/macros.itexi
+++ b/Documentation/es/macros.itexi
@@ -718,8 +718,8 @@ Para la versión de LilyPond @version{}
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (pulse para ver una imagen más grande)
diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index 645023849e..c1b1fb0e98 100644
--- a/Documentation/fr/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -635,8 +635,8 @@ vous reporter à la documentation correspondante en anglais.
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (cliquez pour agrandir)
diff --git a/Documentation/hu/macros.itexi b/Documentation/hu/macros.itexi
index 13c0ac325b..d066065d0f 100644
--- a/Documentation/hu/macros.itexi
+++ b/Documentation/hu/macros.itexi
@@ -697,8 +697,8 @@ A LilyPond @version{} verziójához
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (Kattints a képre a nagyításhoz)
diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index a87b213ef8..d64c05cd01 100644
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -700,8 +700,8 @@ For LilyPond version @version{}
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (click to enlarge)
@@ -709,10 +709,10 @@ For LilyPond version @version{}
 </div>
 @end html
 @iftex
-@image{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
+@image{ly-examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
 @end iftex
 @ifinfo
-@image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@image{lilypond/ly-examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
 @end ifinfo
 @end macro
 
diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile
index 985bf0c5c8..18c3867b8d 100644
--- a/Documentation/web/GNUmakefile
+++ b/Documentation/web/GNUmakefile
@@ -1,4 +1,4 @@
 depth = ../..
 LOCALSTEPMAKE_TEMPLATES = ly
-SUBDIRS = examples
+SUBDIRS = ly-examples
 include $(depth)/make/stepmake.make
diff --git a/Documentation/web/examples/GNUmakefile b/Documentation/web/ly-examples/GNUmakefile
similarity index 100%
rename from Documentation/web/examples/GNUmakefile
rename to Documentation/web/ly-examples/GNUmakefile
diff --git a/Documentation/web/examples/ancient-headword.ly b/Documentation/web/ly-examples/ancient-headword.ly
similarity index 100%
rename from Documentation/web/examples/ancient-headword.ly
rename to Documentation/web/ly-examples/ancient-headword.ly
diff --git a/Documentation/web/examples/aucun-snippet.ly b/Documentation/web/ly-examples/aucun-snippet.ly
similarity index 100%
rename from Documentation/web/examples/aucun-snippet.ly
rename to Documentation/web/ly-examples/aucun-snippet.ly
diff --git a/Documentation/web/examples/bach-bwv610.ly b/Documentation/web/ly-examples/bach-bwv610.ly
similarity index 100%
rename from Documentation/web/examples/bach-bwv610.ly
rename to Documentation/web/ly-examples/bach-bwv610.ly
diff --git a/Documentation/web/examples/bach-schenker.ly b/Documentation/web/ly-examples/bach-schenker.ly
similarity index 100%
rename from Documentation/web/examples/bach-schenker.ly
rename to Documentation/web/ly-examples/bach-schenker.ly
diff --git a/Documentation/web/examples/cary-layout.ily b/Documentation/web/ly-examples/cary-layout.ily
similarity index 100%
rename from Documentation/web/examples/cary-layout.ily
rename to Documentation/web/ly-examples/cary-layout.ily
diff --git a/Documentation/web/examples/cary.ly b/Documentation/web/ly-examples/cary.ly
similarity index 100%
rename from Documentation/web/examples/cary.ly
rename to Documentation/web/ly-examples/cary.ly
diff --git a/Documentation/web/examples/chart.ly b/Documentation/web/ly-examples/chart.ly
similarity index 100%
rename from Documentation/web/examples/chart.ly
rename to Documentation/web/ly-examples/chart.ly
diff --git a/Documentation/web/examples/example-header.ily b/Documentation/web/ly-examples/example-header.ily
similarity index 100%
rename from Documentation/web/examples/example-header.ily
rename to Documentation/web/ly-examples/example-header.ily
diff --git a/Documentation/web/examples/granados.ly b/Documentation/web/ly-examples/granados.ly
similarity index 100%
rename from Documentation/web/examples/granados.ly
rename to Documentation/web/ly-examples/granados.ly
diff --git a/Documentation/web/examples/orchestra.ly b/Documentation/web/ly-examples/orchestra.ly
similarity index 100%
rename from Documentation/web/examples/orchestra.ly
rename to Documentation/web/ly-examples/orchestra.ly
diff --git a/Documentation/web/examples/sesto-full.ly b/Documentation/web/ly-examples/sesto-full.ly
similarity index 100%
rename from Documentation/web/examples/sesto-full.ly
rename to Documentation/web/ly-examples/sesto-full.ly
diff --git a/Documentation/web/examples/sesto-piano.ly b/Documentation/web/ly-examples/sesto-piano.ly
similarity index 100%
rename from Documentation/web/examples/sesto-piano.ly
rename to Documentation/web/ly-examples/sesto-piano.ly
diff --git a/Documentation/web/examples/sesto-violin.ly b/Documentation/web/ly-examples/sesto-violin.ly
similarity index 100%
rename from Documentation/web/examples/sesto-violin.ly
rename to Documentation/web/ly-examples/sesto-violin.ly
diff --git a/Documentation/web/examples/sesto.ily b/Documentation/web/ly-examples/sesto.ily
similarity index 100%
rename from Documentation/web/examples/sesto.ily
rename to Documentation/web/ly-examples/sesto.ily
diff --git a/Documentation/web/examples/tab-example.ly b/Documentation/web/ly-examples/tab-example.ly
similarity index 100%
rename from Documentation/web/examples/tab-example.ly
rename to Documentation/web/ly-examples/tab-example.ly
diff --git a/Documentation/web/examples/theory.ly b/Documentation/web/ly-examples/theory.ly
similarity index 100%
rename from Documentation/web/examples/theory.ly
rename to Documentation/web/ly-examples/theory.ly
-- 
2.39.2