From b14a07e9936d7568dba83b3ce3bbba0c10e10de7 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Thu, 16 Sep 2021 17:15:44 +0000
Subject: [PATCH] fhem.pl: document cleanups/6.1 preparations (Forum #122966)

git-svn-id: https://svn.fhem.de/fhem/trunk@24983 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_update.pm          | 3 ++-
 fhem/docs/commandref_frame.html | 4 ++--
 fhem/fhem.pl                    | 2 +-
 fhem/www/pgm2/f18style.css      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fhem/FHEM/98_update.pm b/fhem/FHEM/98_update.pm
index 743d0711c..81a708e25 100644
--- a/fhem/FHEM/98_update.pm
+++ b/fhem/FHEM/98_update.pm
@@ -301,7 +301,8 @@ doUpdate($$$$)
   }
 
   my $canJoin;
-  my $cmod = AttrVal('global', 'commandref', 'full');
+  my $cmod = AttrVal('global', 'commandref', 
+                        $featurelevel >= 6.1 ? 'modular' : 'full');
   my $cj = "$root/contrib/commandref_".
                 ($cmod eq "full" ? "join":"modular").".pl";
   if(-f $cj &&
diff --git a/fhem/docs/commandref_frame.html b/fhem/docs/commandref_frame.html
index cfa31e7a9..de533bfa5 100644
--- a/fhem/docs/commandref_frame.html
+++ b/fhem/docs/commandref_frame.html
@@ -584,7 +584,7 @@ attribute list if you want to know if a device supports these attributes.  <br>
     </li>
     <p>
 
-    <a name="event-min-interval">bla</a>
+    <a name="event-min-interval"></a>
     <li>event-min-interval<br>
     This attribute takes a comma-separated list of reading:minInterval pairs.
     You may use regular expressions for reading. Events will only be
@@ -1473,7 +1473,7 @@ The following local attributes are used by a wider range of devices:
       contains configuration errors and security issues collected at FHEM
       startup.
     </li><br>
-  <ul><br>
+  </ul><br>
 
   <b>Attributes</b>
   <ul>
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index af6124bd6..2d44f1931 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -334,7 +334,7 @@ my @globalAttrList = qw(
   dnsServer
   dupTimeout
   exclude_from_update
-  featurelevel:6.0,5.9,5.8,5.7,5.6,5.5,99.99
+  featurelevel:6.1,6.0,5.9,5.8,5.7,5.6,5.5,99.99
   genericDisplayType:switch,outlet,light,blind,speaker,thermostat
   holiday2we
   httpcompress:0,1
diff --git a/fhem/www/pgm2/f18style.css b/fhem/www/pgm2/f18style.css
index ae453f974..c4bc0c881 100644
--- a/fhem/www/pgm2/f18style.css
+++ b/fhem/www/pgm2/f18style.css
@@ -12,7 +12,7 @@ input.maininput { margin-left:10px; }
 }
 #menuBtn { position: absolute; top:6.5px; left:10px; width:32px; height:32px;
            display:none; }
-#textInput { position: absolute; top:6.5px; left:40px; width:32px; height:32px; }
+#textInput { position:absolute; top:6.5px; left:40px; width:32px; height:32px; }
 #hdr     { position: absolute; top:10px; left:72px; }
 #content { 
   position: absolute; top:50px; left:130px; bottom:0; right: 0;