diff --git a/xdoc/src/plugin-resources/templates/scm-usage.xml b/xdoc/src/plugin-resources/templates/scm-usage.xml
index 38e2212e..0dac73de 100644
--- a/xdoc/src/plugin-resources/templates/scm-usage.xml
+++ b/xdoc/src/plugin-resources/templates/scm-usage.xml
@@ -64,6 +64,7 @@
##
## SCM-specific connections
##
+ #set ($connscm = 'noscm')
#if ($repository.connection && $repository.connection != '')
#set ($connscm = $scmUtil.getScmType($repository.connection))
#end
diff --git a/xdoc/src/plugin-resources/templates/scm/noscm.xml b/xdoc/src/plugin-resources/templates/scm/noscm.xml
new file mode 100644
index 00000000..7ce5532b
--- /dev/null
+++ b/xdoc/src/plugin-resources/templates/scm/noscm.xml
@@ -0,0 +1,10 @@
+
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index 3dcc25da..ba1bb092 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -26,6 +26,10 @@ template.scm_usage.section1.no_repository=No source configuration management sys
template.scm_usage.section2.title=Web Access
template.scm_usage.section2.description=This is a link to the online source repository that can be viewed via a web browser:
+# For noscm.xml
+template.noscm.section1.title=SCM connections
+template.noscm.section1.part1=No SCM connection is defined. Please check back at a later date.
+
# For cvs.xml
template.cvs.section2.title=Source Repository
template.cvs.section2.part1=This project uses
diff --git a/xdoc/src/plugin-resources/templates/templates_de.properties b/xdoc/src/plugin-resources/templates/templates_de.properties
index 9d079406..2d49e96c 100644
--- a/xdoc/src/plugin-resources/templates/templates_de.properties
+++ b/xdoc/src/plugin-resources/templates/templates_de.properties
@@ -26,6 +26,10 @@ template.scm_usage.section1.no_repository=Es wurde kein SCM f
template.scm_usage.section2.title=Zugriff über das Web
template.scm_usage.section2.description=Hier ist ein Link zum Quellcode Repertoir zum direkten Zugriff mit einem Web Browser:
+# For noscm.xml
+template.noscm.section1.title=SCM Verbindungen
+template.noscm.section1.part1=Es wurden keine SCM Verbindungen definiert. Bitte schauen Sie später nochmals rein.
+
# For cvs.xml
template.cvs.section2.title=Quellcode Archiv
template.cvs.section2.part1=Dieses Projekt verwendet
diff --git a/xdoc/src/plugin-resources/templates/templates_fr.properties b/xdoc/src/plugin-resources/templates/templates_fr.properties
index 1f12b88e..d510725b 100644
--- a/xdoc/src/plugin-resources/templates/templates_fr.properties
+++ b/xdoc/src/plugin-resources/templates/templates_fr.properties
@@ -26,6 +26,10 @@ template.scm_usage.section1.no_repository=Aucun gestionnaire de version de fichi
template.scm_usage.section2.title=Accès Web
template.scm_usage.section2.description=C'est un lien au dépôt de sources en ligne qui peut être regardé par l'intermédiaire d'un browser Web.
+# For noscm.xml
+template.noscm.section1.title=Connexions SCM
+template.noscm.section1.part1=Aucune connexion SCM n'est défini.
+
# For cvs.xml
template.cvs.section2.title=Dépôt de sources
template.cvs.section2.part1=Ce projet utilise
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index e2d998ca..f78c3391 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
+ Report fails if there is no connection element in repository.
Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]").
Update dom4j and jelly dependencies to match the ones in maven 1.1 core.
Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1, jaxen v1.0-FCS-full to 1.1-beta-9.