[PATCH 1 of 2] features.xml reset; conf.xml merge

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1534406694 -7200
# Node ID fe7edef5af47ffe8346036f0de30f5dace5dfd79
# Parent  52314c4ab3bed96ed6597d4dcae76f78d7315b83
features.xml reset; conf.xml merge

diff -r 52314c4ab3be -r fe7edef5af47 artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml	Thu Aug 16 09:43:55 2018 +0200
+++ b/artifacts/doc/conf/conf.xml	Thu Aug 16 10:04:54 2018 +0200
@@ -404,5 +404,5 @@
     </options>
 
     <!-- base url for online help. -->
-    <help-url>http://example.com</help-url>
+    <help-url>https://flys3.bafg.de/wiki</help-url>
 </artifact-database>
diff -r 52314c4ab3be -r fe7edef5af47 gwt-client/src/main/webapp/WEB-INF/features.xml
--- a/gwt-client/src/main/webapp/WEB-INF/features.xml	Thu Aug 16 09:43:55 2018 +0200
+++ b/gwt-client/src/main/webapp/WEB-INF/features.xml	Thu Aug 16 10:04:54 2018 +0200
@@ -10,8 +10,6 @@
     <ftr:feature>module:new_chart</ftr:feature>
     <ftr:feature>module:fixanalysis</ftr:feature>
     <ftr:feature>river:Beispielfluss</ftr:feature>
-    <ftr:feature>river:Elbe</ftr:feature>
-    <ftr:feature>river:Rhein</ftr:feature>
   </ftr:role>
   <ftr:role name="d4e_demo_extern">
     <ftr:feature>module:winfo</ftr:feature>