changeset 9411:fe7edef5af47

features.xml reset; conf.xml merge
author gernotbelger
date Thu, 16 Aug 2018 10:04:54 +0200 (2018-08-16)
parents 52314c4ab3be
children 0fb76f2d4e5b
files artifacts/doc/conf/conf.xml gwt-client/src/main/webapp/WEB-INF/features.xml
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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>

http://dive4elements.wald.intevation.org