summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul W. Frields <stickster@gmail.com>2007-03-22 12:33:59 +0000
committerPaul W. Frields <stickster@gmail.com>2007-03-22 12:33:59 +0000
commitf1508c92dd87b0106ee85f176385a88069614e4e (patch)
tree246c6eed92fb12fbb31c8ea968ace7b9a6acfa30
parent2eb0df5848ec47464735bc138014948b22938230 (diff)
downloadfedora-doc-utils-f1508c92dd87b0106ee85f176385a88069614e4e.tar.gz
fedora-doc-utils-f1508c92dd87b0106ee85f176385a88069614e4e.tar.xz
fedora-doc-utils-f1508c92dd87b0106ee85f176385a88069614e4e.zip
Point all XML snippets to the correct entities files.
-rw-r--r--common/cvs-en_US.xml2
-rw-r--r--common/legalnotice-content-de.xml2
-rw-r--r--common/legalnotice-content-el.xml2
-rw-r--r--common/legalnotice-content-en.xml2
-rw-r--r--common/legalnotice-content-en_US.xml2
-rw-r--r--common/legalnotice-content-es.xml2
-rw-r--r--common/legalnotice-content-fr.xml2
-rw-r--r--common/legalnotice-content-fr_FR.xml2
-rw-r--r--common/legalnotice-content-it.xml2
-rw-r--r--common/legalnotice-content-nl.xml2
-rw-r--r--common/legalnotice-content-p1-de.xml2
-rw-r--r--common/legalnotice-content-p1-el.xml2
-rw-r--r--common/legalnotice-content-p1-en.xml2
-rw-r--r--common/legalnotice-content-p1-en_US.xml2
-rw-r--r--common/legalnotice-content-p1-es.xml2
-rw-r--r--common/legalnotice-content-p1-fr.xml2
-rw-r--r--common/legalnotice-content-p1-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p1-it.xml2
-rw-r--r--common/legalnotice-content-p1-nl.xml2
-rw-r--r--common/legalnotice-content-p1-pl.xml2
-rw-r--r--common/legalnotice-content-p1-pt.xml2
-rw-r--r--common/legalnotice-content-p1-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p1-ru.xml2
-rw-r--r--common/legalnotice-content-p1-sv.xml2
-rw-r--r--common/legalnotice-content-p1-uk.xml2
-rw-r--r--common/legalnotice-content-p2-de.xml2
-rw-r--r--common/legalnotice-content-p2-el.xml2
-rw-r--r--common/legalnotice-content-p2-en.xml2
-rw-r--r--common/legalnotice-content-p2-en_US.xml2
-rw-r--r--common/legalnotice-content-p2-es.xml2
-rw-r--r--common/legalnotice-content-p2-fr.xml2
-rw-r--r--common/legalnotice-content-p2-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p2-it.xml2
-rw-r--r--common/legalnotice-content-p2-nl.xml2
-rw-r--r--common/legalnotice-content-p2-pl.xml2
-rw-r--r--common/legalnotice-content-p2-pt.xml2
-rw-r--r--common/legalnotice-content-p2-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p2-ru.xml2
-rw-r--r--common/legalnotice-content-p2-sv.xml2
-rw-r--r--common/legalnotice-content-p2-uk.xml2
-rw-r--r--common/legalnotice-content-p3-de.xml2
-rw-r--r--common/legalnotice-content-p3-el.xml2
-rw-r--r--common/legalnotice-content-p3-en.xml2
-rw-r--r--common/legalnotice-content-p3-en_US.xml2
-rw-r--r--common/legalnotice-content-p3-es.xml2
-rw-r--r--common/legalnotice-content-p3-fr.xml2
-rw-r--r--common/legalnotice-content-p3-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p3-it.xml2
-rw-r--r--common/legalnotice-content-p3-nl.xml2
-rw-r--r--common/legalnotice-content-p3-pl.xml2
-rw-r--r--common/legalnotice-content-p3-pt.xml2
-rw-r--r--common/legalnotice-content-p3-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p3-ru.xml2
-rw-r--r--common/legalnotice-content-p3-sv.xml2
-rw-r--r--common/legalnotice-content-p3-uk.xml2
-rw-r--r--common/legalnotice-content-p4-de.xml2
-rw-r--r--common/legalnotice-content-p4-el.xml2
-rw-r--r--common/legalnotice-content-p4-en.xml2
-rw-r--r--common/legalnotice-content-p4-en_US.xml2
-rw-r--r--common/legalnotice-content-p4-es.xml2
-rw-r--r--common/legalnotice-content-p4-fr.xml2
-rw-r--r--common/legalnotice-content-p4-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p4-it.xml2
-rw-r--r--common/legalnotice-content-p4-nl.xml2
-rw-r--r--common/legalnotice-content-p4-pl.xml2
-rw-r--r--common/legalnotice-content-p4-pt.xml2
-rw-r--r--common/legalnotice-content-p4-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p4-ru.xml2
-rw-r--r--common/legalnotice-content-p4-sv.xml2
-rw-r--r--common/legalnotice-content-p4-uk.xml2
-rw-r--r--common/legalnotice-content-p5-de.xml2
-rw-r--r--common/legalnotice-content-p5-el.xml2
-rw-r--r--common/legalnotice-content-p5-en.xml2
-rw-r--r--common/legalnotice-content-p5-en_US.xml2
-rw-r--r--common/legalnotice-content-p5-es.xml2
-rw-r--r--common/legalnotice-content-p5-fr.xml2
-rw-r--r--common/legalnotice-content-p5-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p5-it.xml2
-rw-r--r--common/legalnotice-content-p5-nl.xml2
-rw-r--r--common/legalnotice-content-p5-pl.xml2
-rw-r--r--common/legalnotice-content-p5-pt.xml2
-rw-r--r--common/legalnotice-content-p5-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p5-ru.xml2
-rw-r--r--common/legalnotice-content-p5-sv.xml2
-rw-r--r--common/legalnotice-content-p5-uk.xml2
-rw-r--r--common/legalnotice-content-p6-de.xml2
-rw-r--r--common/legalnotice-content-p6-el.xml2
-rw-r--r--common/legalnotice-content-p6-en.xml2
-rw-r--r--common/legalnotice-content-p6-en_US.xml2
-rw-r--r--common/legalnotice-content-p6-es.xml2
-rw-r--r--common/legalnotice-content-p6-fr.xml2
-rw-r--r--common/legalnotice-content-p6-fr_FR.xml2
-rw-r--r--common/legalnotice-content-p6-it.xml2
-rw-r--r--common/legalnotice-content-p6-nl.xml2
-rw-r--r--common/legalnotice-content-p6-pl.xml2
-rw-r--r--common/legalnotice-content-p6-pt.xml2
-rw-r--r--common/legalnotice-content-p6-pt_BR.xml2
-rw-r--r--common/legalnotice-content-p6-ru.xml2
-rw-r--r--common/legalnotice-content-p6-sv.xml2
-rw-r--r--common/legalnotice-content-p6-uk.xml2
-rw-r--r--common/legalnotice-content-pl.xml2
-rw-r--r--common/legalnotice-content-pt.xml2
-rw-r--r--common/legalnotice-content-pt_BR.xml2
-rw-r--r--common/legalnotice-content-sv.xml2
-rw-r--r--common/legalnotice-content-uk.xml2
-rw-r--r--common/legalnotice-el.xml2
-rw-r--r--common/legalnotice-en.xml2
-rw-r--r--common/legalnotice-en_US.xml2
-rw-r--r--common/legalnotice-it.xml2
-rw-r--r--common/legalnotice-opl-da.xml2
-rw-r--r--common/legalnotice-opl-de.xml2
-rw-r--r--common/legalnotice-opl-el.xml2
-rw-r--r--common/legalnotice-opl-en.xml2
-rw-r--r--common/legalnotice-opl-en_US.xml2
-rw-r--r--common/legalnotice-opl-es.xml2
-rw-r--r--common/legalnotice-opl-fr.xml2
-rw-r--r--common/legalnotice-opl-fr_FR.xml2
-rw-r--r--common/legalnotice-opl-it.xml2
-rw-r--r--common/legalnotice-opl-ja.xml2
-rw-r--r--common/legalnotice-opl-ja_JP.xml2
-rw-r--r--common/legalnotice-opl-nl.xml2
-rw-r--r--common/legalnotice-opl-pa.xml2
-rw-r--r--common/legalnotice-opl-pl.xml2
-rw-r--r--common/legalnotice-opl-pt.xml2
-rw-r--r--common/legalnotice-opl-pt_BR.xml2
-rw-r--r--common/legalnotice-opl-ru.xml2
-rw-r--r--common/legalnotice-opl-sr.xml2
-rw-r--r--common/legalnotice-opl-sv.xml2
-rw-r--r--common/legalnotice-opl-uk.xml2
-rw-r--r--common/legalnotice-opl-zh_CN.xml2
-rw-r--r--common/legalnotice-pl.xml2
-rw-r--r--common/legalnotice-pt.xml2
-rw-r--r--common/legalnotice-relnotes-de.xml2
-rw-r--r--common/legalnotice-relnotes-el.xml2
-rw-r--r--common/legalnotice-relnotes-en.xml2
-rw-r--r--common/legalnotice-relnotes-en_US.xml2
-rw-r--r--common/legalnotice-relnotes-es.xml2
-rw-r--r--common/legalnotice-relnotes-fr.xml2
-rw-r--r--common/legalnotice-relnotes-fr_FR.xml2
-rw-r--r--common/legalnotice-relnotes-it.xml2
-rw-r--r--common/legalnotice-relnotes-ja_JP.xml2
-rw-r--r--common/legalnotice-relnotes-nl.xml2
-rw-r--r--common/legalnotice-relnotes-pa.xml2
-rw-r--r--common/legalnotice-relnotes-pl.xml2
-rw-r--r--common/legalnotice-relnotes-pt.xml2
-rw-r--r--common/legalnotice-relnotes-pt_BR.xml2
-rw-r--r--common/legalnotice-relnotes-ru.xml2
-rw-r--r--common/legalnotice-relnotes-sv.xml2
-rw-r--r--common/legalnotice-relnotes-uk.xml2
-rw-r--r--common/legalnotice-ru.xml2
-rw-r--r--common/legalnotice-section-de.xml2
-rw-r--r--common/legalnotice-section-el.xml2
-rw-r--r--common/legalnotice-section-en.xml2
-rw-r--r--common/legalnotice-section-en_US.xml2
-rw-r--r--common/legalnotice-section-es.xml2
-rw-r--r--common/legalnotice-section-fr.xml2
-rw-r--r--common/legalnotice-section-fr_FR.xml2
-rw-r--r--common/legalnotice-section-it.xml2
-rw-r--r--common/legalnotice-section-nl.xml2
-rw-r--r--common/legalnotice-section-pl.xml2
-rw-r--r--common/legalnotice-section-pt.xml2
-rw-r--r--common/legalnotice-section-pt_BR.xml2
-rw-r--r--common/legalnotice-section-sv.xml2
-rw-r--r--common/legalnotice-uk.xml2
164 files changed, 164 insertions, 164 deletions
diff --git a/common/cvs-en_US.xml b/common/cvs-en_US.xml
index 151c201..b78a76d 100644
--- a/common/cvs-en_US.xml
+++ b/common/cvs-en_US.xml
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FDP-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FDP-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FDP-ENTITIES;
]>
diff --git a/common/legalnotice-content-de.xml b/common/legalnotice-content-de.xml
index 039949f..2286014 100644
--- a/common/legalnotice-content-de.xml
+++ b/common/legalnotice-content-de.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-el.xml b/common/legalnotice-content-el.xml
index e8b26db..5bf2743 100644
--- a/common/legalnotice-content-el.xml
+++ b/common/legalnotice-content-el.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml
index adf80fd..9298b6c 100644
--- a/common/legalnotice-content-en.xml
+++ b/common/legalnotice-content-en.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-en_US.xml b/common/legalnotice-content-en_US.xml
index 8506a73..a8e8aee 100644
--- a/common/legalnotice-content-en_US.xml
+++ b/common/legalnotice-content-en_US.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-es.xml b/common/legalnotice-content-es.xml
index 98fe673..97d31bc 100644
--- a/common/legalnotice-content-es.xml
+++ b/common/legalnotice-content-es.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-fr.xml b/common/legalnotice-content-fr.xml
index 06165da..bcd523c 100644
--- a/common/legalnotice-content-fr.xml
+++ b/common/legalnotice-content-fr.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-fr_FR.xml b/common/legalnotice-content-fr_FR.xml
index 06165da..bcd523c 100644
--- a/common/legalnotice-content-fr_FR.xml
+++ b/common/legalnotice-content-fr_FR.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-it.xml b/common/legalnotice-content-it.xml
index e849077..e27327d 100644
--- a/common/legalnotice-content-it.xml
+++ b/common/legalnotice-content-it.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-nl.xml b/common/legalnotice-content-nl.xml
index a284280..b767678 100644
--- a/common/legalnotice-content-nl.xml
+++ b/common/legalnotice-content-nl.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-de.xml b/common/legalnotice-content-p1-de.xml
index e0b5d0e..69e74c7 100644
--- a/common/legalnotice-content-p1-de.xml
+++ b/common/legalnotice-content-p1-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-el.xml b/common/legalnotice-content-p1-el.xml
index 8fd2804..0a4d698 100644
--- a/common/legalnotice-content-p1-el.xml
+++ b/common/legalnotice-content-p1-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p1-en.xml b/common/legalnotice-content-p1-en.xml
index fe9b3da..aa5e8d5 100644
--- a/common/legalnotice-content-p1-en.xml
+++ b/common/legalnotice-content-p1-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p1-en_US.xml b/common/legalnotice-content-p1-en_US.xml
index bc91996..29b9080 100644
--- a/common/legalnotice-content-p1-en_US.xml
+++ b/common/legalnotice-content-p1-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-es.xml b/common/legalnotice-content-p1-es.xml
index 033af10..327aec3 100644
--- a/common/legalnotice-content-p1-es.xml
+++ b/common/legalnotice-content-p1-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-fr.xml b/common/legalnotice-content-p1-fr.xml
index 685b7d1..d31a2e4 100644
--- a/common/legalnotice-content-p1-fr.xml
+++ b/common/legalnotice-content-p1-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-fr_FR.xml b/common/legalnotice-content-p1-fr_FR.xml
index 685b7d1..d31a2e4 100644
--- a/common/legalnotice-content-p1-fr_FR.xml
+++ b/common/legalnotice-content-p1-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-it.xml b/common/legalnotice-content-p1-it.xml
index 5c182a0..012cda8 100644
--- a/common/legalnotice-content-p1-it.xml
+++ b/common/legalnotice-content-p1-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p1-nl.xml b/common/legalnotice-content-p1-nl.xml
index 7f55bee..a28f983 100644
--- a/common/legalnotice-content-p1-nl.xml
+++ b/common/legalnotice-content-p1-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-pl.xml b/common/legalnotice-content-p1-pl.xml
index 1b679e8..0029a4c 100644
--- a/common/legalnotice-content-p1-pl.xml
+++ b/common/legalnotice-content-p1-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-pt.xml b/common/legalnotice-content-p1-pt.xml
index 99556e7..118b04e 100644
--- a/common/legalnotice-content-p1-pt.xml
+++ b/common/legalnotice-content-p1-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-pt_BR.xml b/common/legalnotice-content-p1-pt_BR.xml
index c3c8a88..0481ed5 100644
--- a/common/legalnotice-content-p1-pt_BR.xml
+++ b/common/legalnotice-content-p1-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-ru.xml b/common/legalnotice-content-p1-ru.xml
index ed9ec37..9b775a4 100644
--- a/common/legalnotice-content-p1-ru.xml
+++ b/common/legalnotice-content-p1-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p1-sv.xml b/common/legalnotice-content-p1-sv.xml
index 03416a7..344c408 100644
--- a/common/legalnotice-content-p1-sv.xml
+++ b/common/legalnotice-content-p1-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p1-uk.xml b/common/legalnotice-content-p1-uk.xml
index 54c6506..ffa8c6f 100644
--- a/common/legalnotice-content-p1-uk.xml
+++ b/common/legalnotice-content-p1-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-p2-de.xml b/common/legalnotice-content-p2-de.xml
index 51de9d9..346d140 100644
--- a/common/legalnotice-content-p2-de.xml
+++ b/common/legalnotice-content-p2-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-el.xml b/common/legalnotice-content-p2-el.xml
index dd5ac60..e9d778e 100644
--- a/common/legalnotice-content-p2-el.xml
+++ b/common/legalnotice-content-p2-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-p2-en.xml b/common/legalnotice-content-p2-en.xml
index 88b8778..eea856b 100644
--- a/common/legalnotice-content-p2-en.xml
+++ b/common/legalnotice-content-p2-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p2-en_US.xml b/common/legalnotice-content-p2-en_US.xml
index 67d7789..b8f3f40 100644
--- a/common/legalnotice-content-p2-en_US.xml
+++ b/common/legalnotice-content-p2-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-es.xml b/common/legalnotice-content-p2-es.xml
index e259f5e..f522a92 100644
--- a/common/legalnotice-content-p2-es.xml
+++ b/common/legalnotice-content-p2-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-fr.xml b/common/legalnotice-content-p2-fr.xml
index abe7097..0ebbad6 100644
--- a/common/legalnotice-content-p2-fr.xml
+++ b/common/legalnotice-content-p2-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-fr_FR.xml b/common/legalnotice-content-p2-fr_FR.xml
index abe7097..0ebbad6 100644
--- a/common/legalnotice-content-p2-fr_FR.xml
+++ b/common/legalnotice-content-p2-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-it.xml b/common/legalnotice-content-p2-it.xml
index 4a0cbb9..3eafd31 100644
--- a/common/legalnotice-content-p2-it.xml
+++ b/common/legalnotice-content-p2-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p2-nl.xml b/common/legalnotice-content-p2-nl.xml
index c8160ad..0e416a5 100644
--- a/common/legalnotice-content-p2-nl.xml
+++ b/common/legalnotice-content-p2-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-pl.xml b/common/legalnotice-content-p2-pl.xml
index 5cb0b6c..535efee 100644
--- a/common/legalnotice-content-p2-pl.xml
+++ b/common/legalnotice-content-p2-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-pt.xml b/common/legalnotice-content-p2-pt.xml
index bda71d6..d169c75 100644
--- a/common/legalnotice-content-p2-pt.xml
+++ b/common/legalnotice-content-p2-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-pt_BR.xml b/common/legalnotice-content-p2-pt_BR.xml
index 890a304..6338b81 100644
--- a/common/legalnotice-content-p2-pt_BR.xml
+++ b/common/legalnotice-content-p2-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-ru.xml b/common/legalnotice-content-p2-ru.xml
index 8993f7d..580e2ac 100644
--- a/common/legalnotice-content-p2-ru.xml
+++ b/common/legalnotice-content-p2-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p2-sv.xml b/common/legalnotice-content-p2-sv.xml
index d209639..47738e6 100644
--- a/common/legalnotice-content-p2-sv.xml
+++ b/common/legalnotice-content-p2-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p2-uk.xml b/common/legalnotice-content-p2-uk.xml
index 08f8814..b3af87a 100644
--- a/common/legalnotice-content-p2-uk.xml
+++ b/common/legalnotice-content-p2-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-p3-de.xml b/common/legalnotice-content-p3-de.xml
index 8096f5b..87d7c8b 100644
--- a/common/legalnotice-content-p3-de.xml
+++ b/common/legalnotice-content-p3-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-el.xml b/common/legalnotice-content-p3-el.xml
index d093e83..dc165c4 100644
--- a/common/legalnotice-content-p3-el.xml
+++ b/common/legalnotice-content-p3-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-p3-en.xml b/common/legalnotice-content-p3-en.xml
index 7eeb391..dab04f4 100644
--- a/common/legalnotice-content-p3-en.xml
+++ b/common/legalnotice-content-p3-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p3-en_US.xml b/common/legalnotice-content-p3-en_US.xml
index 325cc85..c5266f7 100644
--- a/common/legalnotice-content-p3-en_US.xml
+++ b/common/legalnotice-content-p3-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-es.xml b/common/legalnotice-content-p3-es.xml
index bddaab4..17851d6 100644
--- a/common/legalnotice-content-p3-es.xml
+++ b/common/legalnotice-content-p3-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-fr.xml b/common/legalnotice-content-p3-fr.xml
index 51a1ba0..a22d837 100644
--- a/common/legalnotice-content-p3-fr.xml
+++ b/common/legalnotice-content-p3-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-fr_FR.xml b/common/legalnotice-content-p3-fr_FR.xml
index 51a1ba0..a22d837 100644
--- a/common/legalnotice-content-p3-fr_FR.xml
+++ b/common/legalnotice-content-p3-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-it.xml b/common/legalnotice-content-p3-it.xml
index 0fcba0c..1afad20 100644
--- a/common/legalnotice-content-p3-it.xml
+++ b/common/legalnotice-content-p3-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p3-nl.xml b/common/legalnotice-content-p3-nl.xml
index b2b5921..7d6b0c3 100644
--- a/common/legalnotice-content-p3-nl.xml
+++ b/common/legalnotice-content-p3-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-pl.xml b/common/legalnotice-content-p3-pl.xml
index 284f862..d1587a2 100644
--- a/common/legalnotice-content-p3-pl.xml
+++ b/common/legalnotice-content-p3-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-pt.xml b/common/legalnotice-content-p3-pt.xml
index 9755f8a..8755496 100644
--- a/common/legalnotice-content-p3-pt.xml
+++ b/common/legalnotice-content-p3-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-pt_BR.xml b/common/legalnotice-content-p3-pt_BR.xml
index 203a7aa..8cfe676 100644
--- a/common/legalnotice-content-p3-pt_BR.xml
+++ b/common/legalnotice-content-p3-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-ru.xml b/common/legalnotice-content-p3-ru.xml
index 64baab3..0ac301f 100644
--- a/common/legalnotice-content-p3-ru.xml
+++ b/common/legalnotice-content-p3-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p3-sv.xml b/common/legalnotice-content-p3-sv.xml
index 6cc6977..a09805d 100644
--- a/common/legalnotice-content-p3-sv.xml
+++ b/common/legalnotice-content-p3-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p3-uk.xml b/common/legalnotice-content-p3-uk.xml
index bbcd43a..9faf937 100644
--- a/common/legalnotice-content-p3-uk.xml
+++ b/common/legalnotice-content-p3-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-p4-de.xml b/common/legalnotice-content-p4-de.xml
index 44a9f84..09a3350 100644
--- a/common/legalnotice-content-p4-de.xml
+++ b/common/legalnotice-content-p4-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-el.xml b/common/legalnotice-content-p4-el.xml
index 071a582..5163d45 100644
--- a/common/legalnotice-content-p4-el.xml
+++ b/common/legalnotice-content-p4-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-p4-en.xml b/common/legalnotice-content-p4-en.xml
index cc249aa..567894c 100644
--- a/common/legalnotice-content-p4-en.xml
+++ b/common/legalnotice-content-p4-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p4-en_US.xml b/common/legalnotice-content-p4-en_US.xml
index 22d17c1..e83fc24 100644
--- a/common/legalnotice-content-p4-en_US.xml
+++ b/common/legalnotice-content-p4-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-es.xml b/common/legalnotice-content-p4-es.xml
index 3dcde4c..89b231f 100644
--- a/common/legalnotice-content-p4-es.xml
+++ b/common/legalnotice-content-p4-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-fr.xml b/common/legalnotice-content-p4-fr.xml
index bc86bba..f54be49 100644
--- a/common/legalnotice-content-p4-fr.xml
+++ b/common/legalnotice-content-p4-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-fr_FR.xml b/common/legalnotice-content-p4-fr_FR.xml
index bc86bba..f54be49 100644
--- a/common/legalnotice-content-p4-fr_FR.xml
+++ b/common/legalnotice-content-p4-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-it.xml b/common/legalnotice-content-p4-it.xml
index da837aa..85dfbb9 100644
--- a/common/legalnotice-content-p4-it.xml
+++ b/common/legalnotice-content-p4-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p4-nl.xml b/common/legalnotice-content-p4-nl.xml
index 7fc2b33..0a2fad0 100644
--- a/common/legalnotice-content-p4-nl.xml
+++ b/common/legalnotice-content-p4-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-pl.xml b/common/legalnotice-content-p4-pl.xml
index 40b17b3..8e4a476 100644
--- a/common/legalnotice-content-p4-pl.xml
+++ b/common/legalnotice-content-p4-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-pt.xml b/common/legalnotice-content-p4-pt.xml
index 9c5ad0e..740bdf2 100644
--- a/common/legalnotice-content-p4-pt.xml
+++ b/common/legalnotice-content-p4-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-pt_BR.xml b/common/legalnotice-content-p4-pt_BR.xml
index 2338edb..8acc5a8 100644
--- a/common/legalnotice-content-p4-pt_BR.xml
+++ b/common/legalnotice-content-p4-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-ru.xml b/common/legalnotice-content-p4-ru.xml
index 8268658..26f068b 100644
--- a/common/legalnotice-content-p4-ru.xml
+++ b/common/legalnotice-content-p4-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p4-sv.xml b/common/legalnotice-content-p4-sv.xml
index 7667f2d..613c07c 100644
--- a/common/legalnotice-content-p4-sv.xml
+++ b/common/legalnotice-content-p4-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p4-uk.xml b/common/legalnotice-content-p4-uk.xml
index 377d70d..e7cfd64 100644
--- a/common/legalnotice-content-p4-uk.xml
+++ b/common/legalnotice-content-p4-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-p5-de.xml b/common/legalnotice-content-p5-de.xml
index 3c08d30..52637f4 100644
--- a/common/legalnotice-content-p5-de.xml
+++ b/common/legalnotice-content-p5-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-el.xml b/common/legalnotice-content-p5-el.xml
index 2374dbe..fe936f2 100644
--- a/common/legalnotice-content-p5-el.xml
+++ b/common/legalnotice-content-p5-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-p5-en.xml b/common/legalnotice-content-p5-en.xml
index d00fb42..9d15d51 100644
--- a/common/legalnotice-content-p5-en.xml
+++ b/common/legalnotice-content-p5-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p5-en_US.xml b/common/legalnotice-content-p5-en_US.xml
index 5b07163..4363415 100644
--- a/common/legalnotice-content-p5-en_US.xml
+++ b/common/legalnotice-content-p5-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-es.xml b/common/legalnotice-content-p5-es.xml
index adb626f..68ebd2b 100644
--- a/common/legalnotice-content-p5-es.xml
+++ b/common/legalnotice-content-p5-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-fr.xml b/common/legalnotice-content-p5-fr.xml
index d5d799b..931829b 100644
--- a/common/legalnotice-content-p5-fr.xml
+++ b/common/legalnotice-content-p5-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-fr_FR.xml b/common/legalnotice-content-p5-fr_FR.xml
index d5d799b..931829b 100644
--- a/common/legalnotice-content-p5-fr_FR.xml
+++ b/common/legalnotice-content-p5-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-it.xml b/common/legalnotice-content-p5-it.xml
index 71c8a4f..c428152 100644
--- a/common/legalnotice-content-p5-it.xml
+++ b/common/legalnotice-content-p5-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p5-nl.xml b/common/legalnotice-content-p5-nl.xml
index b83174c..3f9c46a 100644
--- a/common/legalnotice-content-p5-nl.xml
+++ b/common/legalnotice-content-p5-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-pl.xml b/common/legalnotice-content-p5-pl.xml
index 1ecd3f4..e9daef4 100644
--- a/common/legalnotice-content-p5-pl.xml
+++ b/common/legalnotice-content-p5-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-pt.xml b/common/legalnotice-content-p5-pt.xml
index 750fe23..af1ac11 100644
--- a/common/legalnotice-content-p5-pt.xml
+++ b/common/legalnotice-content-p5-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-pt_BR.xml b/common/legalnotice-content-p5-pt_BR.xml
index 1d577e1..c34e3a0 100644
--- a/common/legalnotice-content-p5-pt_BR.xml
+++ b/common/legalnotice-content-p5-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-ru.xml b/common/legalnotice-content-p5-ru.xml
index 3784dd5..d4026dd 100644
--- a/common/legalnotice-content-p5-ru.xml
+++ b/common/legalnotice-content-p5-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p5-sv.xml b/common/legalnotice-content-p5-sv.xml
index cda2bd4..c24d3b4 100644
--- a/common/legalnotice-content-p5-sv.xml
+++ b/common/legalnotice-content-p5-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p5-uk.xml b/common/legalnotice-content-p5-uk.xml
index 1f4c6b7..489396b 100644
--- a/common/legalnotice-content-p5-uk.xml
+++ b/common/legalnotice-content-p5-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-p6-de.xml b/common/legalnotice-content-p6-de.xml
index b94ef23..f3ae60d 100644
--- a/common/legalnotice-content-p6-de.xml
+++ b/common/legalnotice-content-p6-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-el.xml b/common/legalnotice-content-p6-el.xml
index c17f319..3cc0802 100644
--- a/common/legalnotice-content-p6-el.xml
+++ b/common/legalnotice-content-p6-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-content-p6-en.xml b/common/legalnotice-content-p6-en.xml
index 450f179..c5121bb 100644
--- a/common/legalnotice-content-p6-en.xml
+++ b/common/legalnotice-content-p6-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-content-p6-en_US.xml b/common/legalnotice-content-p6-en_US.xml
index bc31a09..53af01b 100644
--- a/common/legalnotice-content-p6-en_US.xml
+++ b/common/legalnotice-content-p6-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-es.xml b/common/legalnotice-content-p6-es.xml
index 50d33ac..0e5643c 100644
--- a/common/legalnotice-content-p6-es.xml
+++ b/common/legalnotice-content-p6-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-fr.xml b/common/legalnotice-content-p6-fr.xml
index 1fc767b..aeb04cf 100644
--- a/common/legalnotice-content-p6-fr.xml
+++ b/common/legalnotice-content-p6-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-fr_FR.xml b/common/legalnotice-content-p6-fr_FR.xml
index 1fc767b..aeb04cf 100644
--- a/common/legalnotice-content-p6-fr_FR.xml
+++ b/common/legalnotice-content-p6-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-it.xml b/common/legalnotice-content-p6-it.xml
index 58d0ce2..2399d38 100644
--- a/common/legalnotice-content-p6-it.xml
+++ b/common/legalnotice-content-p6-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-content-p6-nl.xml b/common/legalnotice-content-p6-nl.xml
index 07934bb..bed5557 100644
--- a/common/legalnotice-content-p6-nl.xml
+++ b/common/legalnotice-content-p6-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-pl.xml b/common/legalnotice-content-p6-pl.xml
index 7ad533a..0588f24 100644
--- a/common/legalnotice-content-p6-pl.xml
+++ b/common/legalnotice-content-p6-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-pt.xml b/common/legalnotice-content-p6-pt.xml
index 42fc999..c94e7b0 100644
--- a/common/legalnotice-content-p6-pt.xml
+++ b/common/legalnotice-content-p6-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-pt_BR.xml b/common/legalnotice-content-p6-pt_BR.xml
index 77e0a37..53500e7 100644
--- a/common/legalnotice-content-p6-pt_BR.xml
+++ b/common/legalnotice-content-p6-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-ru.xml b/common/legalnotice-content-p6-ru.xml
index c63d84c..a3feaaa 100644
--- a/common/legalnotice-content-p6-ru.xml
+++ b/common/legalnotice-content-p6-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-content-p6-sv.xml b/common/legalnotice-content-p6-sv.xml
index 8da5d3b..5e676d9 100644
--- a/common/legalnotice-content-p6-sv.xml
+++ b/common/legalnotice-content-p6-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-p6-uk.xml b/common/legalnotice-content-p6-uk.xml
index 95dbadc..7ffe6a7 100644
--- a/common/legalnotice-content-p6-uk.xml
+++ b/common/legalnotice-content-p6-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-content-pl.xml b/common/legalnotice-content-pl.xml
index 397e24e..e827b01 100644
--- a/common/legalnotice-content-pl.xml
+++ b/common/legalnotice-content-pl.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-pt.xml b/common/legalnotice-content-pt.xml
index 518ed27..c9069af 100644
--- a/common/legalnotice-content-pt.xml
+++ b/common/legalnotice-content-pt.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-pt_BR.xml b/common/legalnotice-content-pt_BR.xml
index de2594a..1b6351e 100644
--- a/common/legalnotice-content-pt_BR.xml
+++ b/common/legalnotice-content-pt_BR.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-sv.xml b/common/legalnotice-content-sv.xml
index 11c0e87..d4abed4 100644
--- a/common/legalnotice-content-sv.xml
+++ b/common/legalnotice-content-sv.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-content-uk.xml b/common/legalnotice-content-uk.xml
index 06f17d2..9342198 100644
--- a/common/legalnotice-content-uk.xml
+++ b/common/legalnotice-content-uk.xml
@@ -4,7 +4,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>
diff --git a/common/legalnotice-el.xml b/common/legalnotice-el.xml
index 8aae3dc..037b523 100644
--- a/common/legalnotice-el.xml
+++ b/common/legalnotice-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES-EL SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES-EL;
]>
diff --git a/common/legalnotice-en.xml b/common/legalnotice-en.xml
index 35e4a19..4ac22e9 100644
--- a/common/legalnotice-en.xml
+++ b/common/legalnotice-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-en_US.xml b/common/legalnotice-en_US.xml
index d549c65..731a893 100644
--- a/common/legalnotice-en_US.xml
+++ b/common/legalnotice-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-it.xml b/common/legalnotice-it.xml
index dfc3a71..e443607 100644
--- a/common/legalnotice-it.xml
+++ b/common/legalnotice-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-opl-da.xml b/common/legalnotice-opl-da.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-da.xml
+++ b/common/legalnotice-opl-da.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-de.xml b/common/legalnotice-opl-de.xml
index 0066ab1..1ae7c88 100644
--- a/common/legalnotice-opl-de.xml
+++ b/common/legalnotice-opl-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-el.xml b/common/legalnotice-opl-el.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-el.xml
+++ b/common/legalnotice-opl-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-en.xml b/common/legalnotice-opl-en.xml
index 12c5a7f..2d34ae4 100644
--- a/common/legalnotice-opl-en.xml
+++ b/common/legalnotice-opl-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-opl-en_US.xml b/common/legalnotice-opl-en_US.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-en_US.xml
+++ b/common/legalnotice-opl-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-es.xml b/common/legalnotice-opl-es.xml
index 0b7f445..594aba5 100644
--- a/common/legalnotice-opl-es.xml
+++ b/common/legalnotice-opl-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-fr.xml b/common/legalnotice-opl-fr.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-fr.xml
+++ b/common/legalnotice-opl-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-fr_FR.xml b/common/legalnotice-opl-fr_FR.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-fr_FR.xml
+++ b/common/legalnotice-opl-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-it.xml b/common/legalnotice-opl-it.xml
index 8f9aa9f..25187df 100644
--- a/common/legalnotice-opl-it.xml
+++ b/common/legalnotice-opl-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-opl-ja.xml b/common/legalnotice-opl-ja.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-ja.xml
+++ b/common/legalnotice-opl-ja.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-ja_JP.xml b/common/legalnotice-opl-ja_JP.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-ja_JP.xml
+++ b/common/legalnotice-opl-ja_JP.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-nl.xml b/common/legalnotice-opl-nl.xml
index e281fcc..33f7a41 100644
--- a/common/legalnotice-opl-nl.xml
+++ b/common/legalnotice-opl-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-pa.xml b/common/legalnotice-opl-pa.xml
index d6a4fdf..ebd1d0e 100644
--- a/common/legalnotice-opl-pa.xml
+++ b/common/legalnotice-opl-pa.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-PA SYSTEM "fedora-entities-pa.ent">
+<!ENTITY % FEDORA-ENTITIES-PA SYSTEM "entities/entities-pa.ent">
%FEDORA-ENTITIES-PA;
]>
diff --git a/common/legalnotice-opl-pl.xml b/common/legalnotice-opl-pl.xml
index 9caa9f1..9327790 100644
--- a/common/legalnotice-opl-pl.xml
+++ b/common/legalnotice-opl-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-pt.xml b/common/legalnotice-opl-pt.xml
index 50dcd56..c59cfaf 100644
--- a/common/legalnotice-opl-pt.xml
+++ b/common/legalnotice-opl-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-pt_BR.xml b/common/legalnotice-opl-pt_BR.xml
index 8ce6ddc..1bcdf09 100644
--- a/common/legalnotice-opl-pt_BR.xml
+++ b/common/legalnotice-opl-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-ru.xml b/common/legalnotice-opl-ru.xml
index cb831cd..035c850 100644
--- a/common/legalnotice-opl-ru.xml
+++ b/common/legalnotice-opl-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-sr.xml b/common/legalnotice-opl-sr.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-sr.xml
+++ b/common/legalnotice-opl-sr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-sv.xml b/common/legalnotice-opl-sv.xml
index 02a848d..f2bf90b 100644
--- a/common/legalnotice-opl-sv.xml
+++ b/common/legalnotice-opl-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-uk.xml b/common/legalnotice-opl-uk.xml
index e49bbf9..9551362 100644
--- a/common/legalnotice-opl-uk.xml
+++ b/common/legalnotice-opl-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-opl-zh_CN.xml b/common/legalnotice-opl-zh_CN.xml
index 605c0be..9f56c94 100644
--- a/common/legalnotice-opl-zh_CN.xml
+++ b/common/legalnotice-opl-zh_CN.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-pl.xml b/common/legalnotice-pl.xml
index 007e96a..7573fa0 100644
--- a/common/legalnotice-pl.xml
+++ b/common/legalnotice-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-pt.xml b/common/legalnotice-pt.xml
index 4475837..5943166 100644
--- a/common/legalnotice-pt.xml
+++ b/common/legalnotice-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-de.xml b/common/legalnotice-relnotes-de.xml
index 74d2fc7..be2178d 100644
--- a/common/legalnotice-relnotes-de.xml
+++ b/common/legalnotice-relnotes-de.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-de.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-el.xml b/common/legalnotice-relnotes-el.xml
index b07a896..e757024 100644
--- a/common/legalnotice-relnotes-el.xml
+++ b/common/legalnotice-relnotes-el.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-el.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-el.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-en.xml b/common/legalnotice-relnotes-en.xml
index 4791191..dce5c2a 100644
--- a/common/legalnotice-relnotes-en.xml
+++ b/common/legalnotice-relnotes-en.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-relnotes-en_US.xml b/common/legalnotice-relnotes-en_US.xml
index 3bd7d23..561cd49 100644
--- a/common/legalnotice-relnotes-en_US.xml
+++ b/common/legalnotice-relnotes-en_US.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-es.xml b/common/legalnotice-relnotes-es.xml
index ca679ba..8bbe624 100644
--- a/common/legalnotice-relnotes-es.xml
+++ b/common/legalnotice-relnotes-es.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-es.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-fr.xml b/common/legalnotice-relnotes-fr.xml
index 23bd269..638b339 100644
--- a/common/legalnotice-relnotes-fr.xml
+++ b/common/legalnotice-relnotes-fr.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-fr_FR.xml b/common/legalnotice-relnotes-fr_FR.xml
index 23bd269..638b339 100644
--- a/common/legalnotice-relnotes-fr_FR.xml
+++ b/common/legalnotice-relnotes-fr_FR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-fr_FR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-it.xml b/common/legalnotice-relnotes-it.xml
index d2e0092..4472cba 100644
--- a/common/legalnotice-relnotes-it.xml
+++ b/common/legalnotice-relnotes-it.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "fedora-entities-it.ent">
+<!ENTITY % FEDORA-ENTITIES-IT SYSTEM "entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-relnotes-ja_JP.xml b/common/legalnotice-relnotes-ja_JP.xml
index 3bd7d23..561cd49 100644
--- a/common/legalnotice-relnotes-ja_JP.xml
+++ b/common/legalnotice-relnotes-ja_JP.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-nl.xml b/common/legalnotice-relnotes-nl.xml
index 2265039..e3a6e4a 100644
--- a/common/legalnotice-relnotes-nl.xml
+++ b/common/legalnotice-relnotes-nl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-nl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-pa.xml b/common/legalnotice-relnotes-pa.xml
index 581b85c..8ddfe8c 100644
--- a/common/legalnotice-relnotes-pa.xml
+++ b/common/legalnotice-relnotes-pa.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-PA SYSTEM "fedora-entities-pa.ent">
+<!ENTITY % FEDORA-ENTITIES-PA SYSTEM "entities/entities-pa.ent">
%FEDORA-ENTITIES-PA;
]>
diff --git a/common/legalnotice-relnotes-pl.xml b/common/legalnotice-relnotes-pl.xml
index ff8812a..cbdc83d 100644
--- a/common/legalnotice-relnotes-pl.xml
+++ b/common/legalnotice-relnotes-pl.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pl.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-pt.xml b/common/legalnotice-relnotes-pt.xml
index 50a8e21..571f98b 100644
--- a/common/legalnotice-relnotes-pt.xml
+++ b/common/legalnotice-relnotes-pt.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-pt_BR.xml b/common/legalnotice-relnotes-pt_BR.xml
index 6f028e4..968f2fc 100644
--- a/common/legalnotice-relnotes-pt_BR.xml
+++ b/common/legalnotice-relnotes-pt_BR.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-pt_BR.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-ru.xml b/common/legalnotice-relnotes-ru.xml
index 2390fc9..204e7b2 100644
--- a/common/legalnotice-relnotes-ru.xml
+++ b/common/legalnotice-relnotes-ru.xml
@@ -2,7 +2,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-sv.xml b/common/legalnotice-relnotes-sv.xml
index cc8fd41..6bc91df 100644
--- a/common/legalnotice-relnotes-sv.xml
+++ b/common/legalnotice-relnotes-sv.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-sv.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-relnotes-uk.xml b/common/legalnotice-relnotes-uk.xml
index 6467811..22070eb 100644
--- a/common/legalnotice-relnotes-uk.xml
+++ b/common/legalnotice-relnotes-uk.xml
@@ -2,7 +2,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-ru.xml b/common/legalnotice-ru.xml
index 4264601..15901a3 100644
--- a/common/legalnotice-ru.xml
+++ b/common/legalnotice-ru.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "fedora-entities-ru.ent">
+<!ENTITY % FEDORA-ENTITIES-RU SYSTEM "entities/entities-ru.ent">
%FEDORA-ENTITIES-RU;
]>
diff --git a/common/legalnotice-section-de.xml b/common/legalnotice-section-de.xml
index 5d61236..d75d25d 100644
--- a/common/legalnotice-section-de.xml
+++ b/common/legalnotice-section-de.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-de.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-de.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-el.xml b/common/legalnotice-section-el.xml
index e984f50..3e59667 100644
--- a/common/legalnotice-section-el.xml
+++ b/common/legalnotice-section-el.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-el.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-el.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-en.xml b/common/legalnotice-section-en.xml
index 81086c8..4d046cc 100644
--- a/common/legalnotice-section-en.xml
+++ b/common/legalnotice-section-en.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "./fedora-entities-en.ent">
+ <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "./entities/entities-en_US.ent">
%FEDORA-ENTITIES-EN;
]>
diff --git a/common/legalnotice-section-en_US.xml b/common/legalnotice-section-en_US.xml
index 190fe63..93ef90c 100644
--- a/common/legalnotice-section-en_US.xml
+++ b/common/legalnotice-section-en_US.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-en_US.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-en_US.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-es.xml b/common/legalnotice-section-es.xml
index 742ff34..79a9d9e 100644
--- a/common/legalnotice-section-es.xml
+++ b/common/legalnotice-section-es.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-es.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-es.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-fr.xml b/common/legalnotice-section-fr.xml
index 13b49f7..3eaca77 100644
--- a/common/legalnotice-section-fr.xml
+++ b/common/legalnotice-section-fr.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-fr_FR.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-fr_FR.xml b/common/legalnotice-section-fr_FR.xml
index 13b49f7..3eaca77 100644
--- a/common/legalnotice-section-fr_FR.xml
+++ b/common/legalnotice-section-fr_FR.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-fr_FR.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-fr_FR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-it.xml b/common/legalnotice-section-it.xml
index a42615c..cd671f6 100644
--- a/common/legalnotice-section-it.xml
+++ b/common/legalnotice-section-it.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES-IT SYSTEM "./fedora-entities-it.ent">
+ <!ENTITY % FEDORA-ENTITIES-IT SYSTEM "./entities/entities-it.ent">
%FEDORA-ENTITIES-IT;
]>
diff --git a/common/legalnotice-section-nl.xml b/common/legalnotice-section-nl.xml
index e946e73..8b4777b 100644
--- a/common/legalnotice-section-nl.xml
+++ b/common/legalnotice-section-nl.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-nl.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-nl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-pl.xml b/common/legalnotice-section-pl.xml
index 8fc6892..e547754 100644
--- a/common/legalnotice-section-pl.xml
+++ b/common/legalnotice-section-pl.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-pl.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-pl.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-pt.xml b/common/legalnotice-section-pt.xml
index 19b88a1..9311cd1 100644
--- a/common/legalnotice-section-pt.xml
+++ b/common/legalnotice-section-pt.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-pt.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-pt.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-pt_BR.xml b/common/legalnotice-section-pt_BR.xml
index 68f614d..acf497f 100644
--- a/common/legalnotice-section-pt_BR.xml
+++ b/common/legalnotice-section-pt_BR.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-pt_BR.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-pt_BR.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-section-sv.xml b/common/legalnotice-section-sv.xml
index 0e38239..046fe03 100644
--- a/common/legalnotice-section-sv.xml
+++ b/common/legalnotice-section-sv.xml
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
- <!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-sv.ent">
+ <!ENTITY % FEDORA-ENTITIES SYSTEM "./entities/entities-sv.ent">
%FEDORA-ENTITIES;
]>
diff --git a/common/legalnotice-uk.xml b/common/legalnotice-uk.xml
index 8cbd34d..e1055c6 100644
--- a/common/legalnotice-uk.xml
+++ b/common/legalnotice-uk.xml
@@ -3,7 +3,7 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "fedora-entities-uk.ent">
+<!ENTITY % FEDORA-ENTITIES-UK SYSTEM "entities/entities-uk.ent">
%FEDORA-ENTITIES-UK;
]>