From a38149b622a5802078079da3c7fd87df35dbe04d Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 3 Aug 2010 08:02:53 +0000
Subject: [PATCH] OSX changes, default updates

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@664 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/docs/HOWTO.html | 38 +++++++++++++++++++++++---------------
 fhem/docs/fhem.html  |  8 +++++---
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/fhem/docs/HOWTO.html b/fhem/docs/HOWTO.html
index 052a6619e..953bebe61 100644
--- a/fhem/docs/HOWTO.html
+++ b/fhem/docs/HOWTO.html
@@ -43,12 +43,14 @@
 
 
     <a name="starting"></a>
-    <h3>Starting</h3>
+    <h3>Starting fhem</h3>
       <ul>
+      Skip this section if you installed fhem via the Debian package.<br><br>
+
       First install the Device::SerialPort (or Win32::SerialPort)  perl module
-      with the command <code>"cpan -i Device::SerialPort"</code></br>
-      The default configuration will install fhem into /usr/local/bin,
-      /usr/local/lib/FHEM and /var/log/fhem. Edit the Makefile to change
+      with the command <code>"sudo cpan Device::SerialPort"</code></br>
+      The default configuration will install fhem into /usr/bin,
+      /usr/share/fhem and /var/log/fhem. Edit the Makefile to change
       this. 
 
       To install & start fhem type:<pre>
@@ -69,17 +71,23 @@
 
 
     <a name="FHZ"></a>
-    <h3>Attaching an FHZ/CUL</h3>
+    <h3>Attaching the USB device for the PC (CUL / FHZ / EM1010PC)</h3>
       <ul>
-      Attach the FHZ1000 or FHZ1300 to your computer, and look for a file named
-      /dev/ttyUSB0 or /dev/tts/USB0 (or /var/elv on the Fritz!Box).
-      Define it for fhem (by typing it in the
-      "Fhem cmd" input field in the browser):<pre>
-      define FHZ1 FHZ /dev/ttyUSB0</pre>
-      You can find details <a href="commandref.html#define">here</a> and
-      <a href="commandref.html#FHZ">here</a>. Instead of an FHZ you can also
-      use a <a href="commandref.html#CUL">CUL</a> with slightly different
-      parameters (define CUL CUL /dev/ttyACM0 1234).
+      Attach the USB device (CUL, FHZ1000/FHZ1300, EM1010PC) to your computer,
+      and look for the corresponding device in the /dev directory.<br>
+      For CUL a file named /dev/ttyACM* will be created under Linux and
+      /dev/cu.usbmodem* under OSX. Note the exact name of the device.
+      Define it for fhem (by typing it in the "Fhem cmd" input field in the
+      browser):<pre>
+      define CUL1 CUL /dev/ttyACM0 1234</pre>
+
+      You can find details about CUL define parameters <a
+      href="commandref.html#CUL">here</a>.<br><br>
+
+
+      Instead of the CUL you can also use an <a
+      href="commandref.html#FHZ">FHZ</a> with slightly different parameters
+      (define FHZ1 FHZ /dev/ttyUSB0).
 
       <br><br>
       <b>Note:</b> Don't forget to type "save" in the "Fhem cmd" input field of
@@ -354,7 +362,7 @@
       See the <a href="commandref.html#devspec">devspec</a> paragraph for details.<br>
       For more complex scenarios consider the <a href="commandref.html#structure">
       structure</a> module. You can define different structure levels like
-      floors, buildings, etc. and set all elements of a gives structure at once.
+      floors, buildings, etc. and set all elements of a given structure at once.
       </ul>
 
   </div>
diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html
index 450b1d9c4..bb347b41f 100644
--- a/fhem/docs/fhem.html
+++ b/fhem/docs/fhem.html
@@ -278,17 +278,19 @@
       <li>Install <a href="http://www.koeniglich.de/fhem/fhem-=VERS=.deb">
           this</a> package, and connect to
           http://localhost:8083/fhem (or to http://localhost:8084/fhem for
-          smartphones)
+          smartphones). Follow the <a href="HOWTO.html">HOWTO</a> for adding
+          devices.
     </ul>
 
 
-    <h3>Unix/OSX</h3>
+    <h3>Unix / OSX</h3>
     <ul>
       <li>Make sure you have perl. Install the module Device::SerialPort with
-        "cpan Device::SerialPort"</li>
+        "sudo cpan Device::SerialPort"</li>
       <li>Check the Makefile for the installation path, then type make
         install-pgm2.</li>
       <li>Check the installed configuration file and start fhem as advised.
+      <li>Follow the <a href="HOWTO.html">HOWTO</a> for adding devices.
     </ul>
 
     <h3>Windows</h3>