Index: trunk/BNC/bnchelp.html
===================================================================
--- trunk/BNC/bnchelp.html	(revision 1542)
+++ trunk/BNC/bnchelp.html	(revision 1543)
@@ -276,5 +276,5 @@
 </p>
 <p>
-However, sometimes public RINEX header skeleton files are not available, its contents is not up to date, or you need to put additional/optional records in the RINEX header. For that BNC allows using personal skeleton files that contain the header records you would like to include. You can derive a personal RINEX header skeleton file from the information given in an up to date sitelog. A file in the RINEX 'Directory' with a 'Skeleton extension' is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream.
+However, sometimes public RINEX header skeleton files are not available, its contents is not up to date, or you need to put additional/optional records in the RINEX header. For that BNC allows using personal skeleton files that contain the header records you would like to include. You can derive a personal RINEX header skeleton file from the information given in an up to date sitelog. A file in the RINEX Observations 'Directory' with a 'Skeleton extension' suffix is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream.
 </p>
 <p>
@@ -287,5 +287,5 @@
 BRUS_1.skl</p>
 <p>
-if RINEX 'Skeleton extension' is set to 'skl'.
+if 'Skeleton extension' is set to 'skl'.
 </p> 
 <p> 
@@ -1174,52 +1174,55 @@
 <p><a name="config"><h4>8.4. Configuration Example</h4></p>
 <p>
-The following is an example for the contents of a configuration file 'BNC.ini'. It enables the retrieval of stream ACOR0 form www.euref-ip.net and FFMJ3 from www.igs-ip.net for the generation of 15 min RINEX files. RINEX files are uploaded to an archive using script 'up2archive' :
-<pre>
-[General]
-adviseFail=15
-adviseReco=5
-adviseScript=
-autoStart=0
-binSampl=0
-casterUrlList=http://user:pass@euref-ip:2101
-corrIntr=1 day
-corrPath=
-corrPort=
-corrTime=5
-ephIntr=15 min
-ephPath=/home/usr/rinex
-ephV3=2
-logFile=/home/weber/bnc.log
-makePause=0
-miscMount=
-mountPoints=//user:pass@www.euref-ip.net:2101/ACOR0 RTCM_2.3 43.36 351.60 no 1, //user:pass@www.igs-ip.net:2101/FFMJ3 RTCM_3.0 41.58 1.40 no 1
-ntripVersion=1
-obsRate=
-onTheFlyInterval=1 day
-outEphPort=
-outFile=
-outPort=
-outUPort=
-perfIntr=
-proxyHost=
-proxyPort=
-rnxAppend=2
-rnxIntr=15 min
-rnxPath=/home/user/rinex
-rnxSampl=0
-rnxScript=/home/user/rinex/up2archive
-rnxSkel=
-rnxV3=0
-scanRTCM=0
-serialAutoNMEA=0
-serialBaudRate=9600
-serialDataBits=8
-serialMountPoint=
-serialParity=NONE
-serialPortName=
-serialStopBits=1
-startTab=8
-waitTime=5
-</pre>
+The following table's left column is an example for the contents of a configuration file 'BNC.ini'. It enables the retrieval of stream ACOR0 form www.euref-ip.net for the generation of 15 min RINEX files. RINEX files are uploaded to an archive using script 'up2archive' :
+</p>
+<table>
+<tr></tr>
+<tr><td><b>Option</b></td><td><b>Affiliation</b></td></tr>
+<tr><td>[General]</td><td>Settings: Group</td></tr>
+<tr><td>adviseFail=15</td><td>Outages: Failure threshold</td></tr>
+<tr><td>adviseReco=5</td><td>Outages: Recovery threshold</td></tr>
+<tr><td>adviseScript=</td><td>Outages: Script (full path)</td></tr>
+<tr><td>autoStart=0</td><td>General: Auto start</td></tr>
+<tr><td>binSample=0</td><td>Feed Engine: Sampling</td></tr>
+<tr><td>casterUrlList=http://user:pass@euref-ip:2101</td><td>Internal memory: Visited caster URLs</td></tr>
+<tr><td>corrIntr=1 day</td><td>Ephemeris Corrections: Interval</td></tr>
+<tr><td>corrPath=</td><td>Ephemeris Corrections: Directory </td></tr>
+<tr><td>corrPort=</td><td>Ephemeris Corrections: Port</td></tr>
+<tr><td>corrTime=5</td><td>Ephemeris Corrections: Wait for full epoch</td></tr>
+<tr><td>ephIntr=15 min</td><td>RINEX Ephemeris: Interval</td></tr>
+<tr><td>ephPath=</td><td>RINEX Ephemeris: Directory</td></tr>
+<tr><td>ephV3=0</td><td>RINEX Ephemeris: Version 3</td></tr>
+<tr><td>logFile=/home/weber/bnc.log</td><td>General: Logfile (full path)</td></tr>
+<tr><td>makePause=0</td><td>Outages: Pause</td></tr>
+<tr><td>miscMount=</td><td>Miscellaneous: Mountpoint</td></tr>
+<tr><td>mountPoints=//user:pass@www.euref-ip.net:2101<br>/ACOR0 RTCM_2.3 43.36 351.60 no 1</td><td>Streams: broadcaster:port/mountpoint</td></tr>
+<tr><td>ntripVersion=1</td><td>Add Streams: NTRIP Version</td></tr>
+<tr><td>obsRate=</td><td>Outages: Observation rate</td></tr>
+<tr><td>onTheFlyInterval=1 day</td><td>General: Reread configuration</td></tr>
+<tr><td>outEphPort=</td><td>RINEX Ephemeris: Port</td></tr>
+<tr><td>outFile=</td><td>Feed Engine: File (full path)</td></tr>
+<tr><td>outPort=</td><td>Feed Engine: Port</td></tr>
+<tr><td>outUPort=</td><td>Feed Engine: Port (unsynchronized)</td></tr>
+<tr><td>perfIntr=</td><td>Miscellaneous: Log latency</td></tr>
+<tr><td>proxyHost=</td><td>Proxy: Proxy host</td></tr>
+<tr><td>proxyPort=</td><td>Proxy: Proxy port</td></tr>
+<tr><td>rnxAppend=2</td><td>General: Append files</td></tr>
+<tr><td>rnxIntr=15 min</td><td>RINEX Observations: Interval</td></tr>
+<tr><td>rnxPath=/home/user/rinex</td><td>RINEX Observations: Directory</td></tr>
+<tr><td>rnxSample=0</td><td>RINEX Observations: Sampling</td></tr>
+<tr><td>rnxScript=/home/user/rinex/up2archive</td><td>RINEX Observations: Script (full path)</td></tr>
+<tr><td>rnxSkel=</td><td>RINEX Observations: Skeleton extension</td></tr>
+<tr><td>rnxV3=0</td><td>RINEX Observation: Version 3</td></tr>
+<tr><td>scanRTCM=0</td><td>Miscellaneous: Scan RTCM</td></tr>
+<tr><td>serialAutoNMEA=0</td><td>Serial Link: Auto NMEA</td></tr>
+<tr><td>serialBaudRate=9600</td><td>Serial Link: Baud rate</td></tr>
+<tr><td>serialDataBits=8</td><td>Serial Link: Data bits</td></tr>
+<tr><td>serialMountPoint=</td><td>Serial Link: Mountpoint</td></tr>
+<tr><td>serialParity=NONE</td><td>Serial Link: Parity</td></tr>
+<tr><td>serialPortName=</td><td>Serial Link: Port name</td></tr>
+<tr><td>serialStopBits=1</td><td>Serial Link: Stop bits</td></tr>
+<tr><td>startTab=0</td><td>Internal memory: Last shown tab</td></tr>
+<tr><td>waitTime=5</td><td>Feed Engine: Wait for full epoch</td></tr>
+</table>
 </p>
 <p>
@@ -1229,6 +1232,6 @@
 <ul>
 <li>'mountPoints' to change the selection of streams to be processed, see section 'Streams',</li>
-<li>'waitTime' to change the 'Wait for full epoch' option, see section 'Synchronized Observations', and</li>
-<li>'binSampl' to change the 'Sampling' option, see section 'Synchronized Observations'.</li>
+<li>'waitTime' to change the 'Wait for full epoch' option, see section 'Feed Engine', and</li>
+<li>'binSampl' to change the 'Sampling' option, see section 'Feed Engine'.</li>
 </ul>
 </p>
Index: trunk/BNC/bncwindow.cpp
===================================================================
--- trunk/BNC/bncwindow.cpp	(revision 1542)
+++ trunk/BNC/bncwindow.cpp	(revision 1543)
@@ -321,5 +321,5 @@
   _corrPathLineEdit->setWhatsThis(tr("Specify a directory for saving Broadcast Ephemeris Correction files. If the specified directory does not exist, BNC will not create the files."));
   _rnxScrpLineEdit->setWhatsThis(tr("<p>Whenever a RINEX Observation file is saved, you might want to compress, copy or upload it immediately via FTP. BNC allows you to execute a script/batch file to carry out these operations. To do that specify the full path of the script/batch file here. BNC will pass the full RINEX Observation file path to the script as a command line parameter (%1 on Windows systems, $1 onUnix/Linux systems).</p>"));
-  _rnxSkelLineEdit->setWhatsThis(tr("<p>BNC allows using personal skeleton files that contain the header records you would like to include. You can derive a personal RINEX header skeleton file from the information given in an up to date sitelog. A file in the RINEX 'Directory' with the RINEX 'Skeleton extension' is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream.</p>"));
+  _rnxSkelLineEdit->setWhatsThis(tr("<p>BNC allows using personal skeleton files that contain the header records you would like to include. You can derive a personal RINEX header skeleton file from the information given in an up to date sitelog.</p><p>A file in the RINEX Observations 'Directory' with a 'Skeleton extension' suffix is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream.</p>"));
   _rnxAppendCheckBox->setWhatsThis(tr("<p>When BNC is started, new files are created by default and any existing files with the same name will be overwritten. However, users might want to append already existing files following a restart of BNC, a system crash or when BNC crashed. Tick 'Append files' to continue with existing files and keep what has been recorded so far.</p>"));
   _autoStartCheckBox->setWhatsThis(tr("<p>Tick 'Auto start' for auto-start of BNC at startup time in window mode with preassigned processing options.</p>"));
