From ce7f9ab7a83243cc8056cda24da125e03f1a1488 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Mon, 22 Jul 2013 23:22:14 +0200
Subject: Fix typo breaking whatever this was supposed to do

---
 crawl-ref/source/test/los_csc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/test/los_csc.lua b/crawl-ref/source/test/los_csc.lua
index b45984e..ea8d5e5 100644
--- a/crawl-ref/source/test/los_csc.lua
+++ b/crawl-ref/source/test/los_csc.lua
@@ -15,7 +15,7 @@ local function test_cellseecell_symmetry()
     for x = -9, 9 do
       local px, py = x + you_x, y + you_y
       if (x ~= 0 or y ~= 0) and dgn.in_bounds(px, py) then
-        local foreward = los.cell_see_cell(you_x, you_y, px, py)
+        local forward = los.cell_see_cell(you_x, you_y, px, py)
         local backward = los.cell_see_cell(px, py, you_x, you_y)
         this_p = dgn.point(you_x, you_y)
         other_p = dgn.point(px, py)
-- 
1.8.3.3

From 2b90a88ef8c9656fa66395460b52a3494bc760eb Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Mon, 22 Jul 2013 23:31:18 +0200
Subject: Fix typo in tutorial message

---
 crawl-ref/source/tutorial.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index cbb20de..328d92f 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -67,7 +67,7 @@ void tutorial_init_hint(const char* hintstr)
 void tutorial_death_message()
 {
     mprnojoin("You die...");
-    mprnojoin("In Crawl, death is a sad but common occurence. "
+    mprnojoin("In Crawl, death is a sad but common occurrence. "
               "Note that there's usually something you could have done to "
               "survive, for example by using some kind of item, running away, "
               "resting between fights, or by avoiding combat entirely. "
-- 
1.8.3.3

From e6f1448517f4b6613f66b98d20f4bdc60cf65d22 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Mon, 22 Jul 2013 23:35:28 +0200
Subject: Fix typo in hints mode message

---
 crawl-ref/source/hints.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index d891801..f404411 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -2096,7 +2096,7 @@ void learned_something_new(hints_event_type seen_what, coord_def gc)
         {
             text << "\n\nYou can easily find items you've left on the floor "
                     "with the <w>%</w> command, which will let you "
-                    "seach for all known items in the dungeon. For example, "
+                    "search for all known items in the dungeon. For example, "
                     "<w>% \"dagger\"</w> will list all daggers. You can "
                     "can then travel to one of the spots.";
             Hints.hints_stashes = false;
-- 
1.8.3.3

From af9559f090989340d9db398e6c8b63cdae343e71 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Mon, 22 Jul 2013 23:37:29 +0200
Subject: Fix typo in tutorial message

---
 crawl-ref/source/dat/descript/tutorial.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/dat/descript/tutorial.txt b/crawl-ref/source/dat/descript/tutorial.txt
index c5044a0..6255dac 100644
--- a/crawl-ref/source/dat/descript/tutorial.txt
+++ b/crawl-ref/source/dat/descript/tutorial.txt
@@ -354,7 +354,7 @@ description screens.
 %%%%
 tutorial3 battle
 
-Once you've succesfully managed to poison a monster, it is sometimes best to
+Once you've successfully managed to poison a monster, it is sometimes best to
 retreat and let the poison do the work. Also retreat to heal, if necessary.
 %%%%
 tutorial3 downstairs
-- 
1.8.3.3

From f73149b223e3714e634c7e1816a1a5fa061798df Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Mon, 22 Jul 2013 23:33:29 +0200
Subject: Fix lots of typos

---
 crawl-ref/source/MSVC/crawl.vcproj                 | 16 ++++++-------
 crawl-ref/source/MSVC/crawl.vcxproj                | 10 ++++-----
 crawl-ref/source/MSVC/include/dirent.h             |  2 +-
 crawl-ref/source/abl-show.h                        |  2 +-
 crawl-ref/source/acquire.cc                        |  2 +-
 crawl-ref/source/arena.cc                          |  2 +-
 crawl-ref/source/beam.cc                           |  2 +-
 crawl-ref/source/crawl-gdb.py                      |  2 +-
 crawl-ref/source/crawl_all.doxy                    |  2 +-
 crawl-ref/source/crawl_simple.doxy                 |  2 +-
 crawl-ref/source/dat/database/randbook.txt         |  2 +-
 .../dat/des/branches/vaults_rooms_standard.des     |  2 +-
 crawl-ref/source/dat/des/branches/zot.des          |  4 ++--
 crawl-ref/source/dat/des/builder/layout.des        |  4 ++--
 crawl-ref/source/dat/des/builder/layout_forest.des |  2 +-
 crawl-ref/source/dat/des/builder/layout_halls.des  |  2 +-
 crawl-ref/source/dat/des/builder/layout_loops.des  | 26 +++++++++++-----------
 crawl-ref/source/dat/des/builder/layout_pools.des  |  8 +++----
 crawl-ref/source/dat/des/builder/layout_vaults.des |  6 ++---
 crawl-ref/source/dat/des/portals/lab.des           |  2 +-
 crawl-ref/source/dat/des/portals/ossuary.des       |  2 +-
 crawl-ref/source/dat/des/serial/aquarium.des       | 14 ++++++------
 crawl-ref/source/dat/des/serial/teleporters.des    |  2 +-
 crawl-ref/source/dat/des/traps/boulders.des        |  2 +-
 crawl-ref/source/dat/des/variable/float.des        |  4 ++--
 crawl-ref/source/dat/descript/items.txt            |  2 +-
 crawl-ref/source/dat/descript/spells.txt           |  2 +-
 crawl-ref/source/dat/dlua/dungeon.lua              |  2 +-
 crawl-ref/source/dat/dlua/layout/hyper_paint.lua   |  4 ++--
 crawl-ref/source/dat/dlua/lm_trig.lua              |  4 ++--
 crawl-ref/source/dat/dlua/v_layouts.lua            |  2 +-
 crawl-ref/source/dgn-delve.cc                      |  4 ++--
 crawl-ref/source/dgn-irregular-box.cc              |  2 +-
 crawl-ref/source/items.cc                          |  4 ++--
 crawl-ref/source/json.cc                           |  2 +-
 crawl-ref/source/macro.cc                          |  2 +-
 crawl-ref/source/main.cc                           |  4 ++--
 crawl-ref/source/mapdef.cc                         |  4 ++--
 crawl-ref/source/melee_attack.cc                   |  2 +-
 crawl-ref/source/menu.cc                           | 14 ++++++------
 crawl-ref/source/menu.h                            |  2 +-
 crawl-ref/source/mon-util.cc                       |  8 +++----
 crawl-ref/source/prebuilt/levcomp.tab.cc           |  2 +-
 crawl-ref/source/skills.cc                         |  4 ++--
 crawl-ref/source/spl-other.cc                      |  2 +-
 crawl-ref/source/spl-util.cc                       |  6 ++---
 crawl-ref/source/spl-util.h                        |  2 +-
 crawl-ref/source/state.cc                          |  4 ++--
 crawl-ref/source/store.cc                          |  4 ++--
 crawl-ref/source/tags.cc                           |  2 +-
 crawl-ref/source/tags.h                            |  2 +-
 crawl-ref/source/terrain.cc                        |  2 +-
 crawl-ref/source/tilereg-dgn.cc                    |  2 +-
 crawl-ref/source/tilesdl.cc                        |  2 +-
 crawl-ref/source/traps.cc                          |  2 +-
 crawl-ref/source/util/cpp_version                  |  2 +-
 crawl-ref/source/util/txc                          |  2 +-
 crawl-ref/source/webserver/inotify.py              |  2 +-
 .../static/scripts/contrib/jquery.cookie.js        |  2 +-
 crawl-ref/source/wiz-mon.cc                        |  2 +-
 60 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index dd1357d..2298f9b 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -28,7 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -191,7 +191,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -271,7 +271,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -352,7 +352,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -434,7 +434,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -517,7 +517,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
@@ -598,7 +598,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generating build-specfic headers..."
+				Description="Generating build-specific headers..."
 				CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%&#x0D;&#x0A;cd $(ProjectDir)&#x0D;&#x0A;perl.exe &quot;../util/gen_ver.pl&quot; build.h&#x0D;&#x0A;perl.exe &quot;../util/gen-cflg.pl&quot; compflag.h &quot;&lt;UNKNOWN&gt;&quot; &quot;&lt;UNKNOWN&gt;&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
diff --git a/crawl-ref/source/MSVC/crawl.vcxproj b/crawl-ref/source/MSVC/crawl.vcxproj
index ce86d96..b8cd5bb 100644
--- a/crawl-ref/source/MSVC/crawl.vcxproj
+++ b/crawl-ref/source/MSVC/crawl.vcxproj
@@ -97,7 +97,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Tiles|Win32'">
     <PreBuildEvent>
-      <Message>Generating build-specfic headers...</Message>
+      <Message>Generating build-specific headers...</Message>
       <Command>set PATH=c:\cygwin\bin%3bc:\msysgit\mingw\bin%3bc:\msysgit\bin%3bc:\mingw\bin%3b%25PATH%25
 cd $(SolutionDir)\..\
 perl.exe "util/gen_ver_msvc.pl" build.h
@@ -126,7 +126,7 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Tiles|x64'">
     <PreBuildEvent>
-      <Message>Generating build-specfic headers...</Message>
+      <Message>Generating build-specific headers...</Message>
       <Command>set PATH=c:\cygwin\bin%3bc:\msysgit\mingw\bin%3bc:\msysgit\bin%3bc:\mingw\bin%3b%25PATH%25
 cd $(SolutionDir)\..\
 perl.exe "util/gen_ver_msvc.pl" build.h
@@ -157,7 +157,7 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Tiles|Win32'">
     <PreBuildEvent>
-      <Message>Generating build-specfic headers...</Message>
+      <Message>Generating build-specific headers...</Message>
       <Command>set PATH=c:\cygwin\bin%3bc:\msysgit\mingw\bin%3bc:\msysgit\bin%3bc:\mingw\bin%3b%25PATH%25
 cd $(SolutionDir)\..\
 perl.exe "util/gen_ver_msvc.pl" build.h
@@ -186,7 +186,7 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Tiles|x64'">
     <PreBuildEvent>
-      <Message>Generating build-specfic headers...</Message>
+      <Message>Generating build-specific headers...</Message>
       <Command>set PATH=c:\cygwin\bin%3bc:\msysgit\mingw\bin%3bc:\msysgit\bin%3bc:\mingw\bin%3b%25PATH%25
 cd $(SolutionDir)\..\
 perl.exe "util/gen_ver_msvc.pl" build.h
@@ -927,4 +927,4 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/crawl-ref/source/MSVC/include/dirent.h b/crawl-ref/source/MSVC/include/dirent.h
index aa39751..d84b6f0 100644
--- a/crawl-ref/source/MSVC/include/dirent.h
+++ b/crawl-ref/source/MSVC/include/dirent.h
@@ -284,7 +284,7 @@ static struct dirent *readdir(DIR *dirp)
          return NULL;
       }
       if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) {
-         /* the very last entry has been processed or an error occured */
+         /* the very last entry has been processed or an error occurred */
          FindClose (dirp->search_handle);
          dirp->search_handle = INVALID_HANDLE_VALUE;
          return NULL;
diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/abl-show.h
index 22b0c4e..117de27 100644
--- a/crawl-ref/source/abl-show.h
+++ b/crawl-ref/source/abl-show.h
@@ -64,7 +64,7 @@ struct ability_def
     unsigned int        food_cost;      // + rand2avg(food_cost, 2)
     generic_cost        piety_cost;     // + random2((piety_cost + 1) / 2 + 1)
     unsigned int        zp_cost;        // zot point cost of ability
-    unsigned int        flags;          // used for additonal cost notices
+    unsigned int        flags;          // used for additional cost notices
 };
 
 struct talent
diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 80edca5..4f2df2e 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -1674,7 +1674,7 @@ bool acquirement(object_class_type class_wanted, int agent,
             check_item_knowledge(), redraw_screen();
         else
         {
-            // Lets wizards escape out of accidently choosing acquirement.
+            // Lets wizards escape out of accidentally choosing acquirement.
             if (agent == AQ_WIZMODE)
             {
                 canned_msg(MSG_OK);
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index 0b95c16..e0d4294 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -1238,7 +1238,7 @@ void arena_monster_died(monster* mons, killer_type killer,
         }
     }
 
-    // Only respawn those monsers which were initally placed in the
+    // Only respawn those monsers which were initially placed in the
     // arena.
     const int midx = mons->mindex();
     if (arena::respawn && arena::to_respawn[midx] != -1
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index ffeadd8..c700883 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -669,7 +669,7 @@ void bolt::initialise_fire()
 
     message_cache.clear();
 
-    // seen might be set by caller to supress this.
+    // seen might be set by caller to suppress this.
     if (!seen && you.see_cell(source) && range > 0 && visible())
     {
         seen = true;
diff --git a/crawl-ref/source/crawl-gdb.py b/crawl-ref/source/crawl-gdb.py
index 6d6daa4..2cb5907 100644
--- a/crawl-ref/source/crawl-gdb.py
+++ b/crawl-ref/source/crawl-gdb.py
@@ -91,7 +91,7 @@ class item_def_printer:
         return None
 
     def children(self):
-        # Since C++ hasn't got dependant types, we have to simulate them here.
+        # Since C++ hasn't got dependent types, we have to simulate them here.
         def f(fname):
             return (fname, self.val[fname])
         def g(fname, typename):
diff --git a/crawl-ref/source/crawl_all.doxy b/crawl-ref/source/crawl_all.doxy
index 3cb380a..ad4d29a 100644
--- a/crawl-ref/source/crawl_all.doxy
+++ b/crawl-ref/source/crawl_all.doxy
@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
diff --git a/crawl-ref/source/crawl_simple.doxy b/crawl-ref/source/crawl_simple.doxy
index e187e25..5e33656 100644
--- a/crawl-ref/source/crawl_simple.doxy
+++ b/crawl-ref/source/crawl_simple.doxy
@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt
index 7c72792..bebb59e 100644
--- a/crawl-ref/source/dat/database/randbook.txt
+++ b/crawl-ref/source/dat/database/randbook.txt
@@ -30,7 +30,7 @@
 # Books also may get previous "owners" (or authors) that may be the gifting
 # god (if gifted), a name depending on school(s) as defined in this file,
 # a random name, or an appropriate god (if not a god gift).
-# The school dependant names consist of uniques or spell names that have a
+# The school dependent names consist of uniques or spell names that have a
 # strong connection to one or more schools. Pandemonium or hell lords' names
 # may only get used if a book is "highlevel", i.e. contains at least one
 # spell of level 6 or higher.
diff --git a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
index 4c1f208..cbea416 100644
--- a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
+++ b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
@@ -35,7 +35,7 @@
 
  -- This defines rough standards used for monster placement in these subvaults.
  -- Try to stick with using this for most subvaults, depending on openness:
- -- "small for ~11x11, "large" for ~>14x14, and "medium" for some inbetween.
+ -- "small for ~11x11, "large" for ~>14x14, and "medium" for some in between.
  -- Otherwise, use "custom", or not bother with the function.
 
 function vaults_room_setup(e, nsubst_glyph, nsubst_size)
diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des
index 13e508e..8b8f861 100644
--- a/crawl-ref/source/dat/des/branches/zot.des
+++ b/crawl-ref/source/dat/des/branches/zot.des
@@ -1560,8 +1560,8 @@ NAME:   st_large_dragon_hoard_4
 ENDMAP
 
 # A mighty hoard indeed...
-# Intented to be an extreme visual spectacle.
-# Obviously lowering the amount of gold in stacks in necessary.
+# Intended to be an extreme visual spectacle.
+# Obviously lowering the amount of gold in stacks is necessary.
 # There's about 800 gold.
 NAME:   st_grand_hoard_of_tiamat
 TAGS:   no_monster_gen
diff --git a/crawl-ref/source/dat/des/builder/layout.des b/crawl-ref/source/dat/des/builder/layout.des
index bf0adde..76c8520 100644
--- a/crawl-ref/source/dat/des/builder/layout.des
+++ b/crawl-ref/source/dat/des/builder/layout.des
@@ -1128,7 +1128,7 @@ NAME: layout_delve
 # layout_cocytus
 #
 # An ice cave approximation for Cocytus.  There is one main
-#  delved path that is guarenteed to contain at least one up and
+#  delved path that is guaranteed to contain at least one up and
 #  down stairs.  There are also other delved paths and
 #  diamond-shaped rooms, but these might be behind pools of
 #  water.  To avoid trapping the player, all random teleports go
@@ -1191,7 +1191,7 @@ NAME: layout_cocytus
     local top = 10
 
     -- Delve the main path and add two sets of stairs.  This
-    --  guarentees the map is connected without crossing water.
+    --  guarantees the map is connected without crossing water.
     --  Keep the '@' glyph for connectivity checking later.
     delve(ngb_min, ngb_max, connchance, total_count, top)
     nsubst('. = 1:@ / *:.')
diff --git a/crawl-ref/source/dat/des/builder/layout_forest.des b/crawl-ref/source/dat/des/builder/layout_forest.des
index 69bc4e6..a481ad5 100644
--- a/crawl-ref/source/dat/des/builder/layout_forest.des
+++ b/crawl-ref/source/dat/des/builder/layout_forest.des
@@ -108,7 +108,7 @@ NAME:   layout_twisted_forest
     elseif tv >= size then
       return outer_feature
     else
-      -- Gradiate plants over a slightly larger boundry
+      -- Graduate plants over a slightly larger boundary
       local pv = procedural.minmax_map(tv, size - 0.1, size + 0.6)
       if rand3 > 180 and pv > fjitter1(x,y) then
         return plant_feature
diff --git a/crawl-ref/source/dat/des/builder/layout_halls.des b/crawl-ref/source/dat/des/builder/layout_halls.des
index b38d94e..56ac87a 100644
--- a/crawl-ref/source/dat/des/builder/layout_halls.des
+++ b/crawl-ref/source/dat/des/builder/layout_halls.des
@@ -201,7 +201,7 @@ NAME:   layout_hall_layers
   end
 
   -- TODO: Package the func(s) into room generators. Then place them using hyper (with a
-  -- symetrically padded placement strategy). Then optionally outline with transparent
+  -- symmetrically padded placement strategy). Then optionally outline with transparent
   -- stone and surround in lava like old crosses layout
 
   procedural.render_map(_G, func, function(v) return (v < 1 and '.' or 'x') end)
diff --git a/crawl-ref/source/dat/des/builder/layout_loops.des b/crawl-ref/source/dat/des/builder/layout_loops.des
index eb64439..a0968ff 100644
--- a/crawl-ref/source/dat/des/builder/layout_loops.des
+++ b/crawl-ref/source/dat/des/builder/layout_loops.des
@@ -114,7 +114,7 @@
 #  or high values.
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> corners: The array of corners to update
 #  <3> start_x
 #  <4> start_y: The corrdinates of the start point
@@ -326,7 +326,7 @@
 #  lie within the minimum and maximum bounds given.
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> corners: The array of corners to update
 #  <3> center_x
 #  <4> center_y: The corrdinates of the center point
@@ -437,7 +437,7 @@
 #  positions.  The positions are chosen randomly.
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> corners: The array of corners to update
 #  <3> positions: The possible positions for loops
 #  <4> count: How many loops
@@ -526,7 +526,7 @@
 #  rooms with increasing frequency at larger radius values.
 #
 # Room shape:
-#  -> box: A simple sqaure
+#  -> box: A simple square
 #  -> diamond: A square, rotated 45 degrees
 #  -> octagon: A diamond minus the corners
 #  -> plus: A 3-wide X-junction
@@ -534,14 +534,14 @@
 # Room styles:
 #  -> open: Just open space
 #  -> solid: All but the outer ring of the room is filled with
-#            the specifed glyph
+#            the specified glyph
 #  -> outline: The outer ring of the room is cut; the rest is
-#              left with whatever gpyphs it had
+#              left with whatever glyphs it had
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <3> center_x
-#  <4> center_y: The corrdinates of the center of the room
+#  <4> center_y: The coordinates of the center of the room
 #  <5> radius: The radius of the room
 #  <6> wall_glyph: The glyph to fill the center of the room
 #                  with, if applicable
@@ -892,7 +892,7 @@
 # Has a chance at drawing a room at each unused corner.
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> corners: The array of corners to draw rooms at
 #  <3> percent: The chance (out of 100) of drawing a room
 #  <4> radius_min: The minimum radius of a room
@@ -958,7 +958,7 @@
 #  bias.
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> percent: The chance (out of 100) of drawing a room
 #  <3> radius_min: The minimum radius of a room
 #  <4> radius_max: The maximum radius of a room
@@ -1017,7 +1017,7 @@
 # Builds one quarter of the layout_loops_corners map
 #
 # Parameters:
-#  <1> e: The global enviroment
+#  <1> e: The global environment
 #  <2> center_x
 #  <3> center_y: The center of the corner
 #  <4> wall_glyph: The glyph to fill the center of the rooms
@@ -1189,10 +1189,10 @@ NAME:    layout_loops_misc
 #  connected but there is one that is not.
 #
 # There is always a (open) plus-shaped room placed at the
-#  center of this map where the four arms are guarenteed to be
+#  center of this map where the four arms are guaranteed to be
 #  connected.
 #
-# There is a chance that this layout places all 6 staircase.
+# There is a chance that this layout places all 6 staircases.
 #  If so, the three up stairs will be placed around one arm of
 #  the cross and the three down stairs will be placed around
 #  another (random) arm of the cross.
diff --git a/crawl-ref/source/dat/des/builder/layout_pools.des b/crawl-ref/source/dat/des/builder/layout_pools.des
index 0e5ff55..1d6dc99 100644
--- a/crawl-ref/source/dat/des/builder/layout_pools.des
+++ b/crawl-ref/source/dat/des/builder/layout_pools.des
@@ -2,9 +2,9 @@
 # layout_pools.des
 #
 # These layouts are based on the add_pools function.  They
-#  divide the map into a bunch of irregular areas jammed aginst
-#  each other.  The layout may use either the areas themsleves
-#  are the paths between them.  These are not true vaults, in
+#  divide the map into a bunch of irregular areas jammed against
+#  each other.  The layout may use either the areas themselves
+#  or the paths between them.  These are not true vaults, in
 #  that the dungeon builder can add other vaults on top of them.
 #
 
@@ -19,7 +19,7 @@
 #  vaults because they are each used in more than one.
 #
 # These maps have a small chance of placing the up stairs.
-#  This is handlied by always generating the layout as if
+#  This is handled by always generating the layout as if
 #  the stairs were to be placed, but only sometimes adding
 #  them.
 #
diff --git a/crawl-ref/source/dat/des/builder/layout_vaults.des b/crawl-ref/source/dat/des/builder/layout_vaults.des
index 3934dc6..ca50d91 100644
--- a/crawl-ref/source/dat/des/builder/layout_vaults.des
+++ b/crawl-ref/source/dat/des/builder/layout_vaults.des
@@ -89,7 +89,7 @@ NAME: layout_vaults_ring
 ################################################################################
 # Omnibox
 #
-# This will generate anything from chaotic city to maze (thru "square ring
+# This will generate anything from chaotic city to maze (through "square ring
 # huge center" / "square ring chaotic city") and more!
 #
 # Apologies if this is just too little code.
@@ -217,8 +217,8 @@ NAME: layout_vaults_big_cross
 MAP
 ENDMAP
 
-# The following couple have somewhat low weights because they're not doing anything any differnt than omnibox can produce,
-# although it would take a fairly specific and relativly unlikely omnibox to produce exactly the sme effect so they
+# The following couple have somewhat low weights because they're not doing anything any different than omnibox can produce,
+# although it would take a fairly specific and relatively unlikely omnibox to produce exactly the same effect so they
 # should stay in on their own right. However the basic maze is fairly pointless because omnibox quite regularly does
 # something very similar.
 NAME: layout_vaults_big_room
diff --git a/crawl-ref/source/dat/des/portals/lab.des b/crawl-ref/source/dat/des/portals/lab.des
index a8da7de..b2fa0b6 100644
--- a/crawl-ref/source/dat/des/portals/lab.des
+++ b/crawl-ref/source/dat/des/portals/lab.des
@@ -43,7 +43,7 @@ NAME:   lab_entry_generic
 # (1-500/10^4)^24 = ~29% chance of NOT placing a Labyrinth, ~71% chance
 # of getting a Labyrinth every game, skewed towards earlier depths.
 # (Mar 2013) A long while later, there is general agreement that something
-# should be changed about labyrinths to address percieved tedium.
+# should be changed about labyrinths to address perceived tedium.
 # For now, trimming spawning depths to keep the minotaur more dangerous.
 CHANCE: 5%
 DEPTH:  D:11-18, Orc:4, Lair
diff --git a/crawl-ref/source/dat/des/portals/ossuary.des b/crawl-ref/source/dat/des/portals/ossuary.des
index 46931fc..0e34cad 100644
--- a/crawl-ref/source/dat/des/portals/ossuary.des
+++ b/crawl-ref/source/dat/des/portals/ossuary.des
@@ -24,7 +24,7 @@
       finalmsg = "The hiss of flowing sand is almost imperceptible now.",
 
       verb = 'hiss',
-      -- This is always preceeded by an article, so...
+      -- This is always preceded by an article, so...
       noisemaker = 'avalanche of sand',
       ranges = {
         { 5000, 'rapid ' },  { 4000, '' },
diff --git a/crawl-ref/source/dat/des/serial/aquarium.des b/crawl-ref/source/dat/des/serial/aquarium.des
index 5c48864..eb8bedc 100644
--- a/crawl-ref/source/dat/des/serial/aquarium.des
+++ b/crawl-ref/source/dat/des/serial/aquarium.des
@@ -199,8 +199,8 @@
 
 #
 # This function replaces the specified glyphs with a random
-#  non-bridge subvault.  Using this functions guarentees that
-#  the weights remain consistant.
+#  non-bridge subvault.  Using this functions guarantees that
+#  the weights remain consistent.
 #
 
 {{
@@ -214,7 +214,7 @@
 #
 # This function is used to initialize the bridges in the
 #  aquarium_bridge_island_??? vaults.  There is a longer
-#  explanation under "bridges" below".
+#  explanation under "bridges" below.
 #
 {{
 function aquarium_setup_subvaults_island(e)
@@ -310,7 +310,7 @@ NAME:    serial_aquarium
 #  does.  Otherwise, when there is exactly one bridge, the 'm'
 #  glyph is used.  A position that depends only on one bridge is
 #  set with that bridge.  The tests required for this are just
-#  differant enough to make collecting them into a function
+#  different enough to make collecting them into a function
 #  impractical.  The aquarium_bridge_island_??? vaults are
 #  similar enough and simple enough that they were collected
 #  into a function (above).
@@ -445,7 +445,7 @@ NAME:    aquarium_subvault_large_4_pools
 NAME:    aquarium_bridge_square
 WEIGHT:  40
 TAGS:    serial_aquarium_bridge
-# One of 4 paths is guarenteed to be a bridge.
+# One of 4 paths is guaranteed to be a bridge.
 : local forced_bridge = math.floor(crawl.random2(4))
 : local bridge_p = false
 : local bridge_q = false
@@ -557,7 +557,7 @@ NAME:    aquarium_bridge_straight
 NAME:    aquarium_bridge_long_joined
 WEIGHT:  10
 TAGS:    serial_aquarium_bridge luniq_aquarium_bridge_long
-# One of 6 paths is guarenteed to be a bridge.
+# One of 6 paths is guaranteed to be a bridge.
 : local forced_bridge = math.floor(crawl.random2(6))
 : local bridge_p = false
 : local bridge_q = false
@@ -667,7 +667,7 @@ NAME:    aquarium_bridge_long_joined
 NAME:    aquarium_bridge_long_separate
 WEIGHT:  10
 TAGS:    serial_aquarium_bridge luniq_aquarium_bridge_long
-# One of path on each side is guarenteed to be a bridge.
+# One of path on each side is guaranteed to be a bridge.
 : local forced_bridge_1 = math.floor(crawl.random2(3))
 : local forced_bridge_2 = math.floor(crawl.random2(3))
 : local bridge_p = false
diff --git a/crawl-ref/source/dat/des/serial/teleporters.des b/crawl-ref/source/dat/des/serial/teleporters.des
index 42361cb..3a91116 100644
--- a/crawl-ref/source/dat/des/serial/teleporters.des
+++ b/crawl-ref/source/dat/des/serial/teleporters.des
@@ -14,7 +14,7 @@
 #  the shared teleporter ids.
 #
 # These do not place on bottom floors of branches or in
-#  Pandemonium becuase of the danger of teleporting the player
+#  Pandemonium because of the danger of teleporting the player
 #  into a rune vault (or Pan Lord vault).
 #
 # The "simple" teleporter vaults can appear randomly.
diff --git a/crawl-ref/source/dat/des/traps/boulders.des b/crawl-ref/source/dat/des/traps/boulders.des
index 61f09ef..bbb79b8 100644
--- a/crawl-ref/source/dat/des/traps/boulders.des
+++ b/crawl-ref/source/dat/des/traps/boulders.des
@@ -26,7 +26,7 @@
 
 end
 
--- TODO: Avoid enemies triggering it (altho allow summons)
+-- TODO: Avoid enemies triggering it (although allow summons)
 function callback.boulder_grate_trap_stepped(data, triggerable, triggerer, marker, ev)
   if data.triggered == true then
     return
diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
index cb08f29..02a0a70 100644
--- a/crawl-ref/source/dat/des/variable/float.des
+++ b/crawl-ref/source/dat/des/variable/float.des
@@ -30,7 +30,7 @@
 end
 }}
 
-# Set the default depth for vaults. Be sure to adapt the DEPTH of particulary
+# Set the default depth for vaults. Be sure to adapt the DEPTH of particularly
 # easy or tough vaults. Also, exclude unthemely branches with !Lair etc.
 default-depth: D:12-26
 
@@ -955,7 +955,7 @@ NAME:    infiniplex_staircase_pool_2
 SUBST:   D = WW.
 SUBST:   E = W..
 SUBST:   Z = wwW
-# Guarentee a path
+# Guarantee a path
 NSUBST:  S = 1:W / *:w
 # Place @(s)
 NSUBST:  ! = 1:@ / *:!
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 8018bdb..68ccfa9 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -2346,7 +2346,7 @@ scroll of remove curse:quote
 scroll of summoning
 
 This scroll calls forth several creatures woven from shadow into the shapes of
-those beings found within the reader's immediate vacinity.
+those beings found within the reader's immediate vicinity.
 %%%%
 scroll of summoning:quote
 
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index bdc0a69..ddeb225 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -691,7 +691,7 @@ already singing will start a new song, not extend an existing one.
 Spectral Weapon spell
 
 This spell draws out the spirit within a wielded weapon to fight for you, with
-its power dependant on your skill with said weapon. Never striking on its own,
+its power dependent on your skill with said weapon. Never striking on its own,
 it only attacks when you do. You can only ever have one spectral weapon at a time.
 
 Kills by a spectral weapon count as your own when singing a Song of Slaying.
diff --git a/crawl-ref/source/dat/dlua/dungeon.lua b/crawl-ref/source/dat/dlua/dungeon.lua
index 16fc003..3bdb157 100644
--- a/crawl-ref/source/dat/dlua/dungeon.lua
+++ b/crawl-ref/source/dat/dlua/dungeon.lua
@@ -630,7 +630,7 @@ function portal_next(e, next)
   end
 end
 
--- Turn persistant data into a human readable string.
+-- Turn persistent data into a human readable string.
 function persist_to_string()
     return table_to_string(dgn.persist)
 end
diff --git a/crawl-ref/source/dat/dlua/layout/hyper_paint.lua b/crawl-ref/source/dat/dlua/layout/hyper_paint.lua
index 787c5e9..18c0dd6 100644
--- a/crawl-ref/source/dat/dlua/layout/hyper_paint.lua
+++ b/crawl-ref/source/dat/dlua/layout/hyper_paint.lua
@@ -119,7 +119,7 @@ function hyper.paint.map_to_unit(x,y,item)
   local sx,sy = item.corner2.x - item.corner1.x,item.corner2.y - item.corner1.y
 
   -- Slightly scale down the input grid to add 0.5 squares padding on all sides. This should solve accuracy errors
-  -- we otherwise get at the edges of shapes from attempting to draw a continous geometric shape onto a discrete grid.
+  -- we otherwise get at the edges of shapes from attempting to draw a continuous geometric shape onto a discrete grid.
   local rx,ry = (x - item.corner1.x) * (sx-1)/sx + 0.5,(y - item.corner1.y) * (sy-1)/sy + 0.5
 
   -- Finally map onto the unit square
@@ -136,7 +136,7 @@ function hyper.paint.inside_oval(x,y,item)
   return (math.pow(ax * 2 - 1,2) + math.pow(ay * 2 - 1,2)) <= 1
 end
 
--- Determine if a point is inside a simple trapese
+-- Determine if a point is inside a simple trapeze
 -- TODO: Handle rotation and allow offsetting the top and bottom on the x axis for more complex shapes
 function hyper.paint.inside_trapese(x,y,item)
 
diff --git a/crawl-ref/source/dat/dlua/lm_trig.lua b/crawl-ref/source/dat/dlua/lm_trig.lua
index 388f431..2e3e825 100644
--- a/crawl-ref/source/dat/dlua/lm_trig.lua
+++ b/crawl-ref/source/dat/dlua/lm_trig.lua
@@ -27,11 +27,11 @@
 -- on each triggering only a single, randomly chosen slave will have
 -- on_trigger() called.
 --
--- Ordinarily, a master marker which listens to position-dependant events will
+-- Ordinarily, a master marker which listens to position-dependent events will
 -- only be triggered by events which happen at the master's position.  To make
 -- the master marker also listen to events which happen at the locations of the
 -- slave markers, set the property "listen_to_slaves" to anything but the empty
--- strign true.  This will cause all of the slave markers to be triggered
+-- string true.  This will cause all of the slave markers to be triggered
 -- whenever any of the slave markers are triggered.  To only trigger the slave
 -- where the event happened, also set the property "only_at_slave" to anything
 -- but the empty string.
diff --git a/crawl-ref/source/dat/dlua/v_layouts.lua b/crawl-ref/source/dat/dlua/v_layouts.lua
index 9dd3127..eaaab20 100644
--- a/crawl-ref/source/dat/dlua/v_layouts.lua
+++ b/crawl-ref/source/dat/dlua/v_layouts.lua
@@ -114,7 +114,7 @@ end
 
 -- TODO: The 'paint' parameter should disappear. Instead the options will contain a setup array. This could contain paint instructions,
 -- but alternately should be able to wire room generators to create initial terrain. Since rooms can now be created from paint arrays _anyway_,
--- it seems that pre-painting the layout is completely unneccesary and room generation can do anything ...
+-- it seems that pre-painting the layout is completely unnecessary and room generation can do anything ...
 function hypervaults.build_layout(e, name, paint, options)
   if e.is_validating() then return; end
 
diff --git a/crawl-ref/source/dgn-delve.cc b/crawl-ref/source/dgn-delve.cc
index 02c506d..3e80332 100644
--- a/crawl-ref/source/dgn-delve.cc
+++ b/crawl-ref/source/dgn-delve.cc
@@ -25,7 +25,7 @@
  *
  * Algorithm description:
  * The algorithm operates on a rectangular grid. Each cell can be 'wall'
- * or 'floor'. A (non-border) cell has 8 neigbours - diagonals count.
+ * or 'floor'. A (non-border) cell has 8 neighbours - diagonals count.
  * There is also a cell store with two operations: store a given cell on
  * top, and pull a cell from the store. The cell to be pulled is selected
  * randomly from the store if N_cells_in_store < 125, and from the top
@@ -33,7 +33,7 @@
  * repetitions, so a given cell can be stored multiple times.
  *
  * The algorithm starts with most of the map filled with 'wall', with a
- * "seed" of some floor cells; their neigbouring wall cells are in store.
+ * "seed" of some floor cells; their neighbouring wall cells are in store.
  * The main loop in delveon() is repeated until the desired number of
  * floor cells is achieved, or there is nothing in store:
  *     1) Get a cell from the store;
diff --git a/crawl-ref/source/dgn-irregular-box.cc b/crawl-ref/source/dgn-irregular-box.cc
index a3114e9..1d5d753 100644
--- a/crawl-ref/source/dgn-irregular-box.cc
+++ b/crawl-ref/source/dgn-irregular-box.cc
@@ -365,7 +365,7 @@ static void _flood_fill(vector<vector<char> >& map, int start_x, int start_y,
 //  the specified glyphs.  Only glyphs of the specified value
 //  are replaced.
 //
-// The outside is not guarenteed to be conected we fill each
+// The outside is not guaranteed to be connected we fill each
 //  point on each edge inwards in a straight line until it hits
 //  something other than the glyph to replace (or the outside
 //  glyph from before).  We made the irregularities by moving
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 0646f94..fc8c811 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1514,7 +1514,7 @@ int find_free_slot(const item_def &i)
     }
 
     // Either searchforward is true, or search backwards failed and
-    // we re-try searching the oposite direction.
+    // we re-try searching the opposite direction.
 
     int badslot = -1;
     // Return first free slot
@@ -2080,7 +2080,7 @@ bool move_top_item(const coord_def &pos, const coord_def &dest)
     dungeon_events.fire_position_event(
         dgn_event(DET_ITEM_MOVED, pos, 0, item, -1, dest), pos);
 
-    // Now move the item to its new possition...
+    // Now move the item to its new position...
     move_item_to_grid(&item, dest);
 
     return true;
diff --git a/crawl-ref/source/json.cc b/crawl-ref/source/json.cc
index 4eb9327..c3272a1 100644
--- a/crawl-ref/source/json.cc
+++ b/crawl-ref/source/json.cc
@@ -135,7 +135,7 @@ typedef uint32_t uchar_t;
  * Validate a single UTF-8 character starting at @s.
  * The string must be null-terminated.
  *
- * If it's valid, return its length (1 thru 4).
+ * If it's valid, return its length (1 through 4).
  * If it's invalid or clipped, return 0.
  *
  * This function implements the syntax given in RFC3629, which is
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index cb2c5e4..9a8f61d 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -389,7 +389,7 @@ static string vtostr(const keyseq &seq)
 }
 
 /*
- * Add a macro (suprise, suprise).
+ * Add a macro (surprise, surprise).
  */
 static void macro_add(macromap &mapref, keyseq key, keyseq action)
 {
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index d93dd79..1a59d4a 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3221,7 +3221,7 @@ static void _player_reacts()
     if (you.attribute[ATTR_NOISES])
         noisy_equipment();
 
-    // Handle sound-dependant effects that are silenced
+    // Handle sound-dependent effects that are silenced
     if (silenced(you.pos()))
     {
         if (you.duration[DUR_SONG_OF_SLAYING])
@@ -3231,7 +3231,7 @@ static void _player_reacts()
         }
     }
 
-    // Singing makes a continous noise
+    // Singing makes a continuous noise
     if (you.duration[DUR_SONG_OF_SLAYING])
         noisy(10, you.pos());
 
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 5e6f1a6..b098742 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4699,7 +4699,7 @@ static int _str_to_ego(item_spec &spec, string ego_str)
             return (i + 1);
     }
 
-    // Incompatible or non-existant ego type
+    // Incompatible or non-existent ego type
     for (int i = 1; i <= 2; i++)
     {
         const char** list = name_lists[order[i]];
@@ -4710,7 +4710,7 @@ static int _str_to_ego(item_spec &spec, string ego_str)
                 return -1;
     }
 
-    // Non-existant ego
+    // Non-existent ego
     return 0;
 }
 
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index cc260c8..89b8696 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -3325,7 +3325,7 @@ bool melee_attack::apply_damage_brand()
     {
         // This was originally for confusing touch and it doesn't really
         // work on the player, but a monster with a chaos weapon will
-        // occassionally come up with this brand. -cao
+        // occasionally come up with this brand. -cao
         if (defender->is_player())
             break;
 
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 5cdc798..9b801fe 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -2389,11 +2389,11 @@ MenuObject* PrecisionMenu::_find_object_by_direction(const MenuObject* start,
         aabb_start.x = start->get_min_coord().x;
         aabb_end.x = start->get_max_coord().x;
         aabb_start.y = start->get_max_coord().y;
-        // we choose an arbitarily large number here, because
+        // we choose an arbitrarily large number here, because
         // tiles saves entry coordinates in pixels, yet console saves them
         // in characters
-        // basicly, we want the AABB to be large enough to extend to the bottom
-        // of the screen in every possible resolution
+        // basically, we want the AABB to be large enough to extend to the
+	// bottom of the screen in every possible resolution
         aabb_end.y = 32767;
         break;
     case LEFT:
@@ -2864,7 +2864,7 @@ void TextItem::_wrap_text()
     if (num_linebreaks > max_lines)
     {
         size_t pos = 0;
-        // find the max_line'th occurence of '\n'
+        // find the max_line'th occurrence of '\n'
         for (int i = 0; i < max_lines; ++i)
             pos = m_render_text.find('\n', pos);
 
@@ -3647,11 +3647,11 @@ MenuItem* MenuFreeform::_find_item_by_direction(const MenuItem* start,
         aabb_start.x = start->get_min_coord().x;
         aabb_end.x = start->get_max_coord().x;
         aabb_start.y = start->get_max_coord().y;
-        // we choose an arbitarily large number here, because
+        // we choose an arbitrarily large number here, because
         // tiles saves entry coordinates in pixels, yet console saves them
         // in characters
-        // basicly, we want the AABB to be large enough to extend to the bottom
-        // of the screen in every possible resolution
+        // basically, we want the AABB to be large enough to extend to the
+	// bottom of the screen in every possible resolution
         aabb_end.y = 32767;
         break;
     case LEFT:
diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h
index 135ac4c..84238dc 100644
--- a/crawl-ref/source/menu.h
+++ b/crawl-ref/source/menu.h
@@ -58,7 +58,7 @@ struct menu_letter
     }
 };
 
-// XXX Use inheritence instead of duplicate code
+// XXX Use inheritance instead of duplicate code
 struct menu_letter2
 {
     char letter;
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index d947117..5b2f405 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1172,10 +1172,10 @@ bool mons_is_draconian(monster_type mc)
     return (mc >= MONS_FIRST_DRACONIAN && mc <= MONS_LAST_DRACONIAN);
 }
 
-// Conjured (as opposed to summoned) monsters are actually here, eventhough
-// they're typically volatile (like, made of real fire).  As such, they
-// should be immune to Abjuration or Recall.  Also, they count as things
-// rather than beings.
+// Conjured (as opposed to summoned) monsters are actually here, even
+// though they're typically volatile (like, made of real fire). As such,
+// they should be immune to Abjuration or Recall. Also, they count as
+// things rather than beings.
 bool mons_is_conjured(monster_type mc)
 {
     return mons_is_projectile(mc)
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc
index 43a344e..e325d03 100644
--- a/crawl-ref/source/prebuilt/levcomp.tab.cc
+++ b/crawl-ref/source/prebuilt/levcomp.tab.cc
@@ -1455,7 +1455,7 @@ yyparse ()
        `yyss': related to states.
        `yyvs': related to semantic values.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index de99907..6792630 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -298,7 +298,7 @@ static void _check_inventory_skills()
 {
     for (int i = 0; i < ENDOFPACK; ++i)
     {
-        // Exit early if ther's no more skill to check.
+        // Exit early if there's no more skill to check.
         if (you.stop_train.empty())
             return;
 
@@ -321,7 +321,7 @@ static void _check_spell_skills()
 {
     for (int i = 0; i < MAX_KNOWN_SPELLS; i++)
     {
-        // Exit early if ther's no more skill to check.
+        // Exit early if there's no more skill to check.
         if (you.stop_train.empty())
             return;
 
diff --git a/crawl-ref/source/spl-other.cc b/crawl-ref/source/spl-other.cc
index dac75bb..70c3f4a 100644
--- a/crawl-ref/source/spl-other.cc
+++ b/crawl-ref/source/spl-other.cc
@@ -247,7 +247,7 @@ void recall_orders(monster *mons)
     // Don't wander
     mons->behaviour = BEH_SEEK;
 
-    // Don't persue distant enemies
+    // Don't pursue distant enemies
     const actor *foe = mons->get_foe();
     if (foe && !you.can_see(foe))
         mons->foe = MHITYOU;
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 77f7df0..5f66de5 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -634,7 +634,7 @@ int apply_random_around_square(cell_func cf, const coord_def& where,
         //
         // 2) Assume the distribution is uniform at n = m+k.
         //    (ie. the probablity that any of the found elements
-        //     was chosen = m / (m+k) (the slots are symetric,
+        //     was chosen = m / (m+k) (the slots are symmetric,
         //     so it's the sum of the probabilities of being in
         //     any of them)).
         //
@@ -665,8 +665,8 @@ int apply_random_around_square(cell_func cf, const coord_def& where,
         // just don't care about the non-chosen slots enough
         // to store them, so it might look like the item
         // automatically takes the new slot when not chosen
-        // (although, by symetry all the non-chosen slots are
-        // the same... and similarly, by symetry, all chosen
+        // (although, by symmetry all the non-chosen slots are
+        // the same... and similarly, by symmetry, all chosen
         // slots are the same).
         //
         // Yes, that's a long comment for a short piece of
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index a23c89a..188318b 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -41,7 +41,7 @@ enum spell_highlight_colours
     COL_MEMORIZED    = LIGHTGRAY,   // spell has been memorized
     COL_USELESS      = DARKGRAY,    // ability would have no useful effect
     COL_INAPPLICABLE = COL_USELESS, // ability cannot be meanifully applied (eg, no targets)
-    COL_FORBIDDEN    = LIGHTRED,    // The player's god hates this abilty
+    COL_FORBIDDEN    = LIGHTRED,    // The player's god hates this ability
 
     COL_EMPOWERED    = LIGHTGREEN,  // The ability is made stronger by the player's status
     COL_FAVORED      = GREEN,       // the player's god likes this ability
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 279e35b..0e63975 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -166,8 +166,8 @@ void game_state::cant_cmd_any(string reason)
 
 // The method is called to prevent the "no repeating zero turns
 // commands" message that input() generates (in the absence of
-// cancelling the repeition) for a repeated command that took no
-// turns.  A wrapper around cancel_cmd_repeat(), its only purpose it
+// cancelling the repetition) for a repeated command that took no
+// turns.  A wrapper around cancel_cmd_repeat(), its only purpose is
 // to make it clear why cancel_cmd_repeat() is being called.
 void game_state::zero_turns_taken()
 {
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc
index b486e72..94bd6a7 100644
--- a/crawl-ref/source/store.cc
+++ b/crawl-ref/source/store.cc
@@ -1440,7 +1440,7 @@ const CrawlStoreValue& CrawlHashTable::get_value(const string &key) const
 {
 #ifdef ASSERTS
     if (!hash_map)
-        die("trying to read non-existant property \"%s\"", key.c_str());
+        die("trying to read non-existent property \"%s\"", key.c_str());
 #endif
     ASSERT_VALIDITY();
 
@@ -1449,7 +1449,7 @@ const CrawlStoreValue& CrawlHashTable::get_value(const string &key) const
 
 #ifdef ASSERTS
     if (i == hash_map->end())
-        die("trying to read non-existant property \"%s\"", key.c_str());
+        die("trying to read non-existent property \"%s\"", key.c_str());
 #endif
     ASSERT(i->second.type != SV_NONE);
     ASSERT(!(i->second.flags & SFLAG_UNSET));
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 2fabee3..bc4d610 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1,6 +1,6 @@
 /**
  * @file
- * @brief Auxilary functions to make savefile versioning simpler.
+ * @brief Auxiliary functions to make savefile versioning simpler.
 **/
 
 /*
diff --git a/crawl-ref/source/tags.h b/crawl-ref/source/tags.h
index dac3e29..1ac0cd8 100644
--- a/crawl-ref/source/tags.h
+++ b/crawl-ref/source/tags.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * @brief Auxilary functions to make savefile versioning simpler.
+ * @brief Auxiliary functions to make savefile versioning simpler.
 **/
 
 #ifndef TAGS_H
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 259189e..0672c1d 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -1917,7 +1917,7 @@ bool plant_forbidden_at(const coord_def &p, bool connectivity_only)
             else if (last >= 0 && next < 0)
             {
                 // Found a maybe-disconnected traversable cell.  This is only
-                // acceptible if it might connect up at the end.
+                // acceptable if it might connect up at the end.
                 if (first == 0)
                     next = i;
                 else
diff --git a/crawl-ref/source/tilereg-dgn.cc b/crawl-ref/source/tilereg-dgn.cc
index 5184d47..9131c4d 100644
--- a/crawl-ref/source/tilereg-dgn.cc
+++ b/crawl-ref/source/tilereg-dgn.cc
@@ -450,7 +450,7 @@ static bool _is_appropriate_evokable(const item_def& item,
     if (!item_type_known(item))
         return true;
 
-    // Random effects are always (in)apropriate for all targets.
+    // Random effects are always (in)appropriate for all targets.
     if (item.sub_type == WAND_RANDOM_EFFECTS)
         return true;
 
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index a53e28a..62c6097 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1188,7 +1188,7 @@ void TilesFramework::place_minimap()
 
 int TilesFramework::calc_tab_lines(const int num_elements)
 {
-    // Integer divison rounded up
+    // Integer division rounded up
     return (num_elements - 1) / m_region_tab->mx + 1;
 }
 
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 53a11a1..8134cf3 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -573,7 +573,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed)
     if (in_sight)
         reveal();
 
-    // Store the position now in case it gets cleared inbetween.
+    // Store the position now in case it gets cleared in between.
     const coord_def p(pos);
 
     if (type_has_ammo())
diff --git a/crawl-ref/source/util/cpp_version b/crawl-ref/source/util/cpp_version
index 8805ce0..2d3056c 100755
--- a/crawl-ref/source/util/cpp_version
+++ b/crawl-ref/source/util/cpp_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Includes may depend on a generated header, let's not unnecesarily require
+# Includes may depend on a generated header, let's not unnecessarily require
 # compilation just to gather strings.
 #
 # Use a future version tag, we remove descs immediately even though the item/
diff --git a/crawl-ref/source/util/txc b/crawl-ref/source/util/txc
index 9af7c82..f3d0b41 100755
--- a/crawl-ref/source/util/txc
+++ b/crawl-ref/source/util/txc
@@ -425,7 +425,7 @@ class ResourceFile():
 
     def __setitem__(self, key, value):
         """Called by the subclass which has already done the conversion.
-        Determine the change type and store the new value in the apropriate
+        Determine the change type and store the new value in the appropriate
         dict of self.diff"""
         if key not in self.entries:
             if key.find(':') != -1 and key.split(':')[1] == 'quote':
diff --git a/crawl-ref/source/webserver/inotify.py b/crawl-ref/source/webserver/inotify.py
index c1be527..a2b5193 100644
--- a/crawl-ref/source/webserver/inotify.py
+++ b/crawl-ref/source/webserver/inotify.py
@@ -19,7 +19,7 @@ class _CtypesLibcINotifyWrapper():
         try:
             libc_name = ctypes.util.find_library('c')
         except (OSError, IOError):
-            pass  # Will attemp to load it with None anyway.
+            pass  # Will attempt to load it with None anyway.
 
         if sys.version_info >= (2, 6):
             self._libc = ctypes.CDLL(libc_name, use_errno=True)
diff --git a/crawl-ref/source/webserver/static/scripts/contrib/jquery.cookie.js b/crawl-ref/source/webserver/static/scripts/contrib/jquery.cookie.js
index 4244ff9..a80bc91 100644
--- a/crawl-ref/source/webserver/static/scripts/contrib/jquery.cookie.js
+++ b/crawl-ref/source/webserver/static/scripts/contrib/jquery.cookie.js
@@ -32,7 +32,7 @@
  *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
  *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
  *                             when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String path The value of the path attribute of the cookie (default: path of page that created the cookie).
  * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
  * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
  *                        require a secure protocol (like HTTPS).
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 1698ecd..61b22d0 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -1470,7 +1470,7 @@ void debug_miscast(int target_index)
         return;
     }
 
-    // Supress "nothing happens" message for monster miscasts which are
+    // Suppress "nothing happens" message for monster miscasts which are
     // only harmless messages, since a large number of those are missing
     // monster messages.
     nothing_happens_when_type nothing = NH_DEFAULT;
-- 
1.8.3.3

From 2f4a073061aa0e45abceeae8f9b26650ed6598a1 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Wed, 17 Jul 2013 19:56:53 +0200
Subject: Fix typos in comments

---
 crawl-ref/source/dat/descript/tutorial.txt | 2 +-
 crawl-ref/source/itemprop-enum.h           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/descript/tutorial.txt b/crawl-ref/source/dat/descript/tutorial.txt
index c5044a0..143eb4b 100644
--- a/crawl-ref/source/dat/descript/tutorial.txt
+++ b/crawl-ref/source/dat/descript/tutorial.txt
@@ -244,7 +244,7 @@ Pick up this bow and wield it with
 %%%%
 tutorial2 firing
 
-# FIXME: Lenghty because of the hint for choosing target.
+# FIXME: Lengthy because of the hint for choosing target.
 Firing arrows from your wielded bow works exactly the same as throwing darts:
 via <input>$cmd[CMD_FIRE]</input><localtiles> or <input>mouseclick</input>. You
 can change the targeted monster by pressing
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index f30bf23..2b7e1a3 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -377,7 +377,7 @@ enum special_missile_type // to separate from weapons in general {dlb}
     SPMSL_EXPLODING,
     SPMSL_STEEL,
     SPMSL_SILVER,
-    SPMSL_PARALYSIS,                   // needle only from here in
+    SPMSL_PARALYSIS,                   // needle only from here on
     SPMSL_SLOW,
     SPMSL_SLEEP,
     SPMSL_CONFUSION,
-- 
1.8.3.2