Index: trunk/BNC/src/bncmain.cpp
===================================================================
--- trunk/BNC/src/bncmain.cpp	(revision 7506)
+++ trunk/BNC/src/bncmain.cpp	(revision 7507)
@@ -92,30 +92,30 @@
       "           proxyPort       <Proxy port [integer number]>\n"
       "           sslCaCertPath   <Full path to SSL certificates [character string]>\n"
-      "           ignoreSslErrors <Ignore SSL authorization errors [integer number: 0=no, 2=yes]>\n"
+      "           ignoreSslErrors <Ignore SSL authorization errors [integer number: 0=no,2=yes]>\n"
       "\n"
       "General Panel keys:\n"
       "           logFile          <Logfile, full path [character string]>\n"
-      "           rnxAppend        <Append files [integer number: 0=no, 2=yes]>\n"
-      "           onTheFlyInterval <Configuration reload interval [character string: 1 day,1 hour,5 min,1 min]>\n"
-      "           autoStart        <Auto start [integer number: 0=no, 2=yes]>\n"
+      "           rnxAppend        <Append files [integer number: 0=no,2=yes]>\n"
+      "           onTheFlyInterval <Configuration reload interval [character string: 1 day|1 hour|5 min|1 min]>\n"
+      "           autoStart        <Auto start [integer number: 0=no,2=yes]>\n"
       "           rawOutFile       <Raw output file, full path [character string]>\n"
       "\n"
       "RINEX Observations Panel keys:\n"
       "           rnxPath        <Directory [character string]>\n"
-      "           rnxIntr        <File interval [character string: 1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day]>\n"
+      "           rnxIntr        <File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]>\n"
       "           rnxSampl       <File sampling rate [integer number of seconds: 0,5|10|15|20|25|30|35|40|45|50|55|60]> \n"
       "           rnxSkel        <RINEX skeleton file extension [character string]>\n"
-      "           rnxOnlyWithSKL <Using RINEX skeleton file is mandatory [integer number: 0=no, 2=yes]>\n"
+      "           rnxOnlyWithSKL <Using RINEX skeleton file is mandatory [integer number: 0=no,2=yes]>\n"
       "           rnxScript      <File upload script, full path [character string]>\n"
       "           rnxV2Priority  <Priority of signal attributes [character string, list separated by blank character, example: G:CWPX_? R:CP]>\n"
-      "           rnxV3          <Produce version 3 file contents [integer number: 0=no, 2=yes]>\n"
-      "           rnxV3filenames <Produce version 3 filenames [integer number: 0=no, 2=yes]>\n"
+      "           rnxV3          <Produce version 3 file contents [integer number: 0=no,2=yes]>\n"
+      "           rnxV3filenames <Produce version 3 filenames [integer number: 0=no,2=yes]>\n"
       "\n"
       "RINEX Ephemeris Panel keys:\n"
       "           ephPath        <Directory [character string]>\n"
-      "           ephIntr        <File interval [character string: 1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day]>\n"
+      "           ephIntr        <File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]>\n"
       "           ephOutPort     <Output port [integer number]>\n"
-      "           ephV3          <Produce version 3 file contents [integer number: 0=no, 2=yes]>\n"
-      "           ephV3filenames <Produce version 3 filenames [integer number: 0=no, 2=yes]>\n"
+      "           ephV3          <Produce version 3 file contents [integer number: 0=no,2=yes]>\n"
+      "           ephV3filenames <Produce version 3 filenames [integer number: 0=no,2=yes]>\n"
       "\n"
       "RINEX Editing and QC Panel keys:\n"
@@ -126,5 +126,5 @@
       "           reqcOutNavFile        <Output navigation file, full path [character string]>\n"
       "           reqcOutLogFile        <Output logfile, full path [character string]>\n"
-      "           reqcLogSummaryOnly    <Output only summary of logfile [integer number: 0=no, 2=yes]>\n"
+      "           reqcLogSummaryOnly    <Output only summary of logfile [integer number: 0=no,2=yes]>\n"
       "           reqcSkyPlotSignals    <Observation signals [character string, list separated by blank character, example: C:2&7 E:1&5 G:1&2 J:1&2 R:1&2 S:1&5]>\n"
       "           reqcPlotDir           <QC plots directory [character string]>\n"
@@ -161,5 +161,5 @@
       "Broadcast Corrections Panel keys:\n"
       "           corrPath <Directory for saving files in ASCII format [character string]>\n"
-      "           corrIntr <File interval [character string: 1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day]>\n"
+      "           corrIntr <File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]>\n"
       "           corrPort <Output port [integer number]>\n"
       "\n"
@@ -192,97 +192,103 @@
       "Miscellaneous Panel keys:\n"
       "           miscMount    <Mountpoint [character string]>\n"
-      "           miscIntr     <Interval for logging latency [character string: 2 sec,10 sec,1 min,5 min,15 min,1 hour,6 hours,1 day]>\n"
-      "           miscScanRTCM <Scan for RTCM message numbers [integer number: 0=no, 2=yes]>\n"
+      "           miscIntr     <Interval for logging latency [character string: Blank|2 sec|10 sec|1 min|5 min|15 min|1 hour|6 hours|1 day]>\n"
+      "           miscScanRTCM <Scan for RTCM message numbers [integer number: 0=no,2=yes]>\n"
       "           miscPort     <Output port [integer number]>\n"
       "\n"
       "PPP Client Panel 1 keys:\n"
-      "           PPP/dataSource  <Data source, Real-Time Streams| RINEX Files>\n"
-      "           PPP/rinexObs    <RINEX observation file>\n"
-      "           PPP/rinexNav    <RINEX navigation file>\n"
-      "           PPP/corrMount   <Corrections mountpoint>\n"
-      "           PPP/corrFile    <Corrections file>\n"
-      "           PPP/crdFile     <Coordinates file>\n"
-      "           PPP/antexFile   <ANTEX file>\n"
-      "           PPP/logPath     <Directory for PPP log file>\n"
-      "           PPP/nmeaPath    <Directory for NMEA output file>\n"
-      "           PPP/snxtroPath  <Directory for SINEX troposphere output file>\n"
-      "           PPP/v3filenames <Produce version 3 filenames, 0=no, 2=yes>\n"
-      "           PPP/snxtroIntr  <SINEX troposphere file interval [character string: 1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day]>\n"
-      "           PPP/snxtroSampl <SINEX troposphere file sampling rate [integer number of seconds: 0,30,60,90,120,150,180,210,240,270,300]>\n"
+      "           PPP/dataSource  <Data source [character string: Blank|Real-Time Streams|RINEX Files]>\n"
+      "           PPP/rinexObs    <RINEX observation file, full path [character string]>\n"
+      "           PPP/rinexNav    <RINEX navigation file, full path [character string]>\n"
+      "           PPP/corrMount   <Corrections mountpoint [character string]>\n"
+      "           PPP/corrFile    <Corrections file, full path [character string]>\n"
+      "           PPP/crdFile     <Coordinates file, full path [character string]>\n"
+      "           PPP/logPath     <Directory for PPP log files [character string]>\n"
+      "           PPP/antexFile   <ANTEX file, full path [character string]>\n"
+      "           PPP/nmeaPath    <Directory for NMEA output files [character string]>\n"
+      "           PPP/snxtroPath  <Directory for SINEX troposphere output files [character string]>\n"
+      "           PPP/v3filenames <Produce version 3 filenames, 0=no,2=yes>\n"
+      "           PPP/snxtroIntr  <SINEX troposphere file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]>\n"
+      "           PPP/snxtroSampl <SINEX troposphere file sampling rate [integer number of seconds: 0|30|60|90|120|150|180|210|240|270|300]>\n"
       "\n"
       "PPP Client Panel 2 keys:\n"
-      "           PPP/staTable <Stations table, semicolon separated list>\n"
+      "           PPP/staTable <Station specifications table [character string, semicolon separated list, each element in quotaion marks, example:\n"
+      "                        \"FFMJ1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777\";\"CUT07,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"]>\n"
       "\n"
       "PPP Client Panel 3 keys:\n"
-      "           PPP/lcGPS        <Select linear combination from GPS code or phase data>\n"
-      "           PPP/lcGLONASS    <Select linear combination from GLONASS code or phase data>\n"
-      "           PPP/lcGalileo    <Select linear combination from Galileo code or phase data>\n"
-      "           PPP/lcBDS        <Select linear combination from BDS code or phase data>\n"
-      "           PPP/sigmaC1      <Sigma for code observations [m]>\n"
-      "           PPP/sigmaL1      <Sigma for phase observations [m]>\n"
-      "           PPP/maxResC1     <Maximal residuum for code observations [m]>\n"
-      "           PPP/maxResL1     <Maximal residuum for phase observations [m]>\n"
-      "           PPP/eleWgtCode   <Elevation dependent waiting of code observations, 0=no, 2=yes>\n"
-      "           PPP/eleWgtPhase  <Elevation dependent waiting of phase observations, 0=no, 2=yes>\n"
-      "           PPP/minObs       <Minimum number of observations>\n"
-      "           PPP/minEle       <Minimum elevation [deg]>\n"
-      "           PPP/corrWaitTime <Wait for clock corrections [sec]>\n"
-      "           PPP/seedingTime  <Seeding time span for Quick Start [sec]>\n"
+      "           PPP/lcGPS        <Select linear combination from GPS code or phase data [character string; P3|P3&L3]>\n"
+      "           PPP/lcGLONASS    <Select linear combination from GLONASS code or phase data [character string: no|P3|L3|P3&L3]>\n"
+      "           PPP/lcGalileo    <Select linear combination from Galileo code or phase data [character string: no|P3|L3|P3&L3]>\n"
+      "           PPP/lcBDS        <Select linear combination from BDS code or phase data [character string: no|P3|L3|P3&L3]>\n"
+      "           PPP/sigmaC1      <Sigma for code observations in meters [floating-point number]>\n"
+      "           PPP/sigmaL1      <Sigma for phase observations in meters [floating-point number]>\n"
+      "           PPP/maxResC1     <Maximal residuum for code observations in meters [floating-point number]>\n"
+      "           PPP/maxResL1     <Maximal residuum for phase observations in meters [floating-point number]>\n"
+      "           PPP/eleWgtCode   <Elevation dependent waiting of code observations [integer number: 0=no,2=yes]>\n"
+      "           PPP/eleWgtPhase  <Elevation dependent waiting of phase observations [integer number: 0=no,2=yes]>\n"
+      "           PPP/minObs       <Minimum number of observations [integer number: 4|5|6]>\n"
+      "           PPP/minEle       <Minimum satellite elevation in degrees [integer number: 0-20]>\n"
+      "           PPP/corrWaitTime <Wait for clock corrections [integer number of seconds: no|1-20]>\n"
+      "           PPP/seedingTime  <Seeding time span for Quick Start [integer number of seconds]>\n"
       "\n"
       "PPP Client Panel 4 keys:\n"
-      "           PPP/plotCoordinates  <Mountpoint for time series plot>\n"
-      "           PPP/audioResponse    <Audio response threshold [m]>\n"
-      "           PPP/useOpenStreetMap <OSM track map, true|false>\n"
-      "           PPP/useGoogleMap     <Google track map, true|false>\n"
-      "           PPP/mapWinDotSize    <Size of dots on map>\n"
-      "           PPP/mapWinDotColor   <Color of dots and cross hair on map, red|yellow>\n"
-      "           PPP/mapSpeedSlider   <Offline processing speed for mapping, 1-100>\n"
+      "           PPP/plotCoordinates  <Mountpoint for time series plot [character string]>\n"
+      "           PPP/audioResponse    <Audio response threshold in meters [floating-point number]>\n"
+      "           PPP/useOpenStreetMap <OSM track map [character string: true|false]>\n"
+      "           PPP/useGoogleMap     <Google track map [character string: true|false]>\n"
+      "           PPP/mapWinDotSize    <Size of dots on map [integer number: 0-10]>\n"
+      "           PPP/mapWinDotColor   <Color of dots and cross hair on map [character string: red|yellow]>\n"
+      "           PPP/mapSpeedSlider   <Offline processing speed for mapping [integer number: 1-100]>\n"
       "\n"
       "Combine Corrections Panel keys:\n"
-      "           cmbStreams      <Correction streams, semicolon separated list>\n"
-      "           cmbMethodFilter <Approach, Single-Epoch|Filter\n"
-      "           cmbMaxres       <Clock outlier threshold [m]\n"
-      "           cmbSampl        <Orbit and clock sampling [m]\n"
-      "           cmbUseGlonass   <Use GLONASS in combination, 0=no, 2=yes\n"
+      "           cmbStreams      <Correction streams table [character string, semicolon separated list, each element in quotation marks, example:\n"
+      "                           \"IGS01 ESA 1.0\";\"IGS03 BKG 1.0\"]>\n"
+      "           cmbMethodFilter <Combination approach [character string: Single-Epoch|Filter]\n"
+      "           cmbMaxres       <Clock outlier residuum threshold in meters [floating-point number]\n"
+      "           cmbSampl        <Clock sampling rate [integer number of seconds: 10|20|30|40|50|60]>\n"
+      "           cmbUseGlonass   <Use GLONASS in combination [integer number: 0=no,2=yes]\n"
       "\n"
       "Upload Corrections Panel keys:\n"
-      "           uploadMountpointsOut   <Upload corrections table>\n"
-      "           uploadIntr             <File interval, length of SP3 and Clock RINEX files>\n"
-      "           uploadSamplRtcmEphCorr <Orbit corrections sampling interval [sec]>\n"
-      "           uploadSamplSp3         <SP3 file sampling [min]>\n"
-      "           uploadSamplClkRnx      <Clock RINEX file sampling [sec]>\n"
+      "           uploadMountpointsOut   <Upload corrections table [character string, semicolon separated list, each element in quotation marks, example:\n"
+      "                                  \"www.igs-ip.net,2101,IGS01,pass,IGS08,0,/home/user/BNC$[GPSWD}.sp3,/home/user/BNC$[GPSWD}.clk,258,1,0,0 byte(s)\";\n"
+      "                                  \"www.euref-ip.net,2101,EUREF01,pass,ETRF2000,0,,,258,2,0,0 byte(s)\"]>\n"
+      "           uploadIntr             <Length of SP3 and Clock RINEX file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]>\n"
+      "           uploadSamplRtcmEphCorr <Orbit corrections stream sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]>\n"
+      "           uploadSamplSp3         <SP3 file sampling rate [integer number of minutes: 0-15]>\n"
+      "           uploadSamplClkRnx      <Clock RINEX file sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]>\n"
       "\n"
       "Custom Trafo keys:\n"
-      "           trafo_dx  <Translation X [m]>\n"
-      "           trafo_dy  <Translation Y [m]>\n"
-      "           trafo_dz  <Translation Z [m]>\n"
-      "           trafo_dxr <Translation change X [m/y]>\n"
-      "           trafo_dyr <Translation change Y [m/y]>\n"
-      "           trafo_dzr <Translation change Z [m/y]>\n"
-      "           trafo_ox  <Rotation X [as]>\n"
-      "           trafo_oy  <Rotation Y [as]>\n"
-      "           trafo_oz  <Rotation Z [as]>\n"
-      "           trafo_oxr <Rotation change X [as/y]>\n"
-      "           trafo_oyr <Rotation change Y [as/y]>\n"
-      "           trafo_ozr <Rotation change Z [as/y]>\n"
-      "           trafo_sc  <Scale [10^-9]>\n"
-      "           trafo_scr <Scale change [10^-9/y]>\n"
-      "           trafo_t0  <Reference year [y]>\n"
+      "           trafo_dx  <Translation X in meters [floating-point number]\n"
+      "           trafo_dy  <Translation Y in meters [floating-point number]\n"
+      "           trafo_dz  <Translation Z in meters [floating-point number]\n"
+      "           trafo_dxr <Translation change X in meters per year [floating-point number]\n"
+      "           trafo_dyr <Translation change Y in meters per year [floating-point number]\n"
+      "           trafo_dzr <Translation change Z in meters per year [floating-point number]\n"
+      "           trafo_ox  <Rotation X in arcsec [floating-point number]>\n"
+      "           trafo_oy  <Rotation Y in arcsec [floating-point number]>\n"
+      "           trafo_oz  <Rotation Z in arcsec [floating-point number]>\n"
+      "           trafo_oxr <Rotation change X in arcsec per year [floating-point number]>\n"
+      "           trafo_oyr <Rotation change Y in arcsec per year [floating-point number]>\n"
+      "           trafo_ozr <Rotation change Z in arcsec per year [floating-point number]>\n"
+      "           trafo_sc  <Scale [10^-9, floating-point number]>\n"
+      "           trafo_scr <Scale change [10^-9 per year, floating-point number]>\n"
+      "           trafo_t0  <Reference year [integer number]>\n"
       "\n"
       "Upload Ephemeris Panel keys:\n"
-      "           uploadEphHost       <Host>\n"
-      "           uploadEphPort       <Port>\n"
-      "           uploadEphMountpoint <Mountpoint>\n"
-      "           uploadEphPassword   <Password>\n"
-      "           uploadEphSample     <Sampling interval [sec]>\n"
+      "           uploadEphHost       <Broadcaster host, name or IP address [character string]>\n"
+      "           uploadEphPort       <Broadcaster port [integer number]>\n"
+      "           uploadEphMountpoint <Mountpoint [character string]>\n"
+      "           uploadEphPassword   <Stream upload password [character string]>\n"
+      "           uploadEphSample     <Stream upload sampling rate [integer number of seconds: 5|10|15|20|25|30|35|40|45|50|55|60]>\n"
       "\n"
       "Add Stream keys:\n"
-      "           mountPoints  <Mountpoints, semicolon separated list>\n"
-      "           ntripVersion <Ntrip Version, 1|2|2s|R|U>\n"
-      "           casterUrlList <Visited URLs>\n"
+      "           mountPoints   <Mountpoints [character string, semicolon separated list, example:\n"
+      "                         //user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2;\n"
+      "                         //user:pass@www.igs-ip.net:2101/FFMJ2 RTCM_3.1 DEU 50.09 8.66 no 2>\n"
+      "           ntripVersion  <Ntrip Version [character string: 1|2|2s|R|U]>\n"
+      "           casterUrlList <Visited Broadcasters [character string, comma separated list]>\n"
       "\n"
       "Note:\n"
       "Configuration options which contain one or more blank characters"
-      " must be enclosed by quotation marks when specified on the command line.\n"
+      " must be enclosed by quotation marks when specified on command line.\n"
       "\n"
       "Examples command lines:\n"