[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Issue 3191 - Fix relative links
|
From: |
Felix Janda |
|
Subject: |
Issue 3191 - Fix relative links |
|
Date: |
Fri, 22 Feb 2013 20:48:13 +0100 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
To solve this issue I think the following steps suffice:
1. Replace links like http://lilypond.org/website/manuals.html by
http://lilypond.org/manuals.html. See the patch below. Then nobody should
need to know that http://lilypond/website exists (including search
engines).
2. Modify the root .htaccess to 301 redirect all traffic from
http://lilypond.org/website to the corresponding url without /website.
3. Make the depth variable in scripts/build/create-weblinks-itexi.py
dependent on whether the Docs are being built for local enjoyment or for
the server. That's probably not trivial with the current build system.
The first step is actually not strictly necessary but IMO better for
consistency.
What do you think?
Felix
-- >8 --
Subject: [PATCH] Shorten http://lilypond.org/website/* links
Currently, most informational pages on http://lilypond.org reside in the
/website directory. Using Apaches mod_rewrite these pages can be also
reached when omitting /website. This makes the links more search engine
friendly.
This commit makes omitting /website default for absolute links.
---
Documentation/common-macros.itexi | 2 +-
Documentation/contributor/issues.itexi | 6 +++---
Documentation/contributor/lsr-work.itexi | 4 ++--
Documentation/contributor/programming-work.itexi | 2 +-
Documentation/cs/web/introduction.itexi | 2 +-
Documentation/de/web/introduction.itexi | 2 +-
Documentation/es/web/introduction.itexi | 2 +-
Documentation/fr/web/introduction.itexi | 2 +-
Documentation/hu/web/community.itexi | 8 ++++----
Documentation/it/web/introduction.itexi | 2 +-
Documentation/ja/web/introduction.itexi | 2 +-
Documentation/nl/web/introduction.itexi | 2 +-
Documentation/web/introduction.itexi | 2 +-
Documentation/web/we-wrote.bib | 10 +++++-----
Documentation/zh/web/introduction.itexi | 2 +-
python/auxiliar/postprocess_html.py | 2 +-
scripts/build/website_post.py | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Documentation/common-macros.itexi
b/Documentation/common-macros.itexi
index f3dac48..d8ae422 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -196,7 +196,7 @@ UNTRANSLATED NODE: IGNORE ME
@end ifset
@macro miscLink{MISC-FILE,MISC-TEXT}
address@hidden://lilypond.org/website/misc/\MISC-FILE\,\MISC-TEXT\}
address@hidden://lilypond.org/misc/\MISC-FILE\,\MISC-TEXT\}
@end macro
@macro spanClass {CLASS}
diff --git a/Documentation/contributor/issues.itexi
b/Documentation/contributor/issues.itexi
index c9d19f5..75409f8 100644
--- a/Documentation/contributor/issues.itexi
+++ b/Documentation/contributor/issues.itexi
@@ -236,7 +236,7 @@ this response:
@example
For questions about how to use LilyPond, please read our
documentation available from:
- @uref{http://lilypond.org/website/manuals.html}
+ @uref{http://lilypond.org/manuals.html}
or ask the lilypond-user mailing list.
@end example
@@ -253,7 +253,7 @@ user to resubmit the report with this response:
I'm sorry, but due to our limited resources for handling bugs, we
can only accept reports in the form of Tiny examples. Please see
step 2 in our bug reporting guidelines:
- @uref{http://lilypond.org/website/bug-reports.html}
+ @uref{http://lilypond.org/bug-reports.html}
@end example
@item
@@ -276,7 +276,7 @@ documentation about this topic. If you think that it
really is a
mistake, please explain in more detail. If you think that the
docs are unclear, please suggest an improvement as described by
@qq{Simple tasks -- Documentation} on:
- @uref{http://lilypond.org/website/help-us.html}
+ @uref{http://lilypond.org/help-us.html}
@end example
@item
diff --git a/Documentation/contributor/lsr-work.itexi
b/Documentation/contributor/lsr-work.itexi
index 6e134ea..9622715 100644
--- a/Documentation/contributor/lsr-work.itexi
+++ b/Documentation/contributor/lsr-work.itexi
@@ -168,7 +168,7 @@ all the development code. For further information on
setting this
up see, @ref{Working with source code}. An alternative to setting
up a Git repository for people wanting to do LSR work is to get
the source code from
address@hidden://lilypond.org/website/development.html}.
address@hidden://lilypond.org/development.html}.
@subheading Importing the LSR to Git
@@ -421,7 +421,7 @@ you only choose snippets which are already present in the
LSR,
since the LSR software isn't able to create new snippets this way.
If you don't have a Git repository for LilyPond, you'll find these
snippets in the source-tarball on
address@hidden://lilypond.org/website/development.html}.
address@hidden://lilypond.org/development.html}.
Don't rename any files at this stage.
@item
diff --git a/Documentation/contributor/programming-work.itexi
b/Documentation/contributor/programming-work.itexi
index 819534b..43ecddc 100644
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -29,7 +29,7 @@ number of stages. This process, along with the types of
routines that
accomplish the various stages of the process, is described in this section. A
more complete description of the LilyPond architecture and internal program
execution is found in Erik Sandberg's
address@hidden://lilypond.org/website/pdf/thesis-erik-sandberg.pdf, master's
address@hidden://lilypond.org/pdf/thesis-erik-sandberg.pdf, master's
thesis}.
The first stage of LilyPond processing is @emph{parsing}. In the parsing
diff --git a/Documentation/cs/web/introduction.itexi
b/Documentation/cs/web/introduction.itexi
index 6558eca..ca4d69a 100644
--- a/Documentation/cs/web/introduction.itexi
+++ b/Documentation/cs/web/introduction.itexi
@@ -687,7 +687,7 @@ Francouzský článek o LilyPondu ve verzi 2.6 se objevuje na
Vydavatelé holandského časopisu Computer!Totaal,
který se věnuje počítačům,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
popisují LilyPond} ve vydání z října 2004 jako: @qq{báječný
svobodný (Open Source) program [...] Noty vytvořené LilyPondem
jsou bez výjimky nádherné [...] Jde o velmi silný systém, který
diff --git a/Documentation/de/web/introduction.itexi
b/Documentation/de/web/introduction.itexi
index 2cd0aad..96d4c0a 100644
--- a/Documentation/de/web/introduction.itexi
+++ b/Documentation/de/web/introduction.itexi
@@ -757,7 +757,7 @@ Oktober 2004
Die Editoren von Computer!Totaal, einer holländischen
Computerzeitschrift,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
beschreiben LilyPond} in der Ausgabe Oktober 2004 als: @qq{Wunderbare
freie (Open Source) Software [..] Die Partituren von LilyPond
sind ausnahmslos schön [..] ein sehr mächtiges System das fast alles
diff --git a/Documentation/es/web/introduction.itexi
b/Documentation/es/web/introduction.itexi
index fc9ca34..b7eff79 100644
--- a/Documentation/es/web/introduction.itexi
+++ b/Documentation/es/web/introduction.itexi
@@ -756,7 +756,7 @@ en @uref{http://linuxfr.org/2005/06/27/19210.html,
linuxfr.org}.
Octubre de 2004
Los editores de Computer!Totaal, una revista holandesa de informática,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg, describen a
address@hidden://lilypond.org/pdf/computer-totaal.jpeg, describen a
LilyPond} en la edición de octubre de 2004 como: @qq{Maravilloso
software libre (de código abierto) (...) Las partituras producidas por
LilyPond son excepcionalmente bonitas (...) un sistema muy potente que
diff --git a/Documentation/fr/web/introduction.itexi
b/Documentation/fr/web/introduction.itexi
index 4202437..88b660e 100644
--- a/Documentation/fr/web/introduction.itexi
+++ b/Documentation/fr/web/introduction.itexi
@@ -771,7 +771,7 @@ Un article français sur LilyPond 2.6 est paru sur
Octobre 2004
Les éditeurs de @emph{Computer!Totaal}, magazine informatique
-hollandais, @uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
+hollandais, @uref{http://lilypond.org/pdf/computer-totaal.jpeg,
décrivent LilyPond} dans leur numéro d'octobre 2004 comme « un
merveilleux logiciel libre address@hidden Les partitions qu'il génère sont
extrêmement belles address@hidden Un système très puissant permettant
diff --git a/Documentation/hu/web/community.itexi
b/Documentation/hu/web/community.itexi
index 14a93b3..aaff09d 100644
--- a/Documentation/hu/web/community.itexi
+++ b/Documentation/hu/web/community.itexi
@@ -843,21 +843,21 @@ Archívum}
@item
Han-Wen Nienhuys: @emph{LilyPond, automatikus kottaformázás és a
szoftvertermék kiadásának művészete}. A szabad szoftver nemzetközi fóruma 2006
-(FISL7.0) (@uref{http://lilypond.org/website/pdf/FISL7-slides.pdf,
+(FISL7.0) (@uref{http://lilypond.org/pdf/FISL7-slides.pdf,
PDF 1095k})
@item
Erik Sandberg: @emph{A bemeneti nyelv és a formázó szétválasztása a
GNU Lilypondban}. Diplomaterv, Uppsalai Egyetem, Információtechnológiai
Tanszék, 2006. március
-(@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg.pdf,
+(@uref{http://lilypond.org/pdf/thesis-erik-sandberg.pdf,
PDF 750k})
@item
Han-Wen Nienhuys, Jan Nieuwenhuizen: @emph{LilyPond, egy automatizált
kottaszedő rendszer}. Jegyzőkönyv a XIV. zenei informatikai kollokviumról
(XIV CIM 2003), Firenze, Olaszország, 2003. május
-(@uref{http://lilypond.org/website/pdf/xivcim.pdf, PDF 95k})
+(@uref{http://lilypond.org/pdf/xivcim.pdf, PDF 95k})
@end itemize
@@ -923,7 +923,7 @@ A LilyPond 2.6-os verziójának kiadásáról megjelenik egy
francia cikk a
2004. október
A @emph{Computer!Totaal} holland informatikai magazin szerkesztői
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg, azt írják a
address@hidden://lilypond.org/pdf/computer-totaal.jpeg, azt írják a
LilyPondról} a 2004. októberi számban: @qq{A LilyPond egy csodálatos szabad
(nyílt forrású) szoftver! [...] A LilyPonddal szedett kotta kivételesen szép.
[...] Egy sokrétű rendszerrel állunk szemben, ami szinte mindenre képes!}
diff --git a/Documentation/it/web/introduction.itexi
b/Documentation/it/web/introduction.itexi
index 5bf496c..2982fc9 100644
--- a/Documentation/it/web/introduction.itexi
+++ b/Documentation/it/web/introduction.itexi
@@ -706,7 +706,7 @@ Ottobre 2004
Gli editor di Computer!Totaal, una rivista olandese di computer,
nel numero di Ottobre 2004
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
descrivono LilyPond} come: @qq{Meraviglioso software
libero [..] Gli spartiti prodotti da
LilyPond sono incredibilmente belli [..] un sistema molto potente che
diff --git a/Documentation/ja/web/introduction.itexi
b/Documentation/ja/web/introduction.itexi
index f717af2..e82101f 100644
--- a/Documentation/ja/web/introduction.itexi
+++ b/Documentation/ja/web/introduction.itexi
@@ -765,7 +765,7 @@ A French article on the LilyPond 2.6 release appeared on
October 2004
The editors of Computer!Totaal, a Dutch computer magazine,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
describe LilyPond} in the October 2004 issue as: @qq{Wonderful
free (open source) software [..] The sheet music produced by
LilyPond is exceptionally pretty [..] a very powerful system that
diff --git a/Documentation/nl/web/introduction.itexi
b/Documentation/nl/web/introduction.itexi
index 6d0ecef..8e9477a 100644
--- a/Documentation/nl/web/introduction.itexi
+++ b/Documentation/nl/web/introduction.itexi
@@ -769,7 +769,7 @@ oktober 2004
De redacteurs van of Computer!Totaal, een Nederlands
computerblad,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
beschrijven LilyPond} in het oktober 2004-nummer als:
@qq{Prachtige gratis (open source) software [..] De
bladmuziek die LilyPond oplevert is inderdaad bijzonder
diff --git a/Documentation/web/introduction.itexi
b/Documentation/web/introduction.itexi
index 035b884..83012d2 100644
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -726,7 +726,7 @@ A French article on the LilyPond 2.6 release appeared on
October 2004
The editors of Computer!Totaal, a Dutch computer magazine,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
describe LilyPond} in the October 2004 issue as: @qq{Wonderful
free (open source) software [..] The sheet music produced by
LilyPond is exceptionally pretty [..] a very powerful system that
diff --git a/Documentation/web/we-wrote.bib b/Documentation/web/we-wrote.bib
index 2ed03b5..1f0de3a 100644
--- a/Documentation/web/we-wrote.bib
+++ b/Documentation/web/we-wrote.bib
@@ -4,7 +4,7 @@
author = {Han-Wen Nienhuys},
booktitle = {Forum Internacional Software Livre 2006 (FISL7.0)},
year = 2006,
- note = {(@uref{http://lilypond.org/website/pdf/FISL7-slides.pdf, PDF 1095k})}
+ note = {(@uref{http://lilypond.org/pdf/FISL7-slides.pdf, PDF 1095k})}
}
@mastersthesis{sandberg06,
@@ -13,7 +13,7 @@
year = 2006,
month = "March",
school = {Uppsala University, Department of Information Technology},
- note = {(@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg, PDF
750k})}
+ note = {(@uref{http://lilypond.org/pdf/thesis-erik-sandberg, PDF 750k})}
}
@inproceedings{hanwen03,
@@ -23,7 +23,7 @@
year = 2003,
month = "May",
location = {Firenze, Italy},
- note = {(@uref{http://lilypond.org/website/pdf/xivcim.pdf, PDF 95k})}
+ note = {(@uref{http://lilypond.org/pdf/xivcim.pdf, PDF 95k})}
}
@inproceedings{reinhold01,
@@ -31,7 +31,7 @@
author = {Reinhold Kainhofer},
booktitle = {The Linux Audio Conference 2010 (LAC2010)},
year = 2010,
- note = {(@uref{http://lilypond.org/website/pdf/reinhold-LAC-2010.pdf, PDF
767k})}
+ note = {(@uref{http://lilypond.org/pdf/reinhold-LAC-2010.pdf, PDF 767k})}
}
@inproceedings{graham01,
@@ -39,7 +39,7 @@
author = {Graham Percival},
booktitle = {Rencontres Mondiales du Logiciel Libre 2010 (RMLL2010)},
year = 2010,
- note =
{(@uref{http://lilypond.org/website/pdf/graham-sustainability-FOSS.pdf, PDF
333k})}
+ note = {(@uref{http://lilypond.org/pdf/graham-sustainability-FOSS.pdf, PDF
333k})}
}
diff --git a/Documentation/zh/web/introduction.itexi
b/Documentation/zh/web/introduction.itexi
index 5876d4c..d7d2298 100644
--- a/Documentation/zh/web/introduction.itexi
+++ b/Documentation/zh/web/introduction.itexi
@@ -718,7 +718,7 @@ A French article on the LilyPond 2.6 release appeared on
2004年10月
The editors of Computer!Totaal, a Dutch computer magazine,
address@hidden://lilypond.org/website/pdf/computer-totaal.jpeg,
address@hidden://lilypond.org/pdf/computer-totaal.jpeg,
describe LilyPond} in the October 2004 issue as: @qq{Wonderful
free (open source) software [..] The sheet music produced by
LilyPond is exceptionally pretty [..] a very powerful system that
diff --git a/python/auxiliar/postprocess_html.py
b/python/auxiliar/postprocess_html.py
index 538f79a..d90afb9 100644
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -70,7 +70,7 @@ footer_tag_re = re.compile (footer_tag)
lang_available = _doc ("Other languages: %s.")
browser_lang = _doc ('About <a href="%s">automatic language selection</a>.')
-browser_language_url = "http://www.lilypond.org/website/misc/browser-language";
+browser_language_url = "http://www.lilypond.org/misc/browser-language";
LANGUAGES_TEMPLATE = '''
<p id="languages">
diff --git a/scripts/build/website_post.py b/scripts/build/website_post.py
index 317cf5a..d8730a4 100644
--- a/scripts/build/website_post.py
+++ b/scripts/build/website_post.py
@@ -127,7 +127,7 @@ def makeFooter (filename, currentLang):
lst = ', '.join ([link (lang) for lang in langs if lang != currentLang])
other = _ ('Other languages', currentLang)
browser_lang = _ ('About <a href="%s">automatic language selection</a>.',
currentLang)
- browser_language_url =
"http://www.lilypond.org/website/misc/browser-language";
+ browser_language_url = "http://www.lilypond.org/misc/browser-language";
browser_language = browser_lang % browser_language_url
return footer % locals ()
--
1.7.12.4