Corrected typos (thanks to Ville Skyttä)

7 files changed, 10 insertions, 8 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0c0ae19..38e856d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -201,6 +201,7 @@ Ville Skyttä
   for restricting VTP command RENR to liemikuutio patch < 1.32
   for fixing memory and filedescriptor leaks in libdvbmpeg
   for code cleanup and optimization
+  for correcting typos
 
 Methodus
   for suggesting to use HTTP code 503 for unavailable channels
diff --git a/HISTORY b/HISTORY
index ed0087a..ce3b65b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- Corrected typos (thanks to Ville Skyttä)
 - Fixed compiler error in client/device.c with VDR < 1.7.22 (reported by
   Uwe@vdrportal)
 - Updated Italian translation (thanks to Diego Pierotto)
diff --git a/README b/README
index 8a5ede0..e19b765 100644
--- a/README
+++ b/README
@@ -296,7 +296,7 @@ For multicast streaming over the public Internet you would even need to register
 for your own IP range. So don't even think of multicasting via Internet with
 streamdev! Streamdev will send the stream only to one local ethernet segment and
 all clients must be connected to this same segment. There must not be a router
-inbetween. Also note that the client must not run on the streamdev-server
+in between. Also note that the client must not run on the streamdev-server
 machine.
 
 Each channel is offered on a different multicast IP. Channel 1 is available from
@@ -310,7 +310,7 @@ Binding an IGMP socket is a privileged operation, so you must start VDR as root.
 The multicast server is disabled by default. Enter the streamdev-server setup
 menu to enable it and - IMPORTANT - bind the multicast server to the IP of your
 VDR server's LAN ethernet card. The multicast server will refuse to start with
-the default bind adresse "0.0.0.0".
+the default bind address "0.0.0.0".
 
 Now edit your streamdevhosts.conf. To allow streaming of all channels, it must
 contain "239.255.0.0/16". Note that you cannot limit connections by client IP
@@ -365,9 +365,9 @@ setup parameter "Hide Mainmenu Entry" you can hide this menu item if you don't
 need it. "Suspend Server" is only useful if the server runs in "Offer suspend
 mode" with "Client may suspend" enabled.
 
-The parameter "Remote IP" uses an IP-Adress-Editor, where you can just enter
+The parameter "Remote IP" uses an IP-Address-Editor, where you can just enter
 the IP number with the number keys on your remote. After three digits (or if 
-the next digit would result in an invalid IP adress, or if the first digit is
+the next digit would result in an invalid IP address, or if the first digit is
 0), the current position jumps to the next one. You can change positions with 
 the left and right buttons, and you can cycle the current position using up 
 and down. To confirm the entered address, press OK. So, if you want to enter 
diff --git a/server/connection.h b/server/connection.h
index 0d51da8..fdc5fd1 100644
--- a/server/connection.h
+++ b/server/connection.h
@@ -101,7 +101,7 @@ public:
 	/* Close the socket */
 	virtual bool Close(void);
 
-	/* Check if a device would be available for transfering the given
+	/* Check if a device would be available for transferring the given
 	   channel. This call has no side effects. */
 	static cDevice *CheckDevice(const cChannel *Channel, int Priority, bool LiveView, const cDevice *AvoidDevice = NULL);
 
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 39bf8de..7865757 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -1662,7 +1662,7 @@ bool cConnectionVTP::CmdMOVC(const char *Option)
 								Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
 							}
 							else {
-								Reply(501, "Can't move channel to same postion");
+								Reply(501, "Can't move channel to same position");
 							}
 						}
 						else {
diff --git a/tools/socket.h b/tools/socket.h
index effdef8..293e8b2 100644
--- a/tools/socket.h
+++ b/tools/socket.h
@@ -62,7 +62,7 @@ public:
 	/* Accept() returns a newly created cTBSocket, which is connected to the 
 	   first connection request on the queue of pending connections of a
 	   listening socket. If no connection request was pending, or if any other
-	   error occured, the resulting cTBSocket is closed. */
+	   error occurred, the resulting cTBSocket is closed. */
 	virtual cTBSocket Accept(void) const;
 
 	/* Accept() extracts the first connection request on the queue of pending
diff --git a/tools/source.h b/tools/source.h
index 09c4bf3..b6fc36c 100644
--- a/tools/source.h
+++ b/tools/source.h
@@ -54,7 +54,7 @@ public:
 	/* Close() resets the source to the uninitialized state (IsOpen() == false)
 	   and must be called by any derivations after really closing the source.
 	   Returns true on success and false on error, setting errno appropriately.
-	   The object is in closed state afterwards, even if an error occured. */
+	   The object is in closed state afterwards, even if an error occurred. */
 	virtual bool Close(void);
 
 	/* Read() reads at most Length bytes into the storage pointed to by Buffer,