[SCM] Debian Live manual branch, master, updated. 09e674f2c7265b69bcc2746133b506aca405a462

Daniel Baumann daniel at debian.org
Wed Nov 12 21:27:35 UTC 2008 

The following commit has been merged in the master branch:
commit 09e674f2c7265b69bcc2746133b506aca405a462
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Nov 12 22:27:22 2008 +0100

    Moving all xml files into xml subfolder.

diff --git a/Makefile b/Makefile
index 499ff2b..3b71147 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ po4a:
 translations: po4a
 	set -e; for LANGUAGE in $(LANGUAGES); do \
 		mkdir -p $$LANGUAGE; \
-		cp -r ent/ $$LANGUAGE; \
+		cp -r xml/entities/ $$LANGUAGE; \
 		cp -r xsl/ $$LANGUAGE; \
 		cp Makefile.common $$LANGUAGE/Makefile; \
 		$(MAKE) -C $$LANGUAGE; \
@@ -35,7 +35,7 @@ translations: po4a
 clean:
 	-rm -rf $(LANGUAGES)
 	rm -f *.html *.pdf *.txt
-	rm -f ent/version.ent
+	rm -f xml/entities/version.ent
 
 purge: clean
 	rm -rf autobuild
diff --git a/Makefile.common b/Makefile.common
index a036e4d..5bad1e2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -5,7 +5,7 @@ VERSION		:=
 PUBDATE		:=
 
 TARGETS		:= $(foreach fmt,$(FORMATS),$(PROJECT).$(fmt))
-SOURCES		:= $(wildcard chapters/*.xml) $(wildcard appendices/*.xml) ent/version.ent ent/common.ent
+SOURCES		:= $(wildcard xml/chapters/*.xml) $(wildcard xml/appendices/*.xml) xml/entities/version.ent xml/entities/common.ent
 
 XP		:= xsltproc --nonet --novalid --xinclude
 XL		:= xmllint --nonet --noout --postvalid --xinclude
@@ -14,20 +14,20 @@ DBLATEX		:= dblatex --style=db2latex
 all: $(TARGETS)
 
 validate: $(SOURCES)
-	$(XL) index.xml
+	$(XL) xml/index.xml
 
 index.html: $(SOURCES)
-	$(XP) xsl/html.xsl index.xml
+	$(XP) xsl/html.xsl xml/index.xml
 
 $(PROJECT).html: index.html
 
 $(PROJECT).txt: $(SOURCES)
-	$(XP) xsl/txt.xsl index.xml | w3m -cols 65 -dump -T text/html > $@
+	$(XP) xsl/txt.xsl xml/index.xml | w3m -cols 65 -dump -T text/html > $@
 
 $(PROJECT).pdf: $(SOURCES)
-	$(DBLATEX) index.xml -o $@ 
+	$(DBLATEX) xml/index.xml -o $@ 
 
-ent/version.ent:
+xml/entities/version.ent:
 	echo '<!ENTITY version "$(VERSION)">' >  $@
 	echo '<!ENTITY pubdate "$(PUBDATE)">' >> $@
 
diff --git a/appendices/configuration-files.xml b/xml/appendices/configuration-files.xml
similarity index 99%
rename from appendices/configuration-files.xml
rename to xml/appendices/configuration-files.xml
index daf7c35..60a7ad6 100644
--- a/appendices/configuration-files.xml
+++ b/xml/appendices/configuration-files.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 
 <appendix id="configuration-files">
diff --git a/appendices/configuration-layout.xml b/xml/appendices/configuration-layout.xml
similarity index 98%
rename from appendices/configuration-layout.xml
rename to xml/appendices/configuration-layout.xml
index daadd8c..77aac3b 100644
--- a/appendices/configuration-layout.xml
+++ b/xml/appendices/configuration-layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 
 <appendix id="configuration-layout">
diff --git a/chapters/about.xml b/xml/chapters/about.xml
similarity index 84%
rename from chapters/about.xml
rename to xml/chapters/about.xml
index ee96c44..15b255f 100644
--- a/chapters/about.xml
+++ b/xml/chapters/about.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter>
 <title>About</title>
diff --git a/chapters/about/manual.xml b/xml/chapters/about/manual.xml
similarity index 98%
rename from chapters/about/manual.xml
rename to xml/chapters/about/manual.xml
index 746a2ee..9c7a4f3 100644
--- a/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="meta">
 <title>About this manual</title>
diff --git a/chapters/about/project.xml b/xml/chapters/about/project.xml
similarity index 98%
rename from chapters/about/project.xml
rename to xml/chapters/about/project.xml
index c912210..2e8348f 100644
--- a/chapters/about/project.xml
+++ b/xml/chapters/about/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="about">
 <title>About the Debian Live Project</title>
diff --git a/chapters/basics.xml b/xml/chapters/basics.xml
similarity index 98%
rename from chapters/basics.xml
rename to xml/chapters/basics.xml
index 27fbf0a..69b90c7 100644
--- a/chapters/basics.xml
+++ b/xml/chapters/basics.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="basics">
 <title>The basics</title>
diff --git a/chapters/common-tasks.xml b/xml/chapters/common-tasks.xml
similarity index 97%
rename from chapters/common-tasks.xml
rename to xml/chapters/common-tasks.xml
index d8d19b5..01ad454 100644
--- a/chapters/common-tasks.xml
+++ b/xml/chapters/common-tasks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="common-tasks">
 <title>Common tasks</title>
diff --git a/chapters/customization.xml b/xml/chapters/customization.xml
similarity index 89%
rename from chapters/customization.xml
rename to xml/chapters/customization.xml
index f09da84..0da0c6c 100644
--- a/chapters/customization.xml
+++ b/xml/chapters/customization.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="customization">
 <title>Customization</title>
diff --git a/chapters/customization/binary.xml b/xml/chapters/customization/binary.xml
similarity index 96%
rename from chapters/customization/binary.xml
rename to xml/chapters/customization/binary.xml
index 1483b4d..191a511 100644
--- a/chapters/customization/binary.xml
+++ b/xml/chapters/customization/binary.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="binary">
 <title>Customising the binary image</title>
diff --git a/chapters/customization/bootup.xml b/xml/chapters/customization/bootup.xml
similarity index 95%
rename from chapters/customization/bootup.xml
rename to xml/chapters/customization/bootup.xml
index e47cf94..2de7acd 100644
--- a/chapters/customization/bootup.xml
+++ b/xml/chapters/customization/bootup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="bootup">
 <title>Customising the bootup process</title>
diff --git a/chapters/customization/contents.xml b/xml/chapters/customization/contents.xml
similarity index 98%
rename from chapters/customization/contents.xml
rename to xml/chapters/customization/contents.xml
index 1819c2c..b6636bf 100644
--- a/chapters/customization/contents.xml
+++ b/xml/chapters/customization/contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="contents">
 <title>Customising contents</title>
diff --git a/chapters/customization/packages.xml b/xml/chapters/customization/packages.xml
similarity index 99%
rename from chapters/customization/packages.xml
rename to xml/chapters/customization/packages.xml
index a426932..7c17150 100644
--- a/chapters/customization/packages.xml
+++ b/xml/chapters/customization/packages.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
 <sect1 id="packages">
 <title>Customising package installation</title>
diff --git a/chapters/faq.xml b/xml/chapters/faq.xml
similarity index 77%
rename from chapters/faq.xml
rename to xml/chapters/faq.xml
index 89585bf..2d7030c 100644
--- a/chapters/faq.xml
+++ b/xml/chapters/faq.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="faq">
 <title>Frequently asked questions (FAQ)</title>
diff --git a/chapters/installation.xml b/xml/chapters/installation.xml
similarity index 98%
rename from chapters/installation.xml
rename to xml/chapters/installation.xml
index f9a4bf7..519f388 100644
--- a/chapters/installation.xml
+++ b/xml/chapters/installation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="installation">
 <title>Installation</title>
diff --git a/chapters/live-environment.xml b/xml/chapters/live-environment.xml
similarity index 99%
rename from chapters/live-environment.xml
rename to xml/chapters/live-environment.xml
index c54de38..6af5372 100644
--- a/chapters/live-environment.xml
+++ b/xml/chapters/live-environment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="live-environment">
 <title>The Live environment</title>
diff --git a/chapters/overview.xml b/xml/chapters/overview.xml
similarity index 99%
rename from chapters/overview.xml
rename to xml/chapters/overview.xml
index 70809be..769b53f 100644
--- a/chapters/overview.xml
+++ b/xml/chapters/overview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="overview">
 <title>Overview of tools</title>
diff --git a/chapters/reporting-bugs.xml b/xml/chapters/reporting-bugs.xml
similarity index 99%
rename from chapters/reporting-bugs.xml
rename to xml/chapters/reporting-bugs.xml
index 1181af9..2480607 100644
--- a/chapters/reporting-bugs.xml
+++ b/xml/chapters/reporting-bugs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="bugs">
 <title>Reporting bugs</title>
diff --git a/chapters/resources.xml b/xml/chapters/resources.xml
similarity index 96%
rename from chapters/resources.xml
rename to xml/chapters/resources.xml
index dcb6423..72ac21f 100644
--- a/chapters/resources.xml
+++ b/xml/chapters/resources.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
 <chapter id="resources">
 <title>Resources and links</title>
diff --git a/ent/common.ent b/xml/entities/common.ent
similarity index 100%
rename from ent/common.ent
rename to xml/entities/common.ent
diff --git a/index.xml b/xml/index.xml
similarity index 95%
rename from index.xml
rename to xml/index.xml
index ea32cdc..96ca6b9 100644
--- a/index.xml
+++ b/xml/index.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "ent/common.ent" > %commondata;
-  <!ENTITY % versiondata SYSTEM "ent/version.ent"> %versiondata;
+  <!ENTITY % commondata SYSTEM "entities/common.ent" > %commondata;
+  <!ENTITY % versiondata SYSTEM "entities/version.ent"> %versiondata;
 ]>
 <book lang="en">
 

-- 
Debian Live manual

More information about the debian-live-changes mailing list