Fix minor spelling mistakes

README.md

@@ -2,7 +2,7 @@
 
 rdesktop is an open source client for Microsoft's RDP protocol. It is
 known to work with Windows versions ranging from NT 4 Terminal Server
-to Windows 2012r2 RDS. rdesktop currently has implemented the RDP version 4
+to Windows 2012 R2 RDS. rdesktop currently has implemented the RDP version 4
 and 5 protocols.
 
 
@@ -25,7 +25,7 @@ the configure line.
 
 ## Note for users building from source
 
-If you have retreived a snapshot of the rdesktop source, you will first
+If you have retrieved a snapshot of the rdesktop source, you will first
 need to run `./bootstrap` in order to generate the build infrastructure.
 This is not necessary for release versions of rdesktop.
 
@@ -36,9 +36,9 @@ Connect to an RDP server with:
 
 	% rdesktop server
 
-where server is the name of the Terminal Services machine. (If you receive
+where server is the name of the Terminal Services machine. If you receive
 "Connection refused", this probably means that the server does not have
-Terminal Services enabled, or there is a firewall blocking access.)
+Terminal Services enabled, or there is a firewall blocking access.
 
 You can also specify a number of options on the command line.  These are listed
 in the rdesktop manual page (run "man rdesktop").

bitmap.c

@@ -17,8 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* three seperate function for speed when decompressing the bitmaps
-   when modifing one function make the change in the others
+/* three separate function for speed when decompressing the bitmaps
+   when modifying one function make the change in the others
    [email protected] */
 
 /* indent is confused by this file */

cache.c

@@ -31,9 +31,9 @@ extern int g_pstcache_fd[];
 #define IS_SET(idx) (idx >= 0)
 
 /*
- * TODO: Test for optimal value of BUMP_COUNT. TO_TOP gives lowest cpu utilisation but using
+ * TODO: Test for optimal value of BUMP_COUNT. TO_TOP gives lowest CPU utilisation but using
  * a positive value will hopefully result in less frequently used bitmaps having a greater chance
- * of being evicted from the cache, and therby reducing the need to load bitmaps from disk.
+ * of being evicted from the cache, and thereby reducing the need to load bitmaps from disk.
  * (Jeroen)
  */
 #define BUMP_COUNT 40
@@ -437,7 +437,7 @@ cache_put_cursor(uint16 cache_idx, RD_HCURSOR cursor)
 }
 
 /* BRUSH CACHE */
-/* index 0 is 2 colour brush, index 1 is muti colour brush */
+/* index 0 is 2 colour brush, index 1 is multi colour brush */
 static BRUSHDATA g_brushcache[2][64];
 
 /* Retrieve brush from cache */
@@ -454,7 +454,7 @@ cache_get_brush_data(uint8 colour_code, uint8 idx)
 }
 
 /* Store brush in cache */
-/* this function takes over the data pointer in struct, eg, caller gives it up */
+/* this function takes over the data pointer in struct, e.g. caller gives it up */
 void
 cache_put_brush_data(uint8 colour_code, uint8 idx, BRUSHDATA * brush_data)
 {

config.guess

@@ -148,7 +148,7 @@ fi
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward

constants.h

@@ -179,12 +179,12 @@ enum MCS_PDU_TYPE
 #define LICENCE_SIGNATURE_SIZE	16
 
 #define LICENCE_TAG_REQUEST                     0x01
-#define LICENCE_TAG_PLATFORM_CHALLANGE          0x02
+#define LICENCE_TAG_PLATFORM_CHALLENGE          0x02
 #define LICENCE_TAG_NEW_LICENCE                 0x03
 #define LICENCE_TAG_UPGRADE_LICENCE             0x04
 #define LICENCE_TAG_LICENCE_INFO                0x12
 #define LICENCE_TAG_NEW_LICENCE_REQUEST         0x13
-#define LICENCE_TAG_PLATFORM_CHALLANGE_RESPONSE 0x15
+#define LICENCE_TAG_PLATFORM_CHALLENGE_RESPONSE 0x15
 #define LICENCE_TAG_ERROR_ALERT                 0xff
 
 #define BB_CLIENT_USER_NAME_BLOB	0x000f
@@ -394,7 +394,7 @@ enum RDP_INPUT_DEVICE
 #define RDP_INFO_AUTOLOGON 	      0x00000008
 #define RDP_INFO_UNICODE              0x00000010
 #define RDP_INFO_MAXIMIZESHELL        0x00000020
-#define RDP_INFO_COMPRESSION	      0x00000080	/* mppc compression with 8kB histroy buffer */
+#define RDP_INFO_COMPRESSION	      0x00000080	/* mppc compression with 8kB history buffer */
 #define RDP_INFO_ENABLEWINDOWSKEY     0x00000100
 #define RDP_INFO_COMPRESSION2	      0x00000200	/* rdp5 mppc compression with 64kB history buffer */
 #define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000
@@ -682,7 +682,7 @@ enum RDP_PDU_REDIRECT_FLAGS
 	LB_TARGET_CERTIFICATE = 0x10000
 };
 
-/* desttop orientation */
+/* desktop orientation */
 enum RDP_DESKTOP_ORIENTATION
 {
 	ORIENTATION_LANDSCAPE = 0,

cssp.c

@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
-   CredSSP layer and kerberos support.
+   CredSSP layer and Kerberos support.
    Copyright 2012-2017 Henrik Andersson <[email protected]> for Cendio AB
 
    This program is free software: you can redistribute it and/or modify
@@ -710,7 +710,7 @@ cssp_connect(char *server, char *user, char *domain, char *password, STREAM s)
 		return False;
 	}
 
-	// Establish tls connection to server
+	// Establish TLS connection to server
 	if (!tcp_tls_connect())
 	{
 		logger(Core, Debug, "cssp_connect(), failed to establish TLS connection");
@@ -751,7 +751,7 @@ cssp_connect(char *server, char *user, char *domain, char *password, STREAM s)
 		{
 			if (i == 0)
 				logger(Core, Notice,
-				       "Failed to intialize NLA, do you have correct kerberos tgt initialized ?");
+				       "Failed to initialize NLA, do you have correct Kerberos TGT initialized ?");
 			else
 				logger(Core, Error, "cssp_connect(), negotiation failed");
 
@@ -764,7 +764,7 @@ cssp_connect(char *server, char *user, char *domain, char *password, STREAM s)
 		if (!(actual_services & GSS_C_CONF_FLAG))
 		{
 			logger(Core, Error,
-			       "cssp_connect(), confidiality service required but is not available");
+			       "cssp_connect(), confidentiality service required but is not available");
 			goto bail_out;
 		}
 

ctrl.c

@@ -82,7 +82,7 @@ _ctrl_slave_new(int sock)
 	}
 	else
 	{
-		/* no elemnts in list, lets add first */
+		/* no elements in list, lets add first */
 		_ctrl_slaves = ns;
 	}
 }
@@ -427,7 +427,7 @@ ctrl_check_fds(fd_set * rfds, fd_set * wfds)
 					p = strchr(p + 1, '\n');
 				}
 
-				/* If we havent found an nonescaped \n we need more data */
+				/* If we haven't found a nonescaped \n we need more data */
 				if (p == NULL)
 					continue;
 
@@ -485,12 +485,12 @@ ctrl_send_command(const char *cmd, const char *arg)
 	if (ret != 0)
 		goto bail_out;
 
-	/* escape the utf-8 string */
+	/* escape the UTF-8 string */
 	escaped = utils_string_escape(tmp);
 	if ((strlen(escaped) + 1) > CTRL_LINEBUF_SIZE - 1)
 		goto bail_out;
 
-	/* send escaped utf-8 command to master */
+	/* send escaped UTF-8 command to master */
 	send(s, escaped, strlen(escaped), 0);
 	send(s, "\n", 1, 0);
 

disk.c

@@ -276,7 +276,7 @@ open_weak_exclusive(const char *pathname, int flags, mode_t mode)
 		return ret;
 	}
 
-	/* An error occured, and we are using O_EXCL. In case the FS
+	/* An error occurred, and we are using O_EXCL. In case the FS
 	   doesn't support O_EXCL, some kind of error will be
 	   returned. Unfortunately, we don't know which one. Linux
 	   2.6.8 seems to return 524, but I cannot find a documented
@@ -309,7 +309,7 @@ open_weak_exclusive(const char *pathname, int flags, mode_t mode)
 }
 
 /* Enumeration of devices from rdesktop.c        */
-/* returns numer of units found and initialized. */
+/* returns number of units found and initialized. */
 /* optarg looks like ':h=/mnt/floppy,b=/mnt/usbdevice1' */
 /* when it arrives to this function.             */
 int
@@ -368,7 +368,7 @@ disk_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create
 
 	sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename ? filename : "");
 
-	/* Protect against mailicous servers:
+	/* Protect against malicious servers:
 	   somelongpath/..     not allowed
 	   somelongpath/../b   not allowed
 	   somelongpath/..b    in principle ok, but currently not allowed
@@ -416,7 +416,7 @@ disk_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create
 
 	/*printf("Open: \"%s\"  flags: %X, accessmask: %X sharemode: %X create disp: %X\n", path, flags_and_attributes, accessmask, sharemode, create_disposition); */
 
-	/* Get information about file and set that flag ourselfs */
+	/* Get information about file and set that flag ourselves */
 	if ((stat(path, &filestat) == 0) && (S_ISDIR(filestat.st_mode)))
 	{
 		if (flags_and_attributes & FILE_NON_DIRECTORY_FILE)
@@ -1168,7 +1168,7 @@ disk_query_volume_information(RD_NTHANDLE handle, uint32 info_class, STREAM out)
 			out_uint32_le(out, stat_fs.f_blocks);	/* Total allocation units low */
 			out_uint32_le(out, 0);	/* Total allocation high units */
 			out_uint32_le(out, stat_fs.f_bfree);	/* Available allocation units */
-			out_uint32_le(out, 0);	/* Available allowcation units */
+			out_uint32_le(out, 0);	/* Available allocation units */
 			out_uint32_le(out, stat_fs.f_bsize / 0x200);	/* Sectors per allocation unit */
 			out_uint32_le(out, 0x200);	/* Bytes per sector */
 			break;
@@ -1180,7 +1180,7 @@ disk_query_volume_information(RD_NTHANDLE handle, uint32 info_class, STREAM out)
 			out_uint32_le(out, stat_fs.f_bavail);	/* Caller allocation units low */
 			out_uint32_le(out, 0);	/* Caller allocation units high */
 			out_uint32_le(out, stat_fs.f_bfree);	/* Available allocation units */
-			out_uint32_le(out, 0);	/* Available allowcation units */
+			out_uint32_le(out, 0);	/* Available allocation units */
 			out_uint32_le(out, stat_fs.f_bsize / 0x200);	/* Sectors per allocation unit */
 			out_uint32_le(out, 0x200);	/* Bytes per sector */
 			break;

doc/ChangeLog

@@ -41,15 +41,15 @@ rdesktop (1.8.1)
   * Fix issue with reconnect, make use of deactivate variable
   * Added 4 new disconnect reasons with exit codes
   * Fix issues of window handling in SeamlessRDP parts of rdesktop
-  * Fix a backward compability with OpenSSL < 0.9.9
+  * Fix a backward compatibility with OpenSSL < 0.9.9
   * Fix a bug when code needs a x window available but there are none.
   * Fix a sigsegv zeroing memory
-  * Fix a 64bit portability issue
+  * Fix a 64-bit portability issue
 
   -- Henrik Andersson <[email protected]> 2013-11-18
 
 rdesktop (1.8.0)
-  * Support for protocol negotiation eg. SSL/TLSv1 and CredSSP
+  * Support for protocol negotiation e.g. SSL/TLSv1 and CredSSP
   * Support for CredSSP + Kerberos authentication (NLA)
   * Support for smart card single-sign-on
   * Support passing smart card pin as password as argument
@@ -67,10 +67,10 @@ rdesktop (1.8.0)
 
 rdesktop (1.7.1)
   * Fix clipboard issue when not building with unicode support
-  * Fix compilation against newer PCSC lite versions
+  * Fix compilation against newer PCSC-lite versions
   * Fix for per-device license mode on Windows 2008 R2 terminal server
-  * Fix building 64bit version with static openssl linkage
-  * Rewrite of smartcard handling for 64bit support, fixes several bugs
+  * Fix building 64-bit version with static openssl linkage
+  * Rewrite of smartcard handling for 64-bit support, fixes several bugs
   * Improved license handling using XDG directories
 
   -- Henrik Andersson <[email protected]> 2012-01-09
@@ -113,7 +113,7 @@ rdesktop (1.6.0)
 rdesktop (1.5.0)
   * SeamlessRDP - seamless windows support
   * Keymap fixes
-  * Fix connection issues with Windows XP RTM
+  * Fix connection issues with Microsoft Windows XP RTM
   * Keyboard handling improvements and fixes
   * SGI/Irix sound-driver fixes
   * Support for clipboard INCR protocol
@@ -125,7 +125,7 @@ rdesktop (1.5.0)
   * Large file support
   * The default color depth is now the depth of the root window
   * Basic support for Windows Vista Beta 2
-  * Fix high cpu-usage in OSS-driver
+  * Fix high CPU-usage in OSS-driver
 
   -- Peter Astrand <[email protected]>  Wed, 13 Sep 2006 15:11:39 +0200 (CEST)
 
@@ -162,15 +162,15 @@ rdesktop (1.4.0)
 rdesktop (1.3.1)
    * Crypto fixes for RDP5
    * Keyboard and keymap fixes
-   * some endianess fixes for high color
+   * some endianness fixes for high color
    * portability enhancements
 
   -- Matthew Chapman <[email protected]>  Tue, 21 Jan 2004 20:34
 
 rdesktop (1.3.0)
 
    * RDP5
-   * 15, 16 and 24 bit color depths
+   * 15, 16 and 24-bit color depths
    * Basic clipboard redirection
    * Sound
    * IPv6

doc/TODO

@@ -40,7 +40,7 @@
 
   * Use timestamps in audio packets.
 
-  * Add resampling to supported samplerates of audio-hardware.
+  * Add resampling to supported sample rates of audio-hardware.
 
   * Lower CPU-usage with an audio thread.
 
@@ -84,7 +84,7 @@
 
   * Support for sending focus information from client to server.
 
-  * Implement something similiar to explhook.dll - support for running
+  * Implement something similar to explhook.dll - support for running
     explorer.exe in non-shell mode. 
 
   * Better compatibility with Task Manager. 

doc/ctrl.txt

@@ -13,7 +13,7 @@ A method call from Slave to the Master have the following syntax:
 
 	METHOD [ARG1[ ARG2 [...]]]
 
-Argument string sent for a method call should be escaped as descibed below under 
+Argument string sent for a method call should be escaped as described below under 
 String escaping section.
 
 
@@ -30,7 +30,7 @@ One line may not exceed 1024 bytes, including newline.
 
 String escaping
 ===============
-Percentage sign has been choosen as escaping character.
+Percentage sign has been chosen as escaping character.
 
 The rules for escaping are:
 

doc/ipv6.txt

@@ -5,9 +5,9 @@ The IPv6 support was developed by Mike Dawson <[email protected]>:
 
     Attached is a patch to tcp.c to enable IPv6 support.  Build with
     'IPv6' defined to enable it.  It's so far only been tested on
-    Linux 2.4.21 connecting to Windows XP SP1.
+    Linux 2.4.21 connecting to Microsoft Windows XP SP1.
 
-    Since terminal services doesn't seem to bind to the ipv6 interface
+    Since terminal services doesn't seem to bind to the IPv6 interface
     on XP I had to run 'netsh interface portproxy add v6tov4
     listenport=3389 connectport=3389' from the windows command prompt
     to get it to work.
@@ -20,10 +20,10 @@ rdesktop now supports numeric IPv6 addresses:
 
     rdesktop 2001:1:2:3::4
 
-    without it getting confused with an ipv4:port specification.  I've
+    without it getting confused with an IPv4:port specification.  I've
     also followed the square bracket convention used by browsers
     (http://www.ietf.org/rfc/rfc2732.txt) so if you want to specify a
-    non-standard port with an ipv6 address you can use the format:
+    non-standard port with an IPv6 address you can use the format:
 
     rdesktop [2001:1:2:3::4]:3390
 

doc/keymapping.txt

@@ -2,7 +2,7 @@ Keyboard mapping
 ================
 This release of rdesktop uses a new, portable keyboard mapping
 implementation. It should hopefully work on all X11 systems. This new
-implementation only looks at X11 keysyms: Not on (nonportable)
+implementation only looks at X11 keysyms: Not on (non-portable)
 keycodes or modifier status. This means that rdesktop will obey your
 local keyboard configuration. For example, if you have swapped
 CapsLock and Control, rdesktop will use this mapping. 
@@ -224,7 +224,7 @@ works:
 
    xmodmap -e "keycode 49 = egrave"
 
-4. Test a char generated with AltGr, such as @ on a swedish keyboard. 
+4. Test a char generated with AltGr, such as @ on a Swedish keyboard. 
 
 5. Test Ctrl-Alt-Delete. 
 
@@ -244,7 +244,7 @@ works:
     KEYMAP_PATH, $CWD/keymaps, and from an absolute path. 
 
 11. Press Shift, then press a key modified by shift, the release
-    shift, then release the other key.  Do this in a speedy fasion.
+    shift, then release the other key.  Do this in a speedy fashion.
     Make sure the shift state is not stuck down.
 
 12. Test all numpad keys, when not using the -N option.