Small fixes, preparing 4.7

git-svn-id: https://svn.fhem.de/fhem/trunk@449 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -493,7 +493,7 @@
   - feature: Cost Control in 15_CUL_EM (CostPerUnit, BasisFeePerMonth)
   - feature: add counter differential per time in 81_M232Counter.pm
   - feature: added USB compendium to documentation
-  - feature: pgm3: Documentation for pgm3 updated, HMS100CO added (and bugfixes)
+  - feature: pgm3: Documentation for pgm3 updated, HMS100CO added (and bugfix)
   - bugfix:  Defining a repeated at job in a sunrise/sunset at job fails
   - bugfix:  FHT "summer" fix (avoiding a lot of syncnow)
   - feature: FHEMWEB modules added
@@ -516,7 +516,7 @@
   - bugfix:  Reattached corrupted CUL device caused uninitialized message
   - bugfix:  CUL/HMS changes, HMS cleanup
   - bugfix:  EM/EMWZ/EMGZ set changed to work in FHEMWEB
-  - bugfix:  Avoid unitialized in xmllist for corrupt readings (reporter: Boris)
+  - bugfix:  Avoid unitialized in xmllist for corrupt readings, reporter Boris
   - bugfix:  Add binmode to 01_fhemweb.pm for windows
   - bugfix:  Uniform check for windows, enable CUL for windows.
   - bugfix:  CUL/HMS parsing patches from Peter
@@ -526,7 +526,7 @@
   - feature: suppress inplausible readings from USF1000
   - feature: get time, fwrev, set reopen for CM11 (Boris 2009-09-12)
   - bugfix:  FHZ_ReadAnswer bugfix for Windows (Klaus, 20.8.2009)
-  - feature: CUL: device acces code reorganized, TCP/IP support added
+  - feature: CUL: device access code reorganized, TCP/IP support added (CUN)
   - feature: Pachube module from Axel
   - feature: dumpdef module from Axel in contrib
   - feature: javascripting support in FHEMWEB (Klaus/Axel)

fhem/Makefile

@@ -2,8 +2,8 @@ BINDIR=/usr/local/bin
 MODDIR=/usr/local/lib
 VARDIR=/var/log/fhem
 
-VERS=4.6
+VERS=4.7
-DATE=2009-07-03
+DATE=2009-09-26
 
 all:
 	@echo Nothing to do for all.
@@ -39,8 +39,8 @@ install-base:
 dist:
 	@echo Version is $(VERS), Date is $(DATE)
 	mkdir .f
-	cp -r CHANGED FHEM HISTORY Makefile README.CVS em1010pc\
+	cp -r CHANGED FHEM HISTORY Makefile README.CVS\
-                TODO contrib docs examples fhem.pl test webfrontend .f
+                TODO contrib docs examples fhem.pl webfrontend .f
 	find .f -name CVS -print | xargs rm -rf
 	find .f -name \*.orig -print | xargs rm -f
 	find .f -name .#\* -print | xargs rm -f

fhem/docs/fritzbox.html

@@ -81,20 +81,23 @@
 <h3>Description for the Fritzbox 7270 from Volker</h3>
 <ul>
   <li>Unpack <a href="fb7270/fhem45-on-fritzbox.tgz">fhem45-on-fritzbox.tgz</a>
-    on the USB-Stick.<br><br>
+    to the USB-Stick.<br><br>
   <li>Attach the USB storage (stick) to the Fritz!Box. The Fritz!Box should
     recognize it. Now we have to modify usr/fhem/rc.fhem.<br><br>
-  <li>Login (via telnet) to the Fritz!Box<pre>
+  <li>Login (via telnet) to the Fritz!Box with the WEB-Password<pre>
     telnet fritz.box</pre>
-  <li>Edit usr/fhem/rc.fhem and adapt the mount point. This is in often 
+  <li>Change to the folder /var/media/ftp/*partition*/usr/fhem <br><br>
-    MassStorageDevice-Partition-0-1<br><br>
+  <li>Edit rc-cp.fhem with nvi<br>
-  <li>Start ./rc-cp.fhem in the Directory usr/fhem<br><br>
+    (i starts editing, ESC leaves edit mode, X deletes a character, :q! quits
-  <li>Either start it manually with<pre>
+    nvi without change, ; :wq saves and quits nvi)<br>
-    export LD_LIBRARY_PATH=/var/usr/lib
+    and adapt the mount point. This is often MassStorageDevice-Partition-0-1.
-    export PATH=/var/usr/bin:$PATH
+    This script will generate some links, makes a copy of .../usr/fhem to
-    perl fhem.pl fhem.conf</pre>
+    /var/usr/ and starts "perl fhem-celica.pl fhem.volker.conf" in the
-    or enable perl fhem.pl fhem.conf in rc.fhem and start it with ./rc.fhem
+    background.<br><br>
-    <br><br>
+  <li>Run ./rc-cp.fhem in the directory usr/fhem<br>
+    <b>Note:</b>After rebooting the Fritz!Box you will have run this script
+    again.<br><br>
+
 </ul>
 
 <h3>Links</h3>