Spelling fixes

9 files changed, 16 insertions, 16 deletions

diff --git a/doc/history.rst b/doc/history.rst
index bf38894..e162120 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -200,7 +200,7 @@ Version 2.3
 * Changed the name of ``send_eof()`` to ``sendeof()``.
 * Modified ``kill()`` so that it checks to make sure the pid ``isalive()``.
 * modified ``spawn()`` (really called from ``__spawn()``) so that it does not
-  raise an expection if ``setwinsize()`` fails. Some platforms such as Cygwin
+  raise an exception if ``setwinsize()`` fails. Some platforms such as Cygwin
   do not like setwinsize. This was a constant problem and since it is not a
   critical feature I decided to just silence the error.  Normally I don't like
   to do that, but in this case I'm making an exception.
diff --git a/examples/cgishell.cgi b/examples/cgishell.cgi
index 23bef5f..57d8667 100755
--- a/examples/cgishell.cgi
+++ b/examples/cgishell.cgi
@@ -12,7 +12,7 @@ The client web browser needs nothing but CSS and Javascript.
     --port     : set the local port for the server to listen on
     --watch    : show the virtual screen after each client request
 
-This project is probably not the most security concious thing I've ever built.
+This project is probably not the most security conscious thing I've ever built.
 This should be considered an experimental tool -- at best.
 """
 
diff --git a/examples/hive.py b/examples/hive.py
index 00ddbea..1b7bcbf 100755
--- a/examples/hive.py
+++ b/examples/hive.py
@@ -15,7 +15,7 @@ Example:
     password:
     connecting to host1.example.com - OK
     connecting to host2.example.net - OK
-    targetting hosts: 192.168.1.104 192.168.1.107
+    targeting hosts: 192.168.1.104 192.168.1.107
     CMD (? for help) > uptime
     =======================================================================
     host1.example.com
@@ -160,7 +160,7 @@ CMD_HELP='''Hive commands are preceded by a colon : (just think of vi).
 :resync
 
     This is similar to :sync, but it does not change the mode. It looks for the
-    prompt and thus consumes all input from all targetted hosts.
+    prompt and thus consumes all input from all targeted hosts.
 
 :prompt
 
@@ -170,12 +170,12 @@ CMD_HELP='''Hive commands are preceded by a colon : (just think of vi).
 
 :send my text
 
-    This will send the 'my text' wihtout a line feed to the targetted hosts.
+    This will send the 'my text' wihtout a line feed to the targeted hosts.
     This output of the hosts is not automatically synchronized.
 
 :control X
 
-    This will send the given control character to the targetted hosts.
+    This will send the given control character to the targeted hosts.
     For example, ":control c" will send ASCII 3.
 
 :exit
@@ -255,7 +255,7 @@ def main ():
 
     synchronous_mode = True
     target_hostnames = host_names[:]
-    print('targetting hosts:', ' '.join(target_hostnames))
+    print('targeting hosts:', ' '.join(target_hostnames))
     while True:
         cmd = raw_input('CMD (? for help) > ')
         cmd = cmd.strip()
@@ -348,7 +348,7 @@ def main ():
             target_hostnames = cmd.split()[1:]
             if len(target_hostnames) == 0 or target_hostnames[0] == all:
                 target_hostnames = host_names[:]
-            print('targetting hosts:', ' '.join(target_hostnames))
+            print('targeting hosts:', ' '.join(target_hostnames))
             continue
         elif cmd == ':exit' or cmd == ':q' or cmd == ':quit':
             break
diff --git a/notes/notes.txt b/notes/notes.txt
index a793587..8ff6cfe 100644
--- a/notes/notes.txt
+++ b/notes/notes.txt
@@ -19,7 +19,7 @@
 # http://www.erlenstar.demon.co.uk/unix/faq_4.html#SEC52
 
 # Nonblocking on Win32?
-# Reasearch this as a way to maybe make pipe work for Win32.
+# Research this as a way to maybe make pipe work for Win32.
 # http://groups.google.com/groups?q=setraw+tty&hl=en&selm=uvgpvisvk.fsf%40roundpoint.com&rnum=7
 # 
 #    if istty:
diff --git a/pexpect/expect.py b/pexpect/expect.py
index 2acd0b3..7e07cfa 100644
--- a/pexpect/expect.py
+++ b/pexpect/expect.py
@@ -160,7 +160,7 @@ class searcher_string(object):
         return '\n'.join(ss)
 
     def search(self, buffer, freshlen, searchwindowsize=None):
-        '''This searches 'buffer' for the first occurence of one of the search
+        '''This searches 'buffer' for the first occurrence of one of the search
         strings.  'freshlen' must indicate the number of bytes at the end of
         'buffer' which have not been searched before. It helps to avoid
         searching the same, possibly big, buffer over and over again.
@@ -219,7 +219,7 @@ class searcher_re(object):
 
         start - index into the buffer, first byte of match
         end   - index into the buffer, first byte after match
-        match - the re.match object returned by a succesful re.search
+        match - the re.match object returned by a successful re.search
 
     '''
 
@@ -266,7 +266,7 @@ class searcher_re(object):
         return '\n'.join(ss)
 
     def search(self, buffer, freshlen, searchwindowsize=None):
-        '''This searches 'buffer' for the first occurence of one of the regular
+        '''This searches 'buffer' for the first occurrence of one of the regular
         expressions. 'freshlen' must indicate the number of bytes at the end of
         'buffer' which have not been searched before.
 
diff --git a/pexpect/fdpexpect.py b/pexpect/fdpexpect.py
index ac7443e..cd60804 100644
--- a/pexpect/fdpexpect.py
+++ b/pexpect/fdpexpect.py
@@ -1,5 +1,5 @@
 '''This is like pexpect, but it will work with any file descriptor that you
-pass it. You are reponsible for opening and close the file descriptor.
+pass it. You are responsible for opening and close the file descriptor.
 This allows you to use Pexpect with sockets and named pipes (FIFOs).
 
 PEXPECT LICENSE
diff --git a/pexpect/screen.py b/pexpect/screen.py
index 0bced89..5ab45b9 100644
--- a/pexpect/screen.py
+++ b/pexpect/screen.py
@@ -69,7 +69,7 @@ def constrain (n, min, max):
 
 class screen:
     '''This object maintains the state of a virtual text screen as a
-    rectangluar array. This maintains a virtual cursor position and handles
+    rectangular array. This maintains a virtual cursor position and handles
     scrolling as characters are added. This supports most of the methods needed
     by an ANSI text screen. Row and column indexes are 1-based (not zero-based,
     like arrays).
diff --git a/pexpect/spawnbase.py b/pexpect/spawnbase.py
index 11e40f5..966bf11 100644
--- a/pexpect/spawnbase.py
+++ b/pexpect/spawnbase.py
@@ -429,7 +429,7 @@ class SpawnBase(object):
 
         # I could have done this more directly by not using expect(), but
         # I deliberately decided to couple read() to expect() so that
-        # I would catch any bugs early and ensure consistant behavior.
+        # I would catch any bugs early and ensure consistent behavior.
         # It's a little less efficient, but there is less for me to
         # worry about if I have to later modify read() or expect().
         # Note, it's OK if size==-1 in the regex. That just means it
diff --git a/tests/test_unicode.py b/tests/test_unicode.py
index 1d2f933..9b5b988 100644
--- a/tests/test_unicode.py
+++ b/tests/test_unicode.py
@@ -155,7 +155,7 @@ class UnicodeTests(PexpectTestCase.PexpectTestCase):
     def test_spawn_utf8_incomplete(self):
         # This test case ensures correct incremental decoding, which
         # otherwise fails when the stream inspected by os.read()
-        # does not align exactly at a utf-8 multibyte boundry:
+        # does not align exactly at a utf-8 multibyte boundary:
         #    UnicodeDecodeError: 'utf8' codec can't decode byte 0xe2 in
         #                        position 0: unexpected end of data
         p = pexpect.spawnu('cat', maxread=1)