[SCM] live-manual branch, debian, updated. debian/20100501-1-25-gbce43a9
Daniel Baumann
daniel at debian.org
Sun Jun 6 13:42:41 UTC 2010
The following commit has been merged in the debian branch:
commit 4fd6c708b92cb1e8ceb3e8482d6e4ac7f5913496
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jun 6 15:29:38 2010 +0200
Adding single-page html output (Closes: #541452).
diff --git a/Makefile b/Makefile
index 1df7aa6..c7d95e9 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ build:
mkdir -p $(CURDIR)/build/$${LANGUAGE}/html; \
cd $(CURDIR)/build/$${LANGUAGE}/html; \
xsltproc --nonet --novalid --xinclude $(CURDIR)/xsl/html.xsl ../index.xml; \
+ mkdir -p $(CURDIR)/build/$${LANGUAGE}/html-single; \
+ cd $(CURDIR)/build/$${LANGUAGE}/html-single; \
+ xsltproc --nonet --novalid --xinclude $(CURDIR)/xsl/html-single.xsl ../index.xml; \
+ mv $(CURDIR)/build/$${LANGUAGE}/html-single/index.html $(CURDIR)/build/$${LANGUAGE}/html-single/live-manual.html; \
mkdir -p $(CURDIR)/build/$${LANGUAGE}/txt; \
cd $(CURDIR)/build/$${LANGUAGE}/txt; \
xsltproc --nonet --novalid --xinclude $(CURDIR)/xsl/txt.xsl ../index.xml | w3m -cols 65 -dump -T text/html > live-manual.txt; \
@@ -45,10 +49,11 @@ install:
for LANGUAGE in $(LANGUAGES); \
do \
mkdir -p $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}; \
- cp -a build/$${LANGUAGE}/html build/$${LANGUAGE}/pdf/* build/$${LANGUAGE}/txt/* $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}; \
+ cp -a build/$${LANGUAGE}/html build/$${LANGUAGE}/html-single/* build/$${LANGUAGE}/pdf/* build/$${LANGUAGE}/txt/* $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}; \
done
ln -s en/html $(DESTDIR)/usr/share/doc/live-manual/html
+ ln -s en/live-manual.html $(DESTDIR)/usr/share/doc/live-manual/live-manual.html
ln -s en/live-manual.pdf.gz $(DESTDIR)/usr/share/doc/live-manual/live-manual.pdf.gz
ln -s en/live-manual.txt.gz $(DESTDIR)/usr/share/doc/live-manual/live-manual.txt.gz
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index 86dd427..8b100be 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -38,9 +38,10 @@ to the manual.
<dd>
<ul>
- <li>› <b><a href="html/@LANG@/">HTML</a></b></li>
- <li>› <a href="pdf/@LANG@/live-manual.pdf">PDF</a></li>
- <li>› <a href="txt/@LANG@/live-manual.txt">Plain text</a></li>
+ <li>› <b><a href="html/">HTML</a></b></li>
+ <li>› <a href="html-single/live-manual.html">HTML (single page)</a></li>
+ <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
+ <li>› <a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index c0dcf8e..4a8306b 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -35,8 +35,9 @@
<dd>
<ul>
<li>› <b><a href="html/">HTML</a></b></li>
- <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
- <li>› <a href="txt/live-manual.txt">Plain text</a></li>
+ <li>› <a href="html-single/live-manual.html">HTML (single page)</a></li>
+ <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
+ <li>› <a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 73570fc..a1ae5ef 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -38,9 +38,10 @@ to the manual.
<dd>
<ul>
- <li>› <b><a href="html/@LANG@/">HTML</a></b></li>
- <li>› <a href="pdf/@LANG@/live-manual.pdf">PDF</a></li>
- <li>› <a href="txt/@LANG@/live-manual.txt">Texte</a></li>
+ <li>› <b><a href="html/">HTML</a></b></li>
+ <li>› <a href="html-single/live-manual.html">HTML (single page)</a></li>
+ <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
+ <li>› <a href="txt/live-manual.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 6ea5915..0305f8c 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 15:21+0300\n"
"PO-Revision-Date: 2008-08-09 16:50+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,32 +17,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <html><head><title>
-#: html/index.html.in:8
+#: en/index.html.in:8
msgid "Debian Live Project"
msgstr ""
#. type: Content of: <html><body><h1>
-#: html/index.html.in:14
+#: en/index.html.in:14
msgid "<a href=\"/\">Debian Live Project</a>"
msgstr ""
#. type: Content of: <html><body><h2>
-#: html/index.html.in:15
+#: en/index.html.in:15
msgid "<a href=\"/\">Live Debian systems!</a>"
msgstr ""
#. type: Content of: <html><body><div><h2>
-#: html/index.html.in:19
+#: en/index.html.in:19
msgid "Live Manual"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:25
+#: en/index.html.in:25
msgid "<i>This manual is under heavy construction.</i>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:29
+#: en/index.html.in:29
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -51,44 +51,50 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:33
+#: en/index.html.in:33
msgid "Available Formats"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:37
-msgid "› <b><a href=\"html/@LANG@/\">HTML</a></b>"
+#: en/index.html.in:37
+msgid "› <b><a href=\"html/\">HTML</a></b>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:38
-msgid "› <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+#: en/index.html.in:38
+msgid ""
+"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
+msgstr ""
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:39
+msgid "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:39
-msgid "› <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+#: en/index.html.in:40
+msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:43
+#: en/index.html.in:44
msgid "Last updated: @DATE@"
msgstr ""
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:47
+#: en/index.html.in:48
msgid "Source"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:51
+#: en/index.html.in:52
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">git</a> repository at live.debian.net."
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:55
+#: en/index.html.in:56
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -96,14 +102,14 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:56
+#: en/index.html.in:57
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
msgstr ""
#. type: Content of: <html><body><div><p>
-#: html/index.html.in:66
+#: en/index.html.in:67
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index debe0d7..21b99b1 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 15:21+0300\n"
"PO-Revision-Date: 2009-02-26 15:30+0100\n"
"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
"<christophenagel at gmail.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
# type: Content of: <book><bookinfo><copyright><holder>
#. type: Content of: <html><head><title>
-#: html/index.html.in:8
+#: en/index.html.in:8
#, fuzzy
#| msgid "The Debian Live Project"
msgid "Debian Live Project"
@@ -27,7 +27,7 @@ msgstr "Le projet Debian Live"
# type: Content of: <html><body><h1>
#. type: Content of: <html><body><h1>
-#: html/index.html.in:14
+#: en/index.html.in:14
#, fuzzy
#| msgid "<a href=\"/\">Debian Live</a>"
msgid "<a href=\"/\">Debian Live Project</a>"
@@ -35,25 +35,25 @@ msgstr "<a href=\"/\">Debian Live</a>"
# type: Content of: <html><body><h2>
#. type: Content of: <html><body><h2>
-#: html/index.html.in:15
+#: en/index.html.in:15
msgid "<a href=\"/\">Live Debian systems!</a>"
msgstr "<a href=\"/\">Live Debian systems!</a>"
# type: Content of: <html><body><div><h2>
#. type: Content of: <html><body><div><h2>
-#: html/index.html.in:19
+#: en/index.html.in:19
msgid "Live Manual"
msgstr "Live Manuel"
# type: Content of: <html><body><div><dl><dd><p>
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:25
+#: en/index.html.in:25
msgid "<i>This manual is under heavy construction.</i>"
msgstr "<i>Ce manuel est en phase de construction intense.</i>"
# type: Content of: <html><body><div><dl><dd><p>
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:29
+#: en/index.html.in:29
#, fuzzy
#| msgid ""
#| "Please report errors, omissions, patches and suggestions to our "
@@ -71,43 +71,58 @@ msgstr ""
# type: Content of: <html><body><div><dl><dt><h3>
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:33
+#: en/index.html.in:33
msgid "Available Formats"
msgstr "Formats Disponibles"
# type: Content of: <html><body><div><dl><dd><ul><li>
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:37
-msgid "› <b><a href=\"html/@LANG@/\">HTML</a></b>"
+#: en/index.html.in:37
+#, fuzzy
+#| msgid "› <b><a href=\"html/@LANG@/\">HTML</a></b>"
+msgid "› <b><a href=\"html/\">HTML</a></b>"
msgstr "› <b><a href=\"html/@LANG@/\">HTML</a></b>"
# type: Content of: <html><body><div><dl><dd><ul><li>
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:38
-msgid "› <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+#: en/index.html.in:38
+#, fuzzy
+#| msgid "› <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+msgid ""
+"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
+msgstr "› <a href=\"txt/@LANG@/live-manual.txt\">Texte</a>"
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:39
+#, fuzzy
+#| msgid "› <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+msgid "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
msgstr "› <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
# type: Content of: <html><body><div><dl><dd><ul><li>
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:39
-msgid "› <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+#: en/index.html.in:40
+#, fuzzy
+#| msgid "› <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "› <a href=\"txt/@LANG@/live-manual.txt\">Texte</a>"
# type: Content of: <html><body><div><dl><dd><p>
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:43
+#: en/index.html.in:44
msgid "Last updated: @DATE@"
msgstr "Last updated: @DATE@"
# type: Content of: <html><body><div><dl><dt><h3>
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:47
+#: en/index.html.in:48
msgid "Source"
msgstr "Source"
# type: Content of: <html><body><div><dl><dd><p>
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:51
+#: en/index.html.in:52
#, fuzzy
#| msgid ""
#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
@@ -121,7 +136,7 @@ msgstr ""
# type: Content of: <html><body><div><dl><dd><ul><li>
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:55
+#: en/index.html.in:56
#, fuzzy
#| msgid ""
#| "Browse: <a href=\"http://git.debian.org/?p=debian-live/live-manual.git"
@@ -138,7 +153,7 @@ msgstr ""
# type: Content of: <html><body><div><dl><dd><ul><li>
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:56
+#: en/index.html.in:57
#, fuzzy
#| msgid ""
#| "Git: <a href=\"git://git.debian.org/git/debian-live/live-manual.git"
@@ -154,7 +169,7 @@ msgstr ""
# type: Content of: <html><body><div><p>
#. type: Content of: <html><body><div><p>
-#: html/index.html.in:66
+#: en/index.html.in:67
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index e63fce8..8254bef 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,32 +16,32 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <html><head><title>
-#: html/index.html.in:8
+#: en/index.html.in:8
msgid "Debian Live Project"
msgstr ""
#. type: Content of: <html><body><h1>
-#: html/index.html.in:14
+#: en/index.html.in:14
msgid "<a href=\"/\">Debian Live Project</a>"
msgstr ""
#. type: Content of: <html><body><h2>
-#: html/index.html.in:15
+#: en/index.html.in:15
msgid "<a href=\"/\">Live Debian systems!</a>"
msgstr ""
#. type: Content of: <html><body><div><h2>
-#: html/index.html.in:19
+#: en/index.html.in:19
msgid "Live Manual"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:25
+#: en/index.html.in:25
msgid "<i>This manual is under heavy construction.</i>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:29
+#: en/index.html.in:29
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -50,44 +50,50 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:33
+#: en/index.html.in:33
msgid "Available Formats"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:37
-msgid "› <b><a href=\"html/@LANG@/\">HTML</a></b>"
+#: en/index.html.in:37
+msgid "› <b><a href=\"html/\">HTML</a></b>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:38
-msgid "› <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+#: en/index.html.in:38
+msgid ""
+"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
+msgstr ""
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:39
+msgid "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:39
-msgid "› <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+#: en/index.html.in:40
+msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:43
+#: en/index.html.in:44
msgid "Last updated: @DATE@"
msgstr ""
#. type: Content of: <html><body><div><dl><dt><h3>
-#: html/index.html.in:47
+#: en/index.html.in:48
msgid "Source"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: html/index.html.in:51
+#: en/index.html.in:52
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">git</a> repository at live.debian.net."
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:55
+#: en/index.html.in:56
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -95,14 +101,14 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: html/index.html.in:56
+#: en/index.html.in:57
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
msgstr ""
#. type: Content of: <html><body><div><p>
-#: html/index.html.in:66
+#: en/index.html.in:67
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
--
live-manual
More information about the debian-live-changes
mailing list