Index: trunk/ntripserver/README
===================================================================
--- trunk/ntripserver/README	(revision 1113)
+++ trunk/ntripserver/README	(revision 1588)
@@ -101,12 +101,12 @@
 -h|? print this help screen
 
--E <ProxyHost>   Proxy server host name or address, required i.e. when
-                 running the program in a proxy server protected LAN,
-                 optional
--F <ProxyPort>   Proxy server IP port, required i.e. when running
-                 the program in a proxy server protected LAN, optional
--R <maxDelay>    Reconnect mechanism with maximum delay between reconnect
-                 attemts in seconds, default: no reconnect activated,
-                 optional
+-E <ProxyHost>       Proxy server host name or address, required i.e. when
+        	     running the program in a proxy server protected LAN,
+        	     optional
+-F <ProxyPort>       Proxy server IP port, required i.e. when running
+        	     the program in a proxy server protected LAN, optional
+-R <maxDelay>	     Reconnect mechanism with maximum delay between reconnect
+        	     attemts in seconds, default: no reconnect activated,
+        	     optional
 
 -M <InputMode> Sets the input mode (1 = Serial Port, 2 = IP server,
@@ -115,68 +115,70 @@
 
    <InputMode> = 1 (Serial Port):
-   -i <Device>      Serial input device, default: /dev/gps, mandatory if
-                    <InputMode>=1
-   -b <BaudRate>    Serial input baud rate, default: 19200 bps, mandatory
-                    if <InputMode>=1
-   -f <InitFile>   Name of initialization file to be send to input device,
-                    optional
+   -i <Device>       Serial input device, default: /dev/gps, mandatory if
+        	     <InputMode>=1
+   -b <BaudRate>     Serial input baud rate, default: 19200 bps, mandatory
+        	     if <InputMode>=1
+   -f <InitFile>     Name of initialization file to be send to input device,
+        	     optional
 
    <InputMode> = 2|5 (IP port | UDP port):
-   -H <ServerHost>  Input host name or address, default: 127.0.0.1,
-                    mandatory if <InputMode> = 2|5
-   -P <ServerPort>  Input port, default: 1025, mandatory if <InputMode>= 2|5
-   -f <ServerFile>  Name of initialization file to be send to server,
-                    optional
-   -x <ServerUser>  User ID to access incoming stream, optional
-   -y <ServerPass>  Password, to access incoming stream, optional
-   -B               Bind to incoming UDP stream, optional for <InputMode> = 5
+   -H <ServerHost>   Input host name or address, default: 127.0.0.1,
+        	     mandatory if <InputMode> = 2|5
+   -P <ServerPort>   Input port, default: 1025, mandatory if <InputMode>= 2|5
+   -f <ServerFile>   Name of initialization file to be send to server,
+        	     optional
+   -x <ServerUser>   User ID to access incoming stream, optional
+   -y <ServerPass>   Password, to access incoming stream, optional
+   -B Bind to incoming UDP stream, optional for <InputMode> = 5
 
    <InputMode> = 3 (File):
-   -s <File>        File name to simulate stream by reading data from (log)
-                    file, default is /dev/stdin, mandatory for <InputMode> = 3
+   -s <File>	     File name to simulate stream by reading data from (log)
+        	     file, default is /dev/stdin, mandatory for <InputMode> = 3
 
    <InputMode> = 4 (SISNeT Data Server):
-   -H <SisnetHost>  SISNeT Data Server name or address,
-                    default: 131.176.49.142, mandatory if <InputMode> = 4
-   -P <SisnetPort>  SISNeT Data Server port, default: 7777, mandatory if
-                    <InputMode> = 4
-   -u <SisnetUser>  SISNeT Data Server user ID, mandatory if <InputMode> = 4
-   -l <SisnetPass>  SISNeT Data Server password, mandatory if <InputMode> = 4
-   -V <SisnetVers>  SISNeT Data Server Version number, options are 2.1, 3.0
-                    or 3.1, default: 3.1, mandatory if <InputMode> = 4
+   -H <SisnetHost>   SISNeT Data Server name or address,
+        	     default: 131.176.49.142, mandatory if <InputMode> = 4
+   -P <SisnetPort>   SISNeT Data Server port, default: 7777, mandatory if
+        	     <InputMode> = 4
+   -u <SisnetUser>   SISNeT Data Server user ID, mandatory if <InputMode> = 4
+   -l <SisnetPass>   SISNeT Data Server password, mandatory if <InputMode> = 4
+   -V <SisnetVers>   SISNeT Data Server Version number, options are 2.1, 3.0
+        	     or 3.1, default: 3.1, mandatory if <InputMode> = 4
 
    <InputMode> = 6 (NTRIP Version 1.0 Caster):
-   -H <SourceHost>  Source caster name or address, default: 127.0.0.1,
-                    mandatory if <InputMode> = 6
-   -P <SourcePort>  Source caster port, default: 2101, mandatory if
-                    <InputMode> = 6
-   -D <SourceMount> Source caster mountpoint for stream input, mandatory if
-                    <InputMode> = 6
-   -U <SourceUser>  Source caster user Id for input stream access, mandatory
-                    for protected streams if <InputMode> = 6
-   -W <SourcePass>  Source caster password for input stream access, mandatory
-                    for protected streams if <InputMode> = 6
-
--O <OutputMode> Sets output mode for communication with destination caster, optional
-   1 = http:   NTRIP Version 2.0 Caster in TCP/IP mode
-   2 = rtsp:   NTRIP Version 2.0 Caster in RTSP/RTP mode
+   -H <SourceHost>   Source caster name or address, default: 127.0.0.1,
+        	     mandatory if <InputMode> = 6
+   -P <SourcePort>   Source caster port, default: 2101, mandatory if
+        	     <InputMode> = 6
+   -D <SourceMount>  Source caster mountpoint for stream input, mandatory if
+        	     <InputMode> = 6
+   -U <SourceUser>   Source caster user Id for input stream access, mandatory
+        	     for protected streams if <InputMode> = 6
+   -W <SourcePass>   Source caster password for input stream access, mandatory
+        	     for protected streams if <InputMode> = 6
+
+-O <OutputMode> Sets output mode for communatation with destination caster
+   1 = http: NTRIP Version 2.0 Caster in TCP/IP mode
+   2 = rtsp: NTRIP Version 2.0 Caster in RTSP/RTP mode
    3 = ntrip1: NTRIP Version 1.0 Caster
-
-   Defaults to NTRIP Version 1.0, but will change to 2.0 in future versions
+   4 = udp: NTRIP Version 2.0 Caster in Plain UDP mode
+   optional
+
+   Defaults to NTRIP1.0, but will change to 2.0 in future versions
    Note that the program automatically falls back from mode rtsp to mode http and
    further to mode ntrip1 if necessary.
 
-   -a <DestHost>    Destination caster name or address, default: 127.0.0.1,
-                    mandatory
-   -p <DestPort>    Destination caster port, default: 2101, mandatory
-   -m <DestMount>   Destination caster mountpoint for stream upload,
-                    mandatory
-   -n <DestUser>    Destination caster user ID for stream upload to
-                    mountpoint, only for NTRIP Version 2.0 destination
-                    casters, mandatory
-   -c <DestPass>    Destination caster password for stream upload to
-                    mountpoint, mandatory
-   -N <STR-record>  Sourcetable STR-record
-                    optional for NTRIP Version 2.0 in RTSP/RTP and TCP/IP mode 
+   -a <DestHost>     Destination caster name or address, default: 127.0.0.1,
+        	     mandatory
+   -p <DestPort>     Destination caster port, default: 2101, mandatory
+   -m <DestMount>    Destination caster mountpoint for stream upload,
+        	     mandatory
+   -n <DestUser>     Destination caster user ID for stream upload to
+        	     mountpoint, only for NTRIP Version 2.0 destination
+        	     casters, mandatory
+   -c <DestPass>     Destination caster password for stream upload to
+        	     mountpoint, mandatory
+   -N <STR-record>   Sourcetable STR-record
+        	     optional for NTRIP Version 2.0 in RTSP/RTP and TCP/IP mode
 
 
