diff --git a/xdoc/maven.xml b/xdoc/maven.xml
index 144cdb22..053645cc 100644
--- a/xdoc/maven.xml
+++ b/xdoc/maven.xml
@@ -47,13 +47,13 @@
- ${basedir}/src/plugin-resources/xsd/maven-navigation-${currentRelease}.xsd
- ${basedir}/src/xsd/maven-navigation.xsd
+ ${basedir}/src/xsd/maven-navigation-${currentRelease}.xsd
+ ${basedir}/src/plugin-resources/xsd/maven-navigation.xsd
- ${basedir}/src/plugin-resources/dtd/maven-xdoc-${currentRelease}.dtd
- ${basedir}/src/dtd/maven-xdoc.dtd
+ ${basedir}/src/dtd/maven-xdoc-${currentRelease}.dtd
+ ${basedir}/src/plugin-resources/dtd/maven-xdoc.dtd
\ No newline at end of file
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 0fedef58..fc216f35 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -816,18 +816,8 @@
property="navigationFile.available"/>
-
-
-
-
-
-
-
-
-
-
@@ -861,20 +851,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
Using ${dtdFile} for validation
diff --git a/xdoc/src/dtd/README.txt b/xdoc/src/dtd/README.txt
index b6a22195..351a1bde 100644
--- a/xdoc/src/dtd/README.txt
+++ b/xdoc/src/dtd/README.txt
@@ -1,2 +1,9 @@
-We must edit maven-xdoc.dtd in the src/dtd directory but never maven-xdoc-${currentRelease}.dtd in ${plugin.resources}/dtd.
-We store maven-xdoc-${currentRelease}.dtd in the SCM to be able to re-publish them if necessary.
\ No newline at end of file
+We must edit maven-xdoc.dtd in the ${plugin.resources}/dtd directory
+but never maven-xdoc-${currentRelease}.dtd in src/dtd.
+
+Every time a new version of the plugin is released, we copy
+${plugin.resources}/dtd/maven-xdoc.dtd into
+src/dtd/maven-xdoc-${currentRelease}.dtd.
+
+We store maven-xdoc-${currentRelease}.dtd in the SCM to be able
+to re-publish them if necessary.
diff --git a/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd b/xdoc/src/dtd/maven-xdoc-1.10.dtd
similarity index 100%
rename from xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
rename to xdoc/src/dtd/maven-xdoc-1.10.dtd
diff --git a/xdoc/src/plugin-resources/dtd/DO_NOT_EDIT.txt b/xdoc/src/plugin-resources/dtd/DO_NOT_EDIT.txt
deleted file mode 100644
index b6a22195..00000000
--- a/xdoc/src/plugin-resources/dtd/DO_NOT_EDIT.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-We must edit maven-xdoc.dtd in the src/dtd directory but never maven-xdoc-${currentRelease}.dtd in ${plugin.resources}/dtd.
-We store maven-xdoc-${currentRelease}.dtd in the SCM to be able to re-publish them if necessary.
\ No newline at end of file
diff --git a/xdoc/src/plugin-resources/dtd/README.txt b/xdoc/src/plugin-resources/dtd/README.txt
new file mode 100644
index 00000000..69069be0
--- /dev/null
+++ b/xdoc/src/plugin-resources/dtd/README.txt
@@ -0,0 +1,9 @@
+We must edit maven-xdoc.dtd in the ${plugin.resources}/dtd directory
+but never maven-xdoc-${currentRelease}.dtd in src/dtd.
+
+Every time a new version of the plugin is released, we copy
+${plugin.resources}/dtd/maven-xdoc.dtd into
+src/dtd/maven-xdoc-${currentRelease}.dtd.
+
+We store maven-xdoc-${currentRelease}.dtd in the SCM to be able
+to re-publish them if necessary.
diff --git a/xdoc/src/dtd/maven-xdoc.dtd b/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
similarity index 100%
rename from xdoc/src/dtd/maven-xdoc.dtd
rename to xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
diff --git a/xdoc/src/plugin-resources/xsd/DO_NOT_EDIT.txt b/xdoc/src/plugin-resources/xsd/DO_NOT_EDIT.txt
deleted file mode 100644
index 7889364e..00000000
--- a/xdoc/src/plugin-resources/xsd/DO_NOT_EDIT.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-We must edit maven-navigation.xsd in the src/xsd directory but never maven-navigation-${currentRelease}.xsd in ${plugin.resources}/xsd.
-We store maven-navigation-${currentRelease}.xsd in the SCM to be able to re-publish them if necessary.
\ No newline at end of file
diff --git a/xdoc/src/plugin-resources/xsd/README.txt b/xdoc/src/plugin-resources/xsd/README.txt
new file mode 100644
index 00000000..c4f5739b
--- /dev/null
+++ b/xdoc/src/plugin-resources/xsd/README.txt
@@ -0,0 +1,9 @@
+We must edit maven-navigation.xsd in the ${plugin.resources}/xsd directory
+but never maven-navigation-${currentRelease}.xsd in src/xsd.
+
+Every time a new version of the plugin is released, we copy
+${plugin.resources}/xsd/maven-navigation.xsd into
+src/xsd/maven-navigation-${currentRelease}.xsd.
+
+We store maven-navigation-${currentRelease}.xsd in the SCM to be able
+to re-publish them if necessary.
diff --git a/xdoc/src/xsd/maven-navigation.xsd b/xdoc/src/plugin-resources/xsd/maven-navigation.xsd
similarity index 97%
rename from xdoc/src/xsd/maven-navigation.xsd
rename to xdoc/src/plugin-resources/xsd/maven-navigation.xsd
index 381d6057..9a9d88af 100644
--- a/xdoc/src/xsd/maven-navigation.xsd
+++ b/xdoc/src/plugin-resources/xsd/maven-navigation.xsd
@@ -1,102 +1,102 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xdoc/src/xsd/README.txt b/xdoc/src/xsd/README.txt
index 7889364e..96b7a023 100644
--- a/xdoc/src/xsd/README.txt
+++ b/xdoc/src/xsd/README.txt
@@ -1,2 +1,9 @@
-We must edit maven-navigation.xsd in the src/xsd directory but never maven-navigation-${currentRelease}.xsd in ${plugin.resources}/xsd.
-We store maven-navigation-${currentRelease}.xsd in the SCM to be able to re-publish them if necessary.
\ No newline at end of file
+We must edit maven-navigation.xsd in the ${plugin.resources}/xsd directory
+but never maven-navigation-${currentRelease}.xsd in src/xsd.
+
+Every time a new version of the plugin is released, we copy
+${plugin.resources}/xsd/maven-navigation.xsd into
+src/xsd/maven-navigation-${currentRelease}.xsd.
+
+We store maven-navigation-${currentRelease}.xsd in the SCM to be able
+to re-publish them if necessary.
\ No newline at end of file
diff --git a/xdoc/src/plugin-resources/xsd/maven-navigation-1.10.xsd b/xdoc/src/xsd/maven-navigation-1.10.xsd
similarity index 97%
rename from xdoc/src/plugin-resources/xsd/maven-navigation-1.10.xsd
rename to xdoc/src/xsd/maven-navigation-1.10.xsd
index 381d6057..9a9d88af 100644
--- a/xdoc/src/plugin-resources/xsd/maven-navigation-1.10.xsd
+++ b/xdoc/src/xsd/maven-navigation-1.10.xsd
@@ -1,102 +1,102 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+