[PATCH 3 of 3] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1404400882 -7200
# Branch facet-metadata
# Node ID 8922eda935eb6d34d2878a305e9c6e6ef44c8847
# Parent  60cd665b1bd6b77042797fe3266a54b7eed02018
# Parent  80e4aa6e9936b3a860ca70ad5e234cb2377034f9
merged.

diff -r 60cd665b1bd6 -r 8922eda935eb artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Jul 03 17:20:37 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Jul 03 17:21:22 2014 +0200
@@ -1786,7 +1786,7 @@
     </dc:macro>
 
     <dc:macro name="bed-heights-single-diff">
-      <dc:filter expr="not(contains(dc:lowercase($b1desc), 'epoche') or contains(dc:lowercase($b2desc), 'epoche'))">
+      <dc:filter expr="not(contains(dc:lowercase($b1desc), 'epoche'))">
         <years>
           <dc:call-macro name="minfo-heights-diff-tree"/>
         </years>
@@ -1794,7 +1794,7 @@
     </dc:macro>
 
     <dc:macro name="bed-heights-epoch-diff">
-      <dc:filter expr="contains(dc:lowercase($b1desc), 'epoche') and contains(dc:lowercase($b2desc), 'epoche')">
+      <dc:filter expr="contains(dc:lowercase($b1desc), 'epoche')">
         <epochs>
           <dc:call-macro name="minfo-heights-diff-tree"/>
         </epochs>