Get rid of USisms in spelling of -ll- and -tt-.

This mostly reverts 78d8ab06 which replaced Commonwealth "targetting" with US
"targeting", although there's also "cancelLing", "levelLing", "travelLing".

43 files changed, 176 insertions, 176 deletions

diff --git a/crawl-ref/docs/crawl_manual.reST b/crawl-ref/docs/crawl_manual.reST
index 51b096df25..1260deec9f 100644
--- a/crawl-ref/docs/crawl_manual.reST
+++ b/crawl-ref/docs/crawl_manual.reST
@@ -452,7 +452,7 @@ To access Crawl's help menu, press '?'. To get the list of all commands, press
 Appendix `4. List of Keys and Commands`_ of this text. Various other help texts are
 available as well, including this manual. You can also read the logbook from
 there by pressing ':'. Note that several commands have their own help screens,
-among them are targeting ('f'), level map ('X'), travel ('G' or 'Ctrl-G') and
+among them are targetting ('f'), level map ('X'), travel ('G' or 'Ctrl-G') and
 searching ('Ctrl-F'); again, press '?' when asked for input.
 
 If you don't like the standard keyset (either because some keys do not work
@@ -528,10 +528,10 @@ encounters to their liking.
 There are several other less dangerous methods you can use to kill monsters.
 Hunters and similarly oriented characters will prefer ranged combat to mindless
 bashing. When wielding some launcher, the 'f' and 'F' commands will fire
-appropriate missiles. See the section on Targeting in the Items Chapter for more
+appropriate missiles. See the section on Targetting in the Items Chapter for more
 on this. Likewise, many magicians will prefer to use spells from a safe
 distance. They can use the 'z' command to cast spells previously memorised.
-Again, see the Targeting section.
+Again, see the Targetting section.
 
 Some monsters can be friendly; friendly monsters will follow you around and
 fight on your behalf (but they gain some of the normal experience points for any
@@ -730,7 +730,7 @@ inserting it into the quiver use 'F' instead. Note that non-weapon, non-missile
 items will never be quivered.
 
 The interface for shooting or throwing things is also used for evoking wands and
-casting certain spells, and is described in detail in section I (Targeting).
+casting certain spells, and is described in detail in section I (Targetting).
 
 [ Armour
 ========================================
@@ -829,7 +829,7 @@ function when its charges run out. You must identify a wand to find out how many
 uses it has left. This can be done with a scroll of identify; characters with a
 good Evocations skill may also deduce the number of charges simply upon evoking
 the wand. Wands are aimed in the same way as missile weapons, and you can
-release the power of a wand by evoking it with 'V'. See section I for targeting.
+release the power of a wand by evoking it with 'V'. See section I for targetting.
 There are also a number of wands that may be useful to aim at yourself, but it
 is usually prudent to know what you are evoking before you do so.
 
@@ -1042,7 +1042,7 @@ Be careful of magic-using enemies! Some of them can use magic just as well as
 you, if not better, and often use it intelligently.
 
 ****************************************
-I. Targeting
+I. Targetting
 ****************************************
 
 When throwing something, evoking certain wands, or casting spells, you are asked
@@ -1067,7 +1067,7 @@ Otherwise, you use the following commands:
     missiles won't end up in deep water.
   - You can press Escape if you changed your mind - no turns are deducted.
 
-There are some shortcuts while targeting:
+There are some shortcuts while targetting:
 
   - Typing Shift-direction on your keypad fires straight away in that direction.
   - Pressing 'p' or 'f' fires at the previous target (if it is still alive and
@@ -1082,12 +1082,12 @@ of '.', Enter, etc. - except if you want to heal or haste someone else. If you
 target yourself while firing something harmful (which can be sensible at times),
 you will be asked for confirmation.
 
-Finally, there are some more targeting related commands:
+Finally, there are some more targetting related commands:
 
   - '(' and ')' allow to change the ammunition. This is useful when you have
     several types of appropriate ammunition, say poisoned needles and curare
     needles. Your last usage will be remembered. Note that you can use '(' for
-    changing the quiver ammunition even outside of targeting.
+    changing the quiver ammunition even outside of targetting.
   - The ':' key allows you to hide the path of your spell/wand/missile.
   - Ctrl-F changes which monsters are cycled when using '+', '=' or '-':
     hostiles, friends, plants or all monsters.
@@ -1139,7 +1139,7 @@ of a freak they've become and the 'a' command to activate any mutations which
 can be controlled. Many mutations are actually beneficial to the characters, but
 there are plenty of nasty ones as well. Many mutations have three levels, each
 of which counts as a single mutation. Some changes to the primary attributes
-Strength, Intelligence and Dexterity (apart from those by leveling) are also
+Strength, Intelligence and Dexterity (apart from those by levelling) are also
 handled as mutations - in particular, these are not permanent.
 
 You can also become mutated by overusing certain powerful enchantments,
@@ -2212,7 +2212,7 @@ confusing, since there are also several modes; here is the full list. Some
 commands are particularly useful in combination with certain interface options;
 such options are mentioned in the list. For a description of them, please look
 into options_guide.txt. For a more terse list of all commands, use '??' in-game.
-Most modes (targeting, level map, interlevel travel) also have help menus via
+Most modes (targetting, level map, interlevel travel) also have help menus via
 '?' on their own.
 
 Movement
@@ -2748,16 +2748,16 @@ _
 Tab
   Cycle shops and portals.
 
-Targeting
+Targetting
 ========================================
 
-Targeting mode is similar to examining surroundings. It is activated whenever
+Targetting mode is similar to examining surroundings. It is activated whenever
 you fire projectiles, evoke a wand or cast spells which use targets. All of the
 commands described for examination of surroundings work, with the exception of
 Space (which fires).
 
 Esc or x
-  Stop targeting.
+  Stop targetting.
 
 ?
   Special help screen.
@@ -2786,13 +2786,13 @@ Ctrl-F
   target_zero_exp).
 
 (, )
-  These two commands allow you to change ammunition while targeting. The choice
+  These two commands allow you to change ammunition while targetting. The choice
   is subject to the fire_order option. Usually, you change missiles according to
   your launcher; i.e. when wielding a bow, ( and ) will cycle through all stacks
   of arrows in your inventory.
 
 Shift-direction
-  Fire straight in that direction. You can go back to the old targeting mode
+  Fire straight in that direction. You can go back to the old targetting mode
   (allowing straight firing by pressing just the direction key) using the option
   target_unshifted_dirs. Note that target_unshifted_dirs is mutually exclusive
   with default_target.
diff --git a/crawl-ref/docs/key_changes.txt b/crawl-ref/docs/key_changes.txt
index 6dc8a9db4a..7f11e21346 100644
--- a/crawl-ref/docs/key_changes.txt
+++ b/crawl-ref/docs/key_changes.txt
@@ -64,7 +64,7 @@ The * Direction and Ctrl-Direction keys now both open and close doors.
                  Ctrl-V      Tiles settings            was Ctrl-Q
                  Ctrl-Q      quit                      was Q
 
-There are additional changes to the targeting interface:
+There are additional changes to the targetting interface:
 The functions of ! and . have been swapped. So firing with . will now stop at
 the target, whereas ! will shoot further if the target was missed (and Enter,
 Del, Space still behave as in 0.3.4).
diff --git a/crawl-ref/docs/macros_guide.txt b/crawl-ref/docs/macros_guide.txt
index f908048e69..4a22cee20c 100644
--- a/crawl-ref/docs/macros_guide.txt
+++ b/crawl-ref/docs/macros_guide.txt
@@ -19,7 +19,7 @@ Keymaps are for when you want to fix layout and behavioural problems on
 your keyboard (i.e. unrecognised numpad sequences can by mapped into
 their numbers, foreign keyboard layouts can be modified to be more
 comfortable). There are also special sets of keymaps for the level map,
-the targeting mode and confirmation prompts, which allow for mappings
+the targetting mode and confirmation prompts, which allow for mappings
 that are restricted to just those situations.
 
 
@@ -41,7 +41,7 @@ Ctrl, Shift or both. On some systems, it may also be possible to
 incorporate the Alt (Meta) key.
 
 Defining keymaps works in exactly the same way. Just press 'k'
-(default), 'x' (level-map), 't' (targeting) or 'c' (confirmation)
+(default), 'x' (level-map), 't' (targetting) or 'c' (confirmation)
 instead of 'm' after pressing '~'.
 
 After defining such a macro or keymap, you should test it. If you are
@@ -77,7 +77,7 @@ For keymaps just replace the "M:" on the first line of the definiton
 with one of the following:
 "K:"  default,
 "K1:" level-map,
-"K2:" targeting or
+"K2:" targetting or
 "K3:" confirmation.
 
 
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 1216006cc9..d2f12a59be 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -28,7 +28,7 @@ The contents of this text are:
                 autopickup_no_burden, pickup_thrown, chunks_autopickup,
                 assign_item_slot, drop_mode, pickup_mode, drop_filter,
                 default_friendly_pickup
-4-b     Targeting.
+4-b     Targetting.
                 default_target, target_unshifted_dirs, darken_beyond_range
 4-c     Passive Sightings (detected and remembered entities).
                 detected_monster_colour, detected_item_colour,
@@ -569,16 +569,16 @@ default_friendly_pickup = (friend | player | none | all)
         Also, friendly jellies won't ever eat any items, regardless of
         this option.
 
-4-b     Targeting.
+4-b     Targetting.
 -------------------
 
 default_target = true
-        If set to true (the default), targeting will start on either
+        If set to true (the default), targetting will start on either
         your previous target (if it is still visible) or the closest
         monster (if not) rather than on the character. If no monsters
-        are in view, targeting will start on the character regardless.
+        are in view, targetting will start on the character regardless.
 
-        If default_target = false, the targeting cursor will always
+        If default_target = false, the targetting cursor will always
         start aimed at the character.
 
         default_target is mutually exclusive with
@@ -586,18 +586,18 @@ default_target = true
         disable target_unshifted_dirs.
 
 target_unshifted_dirs = false
-        If set to true, targeting will use the old Stone Soup 0.1 /
-        Crawl 4.0 targeting keymap where unshifted direction keys fire
+        If set to true, targetting will use the old Stone Soup 0.1 /
+        Crawl 4.0 targetting keymap where unshifted direction keys fire
         in that direction immediately. The default is to use the new
-        targeting keymap where unshifted direction keys move the
-        targeting cursor (and shifted directions fire in the given
+        targetting keymap where unshifted direction keys move the
+        targetting cursor (and shifted directions fire in the given
         direction immediately).
 
         If you use target_unshifted_dirs, default_target will be
         automatically disabled.
 
 darken_beyond_range = true
-        If set to true, everything beyond range when targeting will be
+        If set to true, everything beyond range when targetting will be
         coloured grey. Setting this to false will also suppress the brief
         flash if there are no visible monsters within range, both for
         ASCII and the Tiles version.
@@ -1034,12 +1034,12 @@ easy_confirm = (none | safe | all)
         questions.
 
 allow_self_target = (yes | no | prompt)
-        Allow targeting yourself with risky magic (e.g., the spell
+        Allow targetting yourself with risky magic (e.g., the spell
         Bolt of Fire or a wand of slowing.)
         When set to 'yes', you are a valid target. When set to 'no',
         you cannot target yourself with such spells. When set to
         'prompt' (the default), you will be required to confirm
-        self-targeting. This option has no effect on area-effect
+        self-targetting. This option has no effect on area-effect
         spells, such as Mephitic Cloud or Evaporate, where you
         are always a valid target.
 
@@ -2240,7 +2240,7 @@ background_colour = black
 
 use_fake_cursor = true
         If true, Crawl draws the cursor explicitly on the level-map and
-        targeting screens instead of relying on the term to draw the
+        targetting screens instead of relying on the term to draw the
         cursor. Use this if your term cannot show a cursor over
         darkgrey/black squares.
         On non-Unix builds this option defaults to false.
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 01a0bca564..00de8fc696 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1134,7 +1134,7 @@ bool bolt::hit_wall()
         && !feat_is_solid(grd(target)))
     {
         // Okay, with all those tests passed, this is probably an instance
-        // of the player manually targeting something whose line of fire
+        // of the player manually targetting something whose line of fire
         // is blocked, even though its line of sight isn't blocked.  Give
         // a warning about this fact.
         std::string prompt = "Your line of fire to ";
@@ -2802,7 +2802,7 @@ void bolt::internal_ouch(int dam)
             if (aimed_at_feet && effect_known)
                 ouch(dam, NON_MONSTER, KILLED_BY_SELF_AIMED, name.c_str());
             else
-                ouch(dam, NON_MONSTER, KILLED_BY_TARGETING);
+                ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING);
         }
     }
     else if (MON_KILL(thrower))
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index b5ec91dc57..7ed23dc197 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -719,7 +719,7 @@ static bool _cmdhelp_textfilter(const std::string &tag)
     return (false);
 }
 
-static const char *targeting_help_1 =
+static const char *targetting_help_1 =
     "<h>Examine surroundings ('<w>x</w><h>' in main):\n"
     "<w>Esc</w> : cancel (also <w>Space</w>, <w>x</w>)\n"
     "<w>Dir.</w>: move cursor in that direction\n"
@@ -736,15 +736,15 @@ static const char *targeting_help_1 =
     "<w>Tab</w> : cycle through shops and portals\n"
     "<w>r</w> : move cursor to you\n"
     "<w>e</w> : create/remove travel exclusion\n"
-    "<w>Ctrl-F</w> : monster targeting modes\n"
+    "<w>Ctrl-F</w> : monster targetting modes\n"
 #ifndef USE_TILE_LOCAL
-    "<w>Ctrl-L</w> : targeting via monster list\n"
+    "<w>Ctrl-L</w> : targetting via monster list\n"
 #endif
     "<w>Ctrl-P</w> : repeat prompt\n"
 ;
 #ifdef WIZARD
-static const char *targeting_help_wiz =
-    "<h>Wizard targeting commands:</h>\n"
+static const char *targetting_help_wiz =
+    "<h>Wizard targetting commands:</h>\n"
     "<w>Ctrl-C</w> : cycle through beam paths\n"
     "<w>D</w>: get debugging information about the monster\n"
     "<w>o</w>: give item to monster\n"
@@ -764,8 +764,8 @@ static const char *targeting_help_wiz =
 ;
 #endif
 
-static const char *targeting_help_2 =
-    "<h>Targeting (zap wands, cast spells, etc.):\n"
+static const char *targetting_help_2 =
+    "<h>Targetting (zap wands, cast spells, etc.):\n"
     "Most keys from examine surroundings work.\n"
     "Some keys fire at the target. By default,\n"
     "range is respected and beams don't stop.\n"
@@ -1993,7 +1993,7 @@ static int _show_keyhelp_menu(const std::vector<formatted_string> &lines,
             "<w>F</w>.      Monsters\n"
             "<w>G</w>.      Items\n"
             "<w>H</w>.      Spellcasting\n"
-            "<w>I</w>.      Targeting\n"
+            "<w>I</w>.      Targetting\n"
             "<w>J</w>.      Religion\n"
             "<w>K</w>.      Mutations\n"
             "<w>L</w>.      Licence, Contact, History\n"
@@ -2078,18 +2078,18 @@ void show_pickup_menu_help()
     _show_specific_help(getHelpString("pick-up"));
 }
 
-void show_targeting_help()
+void show_targetting_help()
 {
     column_composer cols(2, 40);
     // Page size is number of lines - one line for --more-- prompt.
     cols.set_pagesize(get_number_of_lines() - 1);
 
-    cols.add_formatted(0, targeting_help_1, true, true);
+    cols.add_formatted(0, targetting_help_1, true, true);
 #ifdef WIZARD
     if (you.wizard)
-        cols.add_formatted(0, targeting_help_wiz, true, true);
+        cols.add_formatted(0, targetting_help_wiz, true, true);
 #endif
-    cols.add_formatted(1, targeting_help_2, true, true);
+    cols.add_formatted(1, targetting_help_2, true, true);
     _show_keyhelp_menu(cols.formatted_lines(), false, Options.easy_exit_menu);
 }
 void show_interlevel_travel_branch_help()
@@ -2455,7 +2455,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
     std::string text =
             "Many commands have context sensitive "
             "help, among them <w>%</w>, <w>%</w>, <w>%</w> (or any "
-            "form of targeting), <w>%</w>, and <w>%</w>.\n"
+            "form of targetting), <w>%</w>, and <w>%</w>.\n"
             "You can read descriptions of your "
             "current spells (<w>%</w>), skills (<w>%?</w>) and "
             "abilities (<w>%!</w>).";
@@ -2642,7 +2642,7 @@ static void _add_formatted_hints_help(column_composer &cols)
 
     cols.add_formatted(
             1,
-            "\n<h>Targeting\n"
+            "\n<h>Targetting\n"
             "<w>Enter</w> or <w>.</w> or <w>Del</w> : confirm target\n"
             "<w>+</w> and <w>-</w> : cycle between targets\n"
             "<w>f</w> or <w>p</w> : shoot at previous target\n"
diff --git a/crawl-ref/source/command.h b/crawl-ref/source/command.h
index b0a6beceee..874bf875a1 100644
--- a/crawl-ref/source/command.h
+++ b/crawl-ref/source/command.h
@@ -18,7 +18,7 @@ void swap_inv_slots(int slot1, int slot2, bool verbose);
 
 void show_levelmap_help();
 void show_pickup_menu_help();
-void show_targeting_help();
+void show_targetting_help();
 void show_interlevel_travel_branch_help();
 void show_interlevel_travel_depth_help();
 void show_stash_search_help();
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 54ccc82620..bf7bb5fca9 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -3862,7 +3862,7 @@ _gastronok_self_buff_
 
 @The_monster@'s eyestalks stretch out, then return to normal size.
 %%%%
-# When targeting other monsters.
+# When targetting other monsters.
 _gastronok_other_buff_
 
 @The_monster@ wobbles.
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index be6ba28fb0..280f16ca05 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -21,7 +21,7 @@ This amulet makes its wearer less susceptible to external damage, draining magic
 %%%%
 amulet of inaccuracy
 
-This amulet makes its wearer less accurate in hand combat and when targeting monsters via ranged attacks or spells.
+This amulet makes its wearer less accurate in hand combat and when targetting monsters via ranged attacks or spells.
 %%%%
 amulet of rage
 
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index e133a0ad88..85b5565cfb 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2863,7 +2863,7 @@ bool card_effect(card_type which_card, deck_rarity_type rarity,
 
     if (tell_card)
     {
-        // These card types will usually give this message in the targeting
+        // These card types will usually give this message in the targetting
         // prompt, and the cases where they don't are handled specially.
         if (which_card != CARD_VITRIOL && which_card != CARD_FLAME
             && which_card != CARD_FROST && which_card != CARD_HAMMER
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 3201e6dd2d..b46fb279a9 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -126,7 +126,7 @@ static bool _find_square_wrapper(coord_def &mfp, int direction,
                                  int range, targetter *hitfunc, bool wrap,
                                  int los = LOS_ANY);
 
-static int  _targeting_cmd_to_compass(command_type command);
+static int  _targetting_cmd_to_compass(command_type command);
 static void _describe_oos_square(const coord_def& where);
 static void _extend_move_to_edge(dist &moves);
 static std::vector<std::string> _get_monster_desc_vector(const monster_info& mi);
@@ -252,7 +252,7 @@ bool direction_chooser::choose_compass()
             break;
         }
 
-        const int i = _targeting_cmd_to_compass(key_command);
+        const int i = _targetting_cmd_to_compass(key_command);
         if (i != -1)
         {
             moves.delta = Compass[i];
@@ -272,7 +272,7 @@ bool direction_chooser::choose_compass()
     return moves.isValid;
 }
 
-static int _targeting_cmd_to_compass(command_type command)
+static int _targetting_cmd_to_compass(command_type command)
 {
     switch (command)
     {
@@ -330,7 +330,7 @@ monster* direction_chooser::targeted_monster() const
         return NULL;
 }
 
-std::string direction_chooser::build_targeting_hint_string() const
+std::string direction_chooser::build_targetting_hint_string() const
 {
     std::string hint_string;
 
@@ -374,7 +374,7 @@ void direction_chooser::print_key_hints() const
     }
     else
     {
-        const std::string hint_string = build_targeting_hint_string();
+        const std::string hint_string = build_targetting_hint_string();
         switch (restricts)
         {
         case DIR_NONE:
@@ -479,7 +479,7 @@ static bool _is_target_in_range(const coord_def& where, int range,
     return (range == -1 || distance(you.pos(), where) <= range*range + 1);
 }
 
-targeting_behaviour direction_chooser::stock_behaviour;
+targetting_behaviour direction_chooser::stock_behaviour;
 
 void direction(dist &moves, const direction_chooser_args& args)
 {
@@ -857,7 +857,7 @@ void full_describe_view()
 //
 //           isValid        a valid target or direction was chosen
 //           isCancel       player hit 'escape'
-//           isTarget       targeting was used
+//           isTarget       targetting was used
 //           choseRay       player wants a specific ray
 //           ray            ...this one
 //           isEndpoint     player wants the ray to stop on the dime
@@ -894,7 +894,7 @@ static void _fill_monster_list(bool full_info)
     }
 }
 
-// Skip all letters that have a special meaning in the targeting interface.
+// Skip all letters that have a special meaning in the targetting interface.
 // FIXME: Probably doesn't work well with redefined keys.
 // XXX: make sure to add exceptions to this and mlist_index_to_letter.
 static int _mlist_letter_to_index(char ltr)
@@ -1047,18 +1047,18 @@ static std::string _targ_mode_name(targ_mode_type mode)
 #ifndef USE_TILE_LOCAL
 static void _update_mlist(bool enable)
 {
-    crawl_state.mlist_targeting = enable;
+    crawl_state.mlist_targetting = enable;
     const int full_info = update_monster_pane();
     if (enable && full_info != -1)
     {
         _fill_monster_list(full_info);
     }
     else
-        crawl_state.mlist_targeting = false;
+        crawl_state.mlist_targetting = false;
 }
 #endif
 
-// Find a good square to start targeting from.
+// Find a good square to start targetting from.
 coord_def direction_chooser::find_default_target() const
 {
     coord_def result = you.pos();
@@ -1389,13 +1389,13 @@ bool direction_chooser::handle_signals()
         moves.isValid  = false;
         moves.isCancel = true;
 
-        mpr("Targeting interrupted by HUP signal.", MSGCH_ERROR);
+        mpr("Targetting interrupted by HUP signal.", MSGCH_ERROR);
         return true;
     }
     return false;
 }
 
-// Print out the initial prompt when targeting starts.
+// Print out the initial prompt when targetting starts.
 // Prompts might get scrolled off if you have too few lines available;
 // we'll live with that.
 void direction_chooser::show_initial_prompt()
@@ -1592,7 +1592,7 @@ void direction_chooser::reinitialize_move_flags()
     moves.choseRay   = false;
 }
 
-// Returns true if we've completed targeting.
+// Returns true if we've completed targetting.
 bool direction_chooser::select_compass_direction(const coord_def& delta)
 {
     if (restricts != DIR_TARGET)
@@ -1664,7 +1664,7 @@ bool direction_chooser::looking_at_you() const
 void direction_chooser::handle_movement_key(command_type key_command,
                                             bool* loop_done)
 {
-    const int compass_idx = _targeting_cmd_to_compass(key_command);
+    const int compass_idx = _targetting_cmd_to_compass(key_command);
     if (compass_idx != -1)
     {
         const coord_def& delta = Compass[compass_idx];
@@ -1789,7 +1789,7 @@ void direction_chooser::handle_wizard_command(command_type key_command,
 
 void direction_chooser::do_redraws()
 {
-    // Check if our targeting behaviour forces a redraw.
+    // Check if our targetting behaviour forces a redraw.
     if (behaviour->should_redraw())
     {
         need_all_redraw = true;
@@ -1887,16 +1887,16 @@ void direction_chooser::describe_target()
 
 void direction_chooser::show_help()
 {
-    show_targeting_help();
+    show_targetting_help();
     redraw_screen();
     mesclr(true);
     need_all_redraw = true;
 }
 
-void direction_chooser::cycle_targeting_mode()
+void direction_chooser::cycle_targetting_mode()
 {
     mode = static_cast<targ_mode_type>((mode + 1) % TARG_NUM_MODES);
-    mprf("Targeting mode is now: %s", _targ_mode_name(mode).c_str());
+    mprf("Targetting mode is now: %s", _targ_mode_name(mode).c_str());
 }
 
 // Return false if we should continue looping, true if we're done.
@@ -1919,8 +1919,8 @@ bool direction_chooser::do_main_loop()
 
 #ifndef USE_TILE_LOCAL
     case CMD_TARGET_TOGGLE_MLIST:
-        Options.mlist_targeting = !Options.mlist_targeting;
-        _update_mlist(Options.mlist_targeting);
+        Options.mlist_targetting = !Options.mlist_targetting;
+        _update_mlist(Options.mlist_targetting);
         break;
 #endif
 
@@ -1962,7 +1962,7 @@ bool direction_chooser::do_main_loop()
     case CMD_TARGET_FIND_UPSTAIR:   feature_cycle_forward('<');  break;
     case CMD_TARGET_FIND_DOWNSTAIR: feature_cycle_forward('>');  break;
 
-    case CMD_TARGET_CYCLE_TARGET_MODE: cycle_targeting_mode(); break;
+    case CMD_TARGET_CYCLE_TARGET_MODE: cycle_targetting_mode(); break;
 
     case CMD_TARGET_MAYBE_PREV_TARGET:
         loop_done = looking_at_you() ? select_previous_target()
@@ -2067,7 +2067,7 @@ void direction_chooser::finalize_moves()
 bool direction_chooser::choose_direction()
 {
 #ifndef USE_TILE_LOCAL
-    if (may_target_monster && restricts != DIR_DIR && Options.mlist_targeting)
+    if (may_target_monster && restricts != DIR_DIR && Options.mlist_targetting)
         _update_mlist(true);
 #endif
 
@@ -4023,40 +4023,40 @@ static void _describe_cell(const coord_def& where, bool in_range)
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// targeting_behaviour
+// targetting_behaviour
 
-targeting_behaviour::targeting_behaviour(bool look_around)
+targetting_behaviour::targetting_behaviour(bool look_around)
     : just_looking(look_around), compass(false)
 {
 }
 
-targeting_behaviour::~targeting_behaviour()
+targetting_behaviour::~targetting_behaviour()
 {
 }
 
-int targeting_behaviour::get_key()
+int targetting_behaviour::get_key()
 {
     if (!crawl_state.is_replaying_keys())
         flush_input_buffer(FLUSH_BEFORE_COMMAND);
 
     flush_prev_message();
     msgwin_got_input();
-    return unmangle_direction_keys(getchm(KMC_TARGETING), KMC_TARGETING,
+    return unmangle_direction_keys(getchm(KMC_TARGETTING), KMC_TARGETTING,
                                    false, false);
 }
 
-command_type targeting_behaviour::get_command(int key)
+command_type targetting_behaviour::get_command(int key)
 {
     if (key == -1)
         key = get_key();
 
-    command_type cmd = key_to_command(key, KMC_TARGETING);
+    command_type cmd = key_to_command(key, KMC_TARGETTING);
     if (cmd >= CMD_MIN_TARGET && cmd < CMD_TARGET_CYCLE_TARGET_MODE)
         return (cmd);
 
 #ifndef USE_TILE_LOCAL
-    // Overrides the movement keys while mlist_targeting is active.
-    if (crawl_state.mlist_targeting && isalower(key))
+    // Overrides the movement keys while mlist_targetting is active.
+    if (crawl_state.mlist_targetting && isalower(key))
         return static_cast<command_type>(CMD_TARGET_CYCLE_MLIST + (key - 'a'));
 #endif
 
@@ -4067,7 +4067,7 @@ command_type targeting_behaviour::get_command(int key)
     return (cmd);
 }
 
-std::vector<std::string> targeting_behaviour::get_monster_desc(const monster_info& mi)
+std::vector<std::string> targetting_behaviour::get_monster_desc(const monster_info& mi)
 {
     std::vector<std::string> descs;
     if (get_desc_func)
diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h
index 0606e86b04..a7839a345c 100644
--- a/crawl-ref/source/directn.h
+++ b/crawl-ref/source/directn.h
@@ -22,11 +22,11 @@ public:
 };
 
 // An object that modifies the behaviour of the direction prompt.
-class targeting_behaviour
+class targetting_behaviour
 {
 public:
-    targeting_behaviour(bool just_looking = false);
-    virtual ~targeting_behaviour();
+    targetting_behaviour(bool just_looking = false);
+    virtual ~targetting_behaviour();
 
     // Returns a keystroke for the prompt.
     virtual int get_key();
@@ -75,7 +75,7 @@ public:
 struct direction_chooser_args
 {
     targetter *hitfunc;
-    targeting_type restricts;
+    targetting_type restricts;
     targ_mode_type mode;
     int range;
     bool just_looking;
@@ -84,7 +84,7 @@ struct direction_chooser_args
     bool may_target_self;
     const char *target_prefix;
     std::string top_prompt;
-    targeting_behaviour *behaviour;
+    targetting_behaviour *behaviour;
     bool cancel_at_self;
     bool show_floor_desc;
     desc_filter get_desc_func;
@@ -116,7 +116,7 @@ private:
 
     bool do_main_loop();
 
-    // Return the location where targeting should start.
+    // Return the location where targetting should start.
     coord_def find_default_target() const;
 
     void handle_mlist_cycle_command(command_type key_command);
@@ -149,7 +149,7 @@ private:
     // Mark item for pickup, initiate movement.
     bool pickup_item();
 
-    // Return true if we need to abort targeting due to a signal.
+    // Return true if we need to abort targetting due to a signal.
     bool handle_signals();
 
     void reinitialize_move_flags();
@@ -158,7 +158,7 @@ private:
     const coord_def& target() const;
     void set_target(const coord_def& new_target);
 
-    std::string build_targeting_hint_string() const;
+    std::string build_targetting_hint_string() const;
 
     actor* targeted_actor() const;
     monster* targeted_monster() const;
@@ -168,7 +168,7 @@ private:
 
     // Whatever the caller defines. Typically something like:
     // Casting: Venom Bolt.
-    // Can be modified by the targeting_behaviour.
+    // Can be modified by the targetting_behaviour.
     void print_top_prompt() const;
 
     // Press: ? - help, Shift-Dir - straight line, t - megabat
@@ -209,7 +209,7 @@ private:
     // pointer is in bounds.
     bool tiles_update_target();
 
-    // Display the prompt when beginning targeting.
+    // Display the prompt when beginning targetting.
     void show_initial_prompt();
 
     void toggle_beam();
@@ -225,14 +225,14 @@ private:
     // Whether the current target is valid.
     bool move_is_ok() const;
 
-    void cycle_targeting_mode();
+    void cycle_targetting_mode();
 
     void describe_target();
     void show_help();
 
     // Parameters.
     dist& moves;                // Output.
-    targeting_type restricts;   // What kind of target do we want?
+    targetting_type restricts;   // What kind of target do we want?
     targ_mode_type mode;        // Hostiles or friendlies?
     int range;                  // Max range to consider
     bool just_looking;
@@ -241,8 +241,8 @@ private:
     bool may_target_self;       // ?? XXX Used only for _init_mlist() currently
     const char *target_prefix;  // A string displayed before describing target
     std::string top_prompt;     // Shown at the top of the message window
-    targeting_behaviour *behaviour; // Can be NULL for default
-    bool cancel_at_self;        // Disallow self-targeting?
+    targetting_behaviour *behaviour; // Can be NULL for default
+    bool cancel_at_self;        // Disallow self-targetting?
     bool show_floor_desc;       // Describe the floor of the current target
     targetter *hitfunc;         // Determine what would be hit.
 
@@ -262,7 +262,7 @@ private:
     bool target_unshifted;      // Do unshifted direction keys fire?
 
     // Default behaviour, saved across instances.
-    static targeting_behaviour stock_behaviour;
+    static targetting_behaviour stock_behaviour;
 
 };
 
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 5a511f6728..e812bcfd79 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -766,7 +766,7 @@ enum command_type
 
     CMD_MAX_OVERMAP = CMD_MAP_EXIT_MAP,
 
-    // targeting commands
+    // targetting commands
     CMD_TARGET_DOWN_LEFT,
     CMD_MIN_TARGET = CMD_TARGET_DOWN_LEFT,
     CMD_TARGET_DOWN,
@@ -1771,7 +1771,7 @@ enum KeymapContext
 {
     KMC_DEFAULT,         // For no-arg getchm(), must be zero.
     KMC_LEVELMAP,        // When in the 'X' level map
-    KMC_TARGETING,       // Only during 'x' and other targeting modes
+    KMC_TARGETTING,       // Only during 'x' and other targetting modes
     KMC_CONFIRM,         // When being asked y/n/q questions
     KMC_MENU,            // For menus
 #ifdef USE_TILE
@@ -1918,7 +1918,7 @@ enum targ_mode_type
     TARG_INJURED_FRIEND, // for healing
     TARG_HOSTILE,
     TARG_HOSTILE_SUBMERGED, // Target hostiles including submerged ones
-    TARG_EVOLVABLE_PLANTS,  // Targeting mode for Fedhas' evolution
+    TARG_EVOLVABLE_PLANTS,  // Targetting mode for Fedhas' evolution
     TARG_HOSTILE_UNDEAD,    // For dispel undead
     TARG_NUM_MODES
 };
@@ -3344,12 +3344,12 @@ enum stat_type
     STAT_RANDOM,
 };
 
-enum targeting_type
+enum targetting_type
 {
     DIR_NONE,
     DIR_TARGET, // smite targetting
     DIR_DIR,    // needs a clear line to target
-    DIR_TARGET_OBJECT, // New as of 27-August-2009, for item-targeting spells
+    DIR_TARGET_OBJECT, // New as of 27-August-2009, for item-targetting spells
 };
 
 enum torment_source_type
diff --git a/crawl-ref/source/evoke.cc b/crawl-ref/source/evoke.cc
index b059e365c6..4c4055c9c2 100644
--- a/crawl-ref/source/evoke.cc
+++ b/crawl-ref/source/evoke.cc
@@ -90,7 +90,7 @@ static bool _reaching_weapon_attack(const item_def& wpn)
     const int x_distance  = abs(delta.x);
     const int y_distance  = abs(delta.y);
     monster* mons = monster_at(beam.target);
-    // don't allow targeting of submerged trapdoor spiders
+    // don't allow targetting of submerged trapdoor spiders
     if (mons && mons->submerged() && feat_is_floor(grd(beam.target)))
         mons = NULL;
 
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index b5c68d8ddd..752ee49bb8 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -142,7 +142,7 @@ bool fight_melee(actor *attacker, actor *defender)
         if (!defender->alive() || defender->pos() != pos)
         {
             if (attacker == defender
-               || !attacker->as_monster()->has_multitargeting())
+               || !attacker->as_monster()->has_multitargetting())
             {
                 break;
             }
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index 57a0dbb6dc..8298c9510d 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -4258,7 +4258,7 @@ void hints_inscription_info(bool autoinscribe, std::string prompt)
         formatted_string::parse_string(prompt).display();
 }
 
-// FIXME: With the new targeting system, the hints for interesting monsters
+// FIXME: With the new targetting system, the hints for interesting monsters
 //        and features ("right-click/press v for more information") are no
 //        longer getting displayed.
 //        Players might still end up e'x'aming and particularly clicking on
@@ -4768,7 +4768,7 @@ void hints_describe_monster(const monster_info& mi, bool has_stat_desc)
         {
             ostr << "You can easily mark its square as dangerous to avoid "
                     "accidentally entering into its field of view when using "
-                    "auto-explore or auto-travel. To do so, enter targeting "
+                    "auto-explore or auto-travel. To do so, enter targetting "
                     "mode with <w>x</w> and then press <w>e</w> when your "
                     "cursor is hovering over the monster's grid. Doing so will "
                     "mark this grid and all surrounding ones within a radius "
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 188894053c..f478f8c1e4 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -423,7 +423,7 @@ static const char *kill_method_names[] =
     "mon", "pois", "cloud", "beam", "lava", "water",
     "stupidity", "weakness", "clumsiness", "trap", "leaving", "winning",
     "quitting", "draining", "starvation", "freezing", "burning",
-    "wild_magic", "xom", "rotting", "targeting", "spore",
+    "wild_magic", "xom", "rotting", "targetting", "spore",
     "tso_smiting", "petrification", "something",
     "falling_down_stairs", "acid", "curare",
     "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed",
@@ -1888,8 +1888,8 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity)
             desc += " (" + death_source_desc() + ")";
         break;
 
-    case KILLED_BY_TARGETING:
-        desc += terse? "shot self" : "Killed themselves with bad targeting";
+    case KILLED_BY_TARGETTING:
+        desc += terse? "shot self" : "Killed themselves with bad targetting";
         needs_damage = true;
         break;
 
@@ -1932,7 +1932,7 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity)
 
     case KILLED_BY_SELF_AIMED:
         if (terse)
-            desc += "suicidal targeting";
+            desc += "suicidal targetting";
         else
         {
             desc += "Shot themselves with a ";
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 1abcb2ded5..56b8229eef 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -687,7 +687,7 @@ void game_options::reset_options()
     msg_max_height   = std::max(10, MSG_MIN_HEIGHT);
     mlist_allow_alternate_layout = false;
     messages_at_top  = false;
-    mlist_targeting = false;
+    mlist_targetting = false;
     msg_condense_repeats = true;
     msg_condense_short = true;
     show_no_ctele = true;
@@ -2449,7 +2449,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else BOOL_OPTION(mlist_allow_alternate_layout);
     else BOOL_OPTION(messages_at_top);
 #ifndef USE_TILE
-    else BOOL_OPTION(mlist_targeting);
+    else BOOL_OPTION(mlist_targetting);
 #endif
     else BOOL_OPTION(msg_condense_repeats);
     else BOOL_OPTION(msg_condense_short);
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 13fac1dc5b..2c28234014 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1008,7 +1008,7 @@ int get_next_fire_item(int current, int direction)
     return fire_order[next];
 }
 
-class fire_target_behaviour : public targeting_behaviour
+class fire_target_behaviour : public targetting_behaviour
 {
 public:
     fire_target_behaviour()
@@ -1020,7 +1020,7 @@ public:
         set_prompt();
     }
 
-    // targeting_behaviour API
+    // targetting_behaviour API
     virtual command_type get_command(int key = -1);
     virtual bool should_redraw() const { return need_redraw; }
     virtual void clear_redraw()        { need_redraw = false; }
@@ -1149,7 +1149,7 @@ void fire_target_behaviour::pick_fire_item_from_inventory()
 
 void fire_target_behaviour::display_help()
 {
-    show_targeting_help();
+    show_targetting_help();
     redraw_screen();
     need_redraw = true;
     set_prompt();
@@ -1169,7 +1169,7 @@ command_type fire_target_behaviour::get_command(int key)
     case CMD_TARGET_CANCEL: chosen_ammo = false; break;
     }
 
-    return targeting_behaviour::get_command(key);
+    return targetting_behaviour::get_command(key);
 }
 
 std::vector<std::string> fire_target_behaviour::get_monster_desc(const monster_info& mi)
@@ -3900,7 +3900,7 @@ void zap_wand(int slot)
     dist zap_wand;
     int item_slot;
 
-    // Unless the character knows the type of the wand, the targeting
+    // Unless the character knows the type of the wand, the targetting
     // system will default to enemies. -- [ds]
     targ_mode_type targ_mode = TARG_HOSTILE;
 
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 90789528fc..0051b0181c 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -57,7 +57,7 @@ static macromap *all_maps[] =
 {
     &Keymaps[KMC_DEFAULT],
     &Keymaps[KMC_LEVELMAP],
-    &Keymaps[KMC_TARGETING],
+    &Keymaps[KMC_TARGETTING],
     &Keymaps[KMC_CONFIRM],
 
     &Macros,
@@ -870,7 +870,7 @@ static std::string _macro_type_name(bool keymap, KeymapContext keymc)
     return make_stringf("%s%s",
                         keymap ? (keymc == KMC_DEFAULT    ? "default " :
                                   keymc == KMC_LEVELMAP   ? "level-map " :
-                                  keymc == KMC_TARGETING  ? "targeting " :
+                                  keymc == KMC_TARGETTING ? "targetting " :
                                   keymc == KMC_CONFIRM    ? "confirm " :
                                   keymc == KMC_MENU       ? "menu "
                                   : "buggy") : "",
@@ -886,7 +886,7 @@ void macro_add_query(void)
 
     mesclr();
     mpr("(m)acro, (M)acro raw, keymap "
-        "[(k) default, (x) level-map, (t)argeting, (c)onfirm, m(e)nu], "
+        "[(k) default, (x) level-map, (t)argetting, (c)onfirm, m(e)nu], "
         "(s)ave? ",
         MSGCH_PROMPT);
     input = m_getch();
@@ -905,7 +905,7 @@ void macro_add_query(void)
     else if (low == 't')
     {
         keymap = true;
-        keymc  = KMC_TARGETING;
+        keymc  = KMC_TARGETTING;
     }
     else if (low == 'c')
     {
@@ -1289,7 +1289,7 @@ KeymapContext context_for_command(command_type cmd)
         return KMC_LEVELMAP;
 
     if (cmd >= CMD_MIN_TARGET && cmd <= CMD_MAX_TARGET)
-        return KMC_TARGETING;
+        return KMC_TARGETTING;
 
 #ifdef USE_TILE
     if (cmd >= CMD_MIN_DOLL && cmd <= CMD_MAX_DOLL)
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 6a34976e60..12dcc1f680 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -234,7 +234,7 @@ void handle_behaviour(monster* mon)
         return;
     }
 
-    // Make sure monsters are not targeting the player in arena mode.
+    // Make sure monsters are not targetting the player in arena mode.
     ASSERT(!(crawl_state.game_is_arena() && mon->foe == MHITYOU));
 
     if (mons_wall_shielded(mon) && cell_is_solid(mon->pos()))
@@ -368,7 +368,7 @@ void handle_behaviour(monster* mon)
 
     // Unfriendly monsters fighting other monsters will usually
     // target the player, if they're healthy.
-    // Zotdef: 2/3 chance of retargeting changed to 1/4
+    // Zotdef: 2/3 chance of retargetting changed to 1/4
     if (!isFriendly && !isNeutral
         && mon->foe != MHITYOU && mon->foe != MHITNOT
         && proxPlayer && !mon->berserk() && isHealthy
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index d294c47f34..d7e21bca70 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -1200,7 +1200,7 @@ bool setup_mons_cast(monster* mons, bolt &pbolt, spell_type spell_cast,
         {
             pbolt.target = targ->pos();
 #ifdef DEBUG_DIAGNOSTICS
-            mprf("Porkalator: targeting %s instead",
+            mprf("Porkalator: targetting %s instead",
                  targ->name(DESC_PLAIN).c_str());
 #endif
         }
@@ -2612,7 +2612,7 @@ void mons_cast(monster* mons, bolt &pbolt, spell_type spell_cast,
 
     // Targeted spells need a valid target.
     // Wizard-mode cast monster spells may target the boundary (shift-dir).
-    ASSERT(!(flags & SPFLAG_TARGETING_MASK) || map_bounds(pbolt.target));
+    ASSERT(!(flags & SPFLAG_TARGETTING_MASK) || map_bounds(pbolt.target));
 #endif
 
     if (do_noise)
@@ -3857,7 +3857,7 @@ static void _noise_fill_target(std::string& targ_prep, std::string& target,
     else if (pbolt.target == mons->pos())
         target = mons->pronoun(PRONOUN_REFLEXIVE);
     // Monsters should only use targeted spells while foe == MHITNOT
-    // if they're targeting themselves.
+    // if they're targetting themselves.
     else if (mons->foe == MHITNOT && !mons_is_confused(mons, true))
         target = "NONEXISTENT FOE";
     else if (!invalid_monster_index(mons->foe)
@@ -4060,7 +4060,7 @@ void mons_cast_noise(monster* mons, const bolt &pbolt,
 
     int noise = _noise_level(mons, actual_spell, silent, innate);
 
-    const bool targeted = (flags & SPFLAG_TARGETING_MASK)
+    const bool targeted = (flags & SPFLAG_TARGETTING_MASK)
                            && (pbolt.target != mons->pos()
                                || pbolt.visible());
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index a3826bdd06..1f816497f7 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2820,7 +2820,7 @@ bool mons_should_fire(struct bolt &beam)
     if (_beneficial_beam_flavour(beam.flavour))
         return (_mons_should_fire_beneficial(beam));
 
-    // Friendly monsters shouldn't be targeting you: this will happen
+    // Friendly monsters shouldn't be targetting you: this will happen
     // often because the default behaviour for charmed monsters is to
     // have you as a target.  While foe_ratio will handle this, we
     // don't want a situation where a friendly dragon breathes through
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index 181ea15807..1e15d1b6ed 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -4095,7 +4095,7 @@ bool monster::has_hydra_multi_attack() const
     return (mons_genus(mons_base_type(this)) == MONS_HYDRA);
 }
 
-bool monster::has_multitargeting() const
+bool monster::has_multitargetting() const
 {
     if (mons_wields_two_weapons(this))
         return (true);
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h
index ae21ae0407..16d5731c12 100644
--- a/crawl-ref/source/monster.h
+++ b/crawl-ref/source/monster.h
@@ -118,7 +118,7 @@ public:
 
     // Has a hydra-like variable number of attacks based on mons->number.
     bool has_hydra_multi_attack() const;
-    bool has_multitargeting() const;
+    bool has_multitargetting() const;
 
     // Has the 'spellcaster' flag (may not actually have any spells).
     bool can_use_spells() const;
diff --git a/crawl-ref/source/msvc.h b/crawl-ref/source/msvc.h
index c16ec88ed5..4ebe802b24 100644
--- a/crawl-ref/source/msvc.h
+++ b/crawl-ref/source/msvc.h
@@ -82,7 +82,7 @@ inline double log(int x)
     return log((double)x);
 }
 
-//this is targeting for struct member name in store.h, nothing else gets affected as of 0.9.0
+//this is targetting for struct member name in store.h, nothing else gets affected as of 0.9.0
 #define _int64 var_int64
 
 //missing in sys/types.h
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index bc3e0744e6..058990dfaa 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -68,7 +68,7 @@ public:
     int         msg_max_height;
     bool        mlist_allow_alternate_layout;
     bool        messages_at_top;
-    bool        mlist_targeting;
+    bool        mlist_targetting;
     bool        msg_condense_repeats;
     bool        msg_condense_short;
 
@@ -119,7 +119,7 @@ public:
     bool        easy_eat_contaminated; // like easy_eat_gourmand, but
                                        // always active.
     bool        auto_eat_chunks; // allow eating chunks while resting or travelling
-    bool        default_target;  // start targeting on a real target
+    bool        default_target;  // start targetting on a real target
     bool        autopickup_no_burden;   // don't autopickup if it changes burden
     skill_focus_mode skill_focus; // is the focus skills available
 
@@ -138,7 +138,7 @@ public:
     int         colour[16];      // macro fg colours to other colours
     int         background_colour; // select default background colour
     msg_colour_type channels[NUM_MESSAGE_CHANNELS];  // msg channel colouring
-    bool        darken_beyond_range; // for whether targeting is out of range
+    bool        darken_beyond_range; // for whether targetting is out of range
 
     int         hp_warning;      // percentage hp for danger warning
     int         magic_point_warning;    // percentage mp for danger warning
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index ef73535aec..8e43d96b17 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -907,7 +907,7 @@ static void _xom_checks_damage(kill_method_type death_type,
 {
     if (you.religion == GOD_XOM)
     {
-        if (death_type == KILLED_BY_TARGETING
+        if (death_type == KILLED_BY_TARGETTING
             || death_type == KILLED_BY_BOUNCE
             || death_type == KILLED_BY_REFLECTION
             || death_type == KILLED_BY_SELF_AIMED
diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h
index 5b71927641..e4a00a73e9 100644
--- a/crawl-ref/source/ouch.h
+++ b/crawl-ref/source/ouch.h
@@ -38,7 +38,7 @@ enum kill_method_type
     KILLED_BY_WILD_MAGIC,
     KILLED_BY_XOM,
     KILLED_BY_ROTTING,
-    KILLED_BY_TARGETING,
+    KILLED_BY_TARGETTING,
     KILLED_BY_SPORE,
     KILLED_BY_TSO_SMITING,
     KILLED_BY_PETRIFICATION,
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 7f6ac3423b..a655c43717 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1083,7 +1083,7 @@ static void _print_next_monster_desc(const std::vector<monster_info>& mons,
     {
         int printed = 0;
 
-        // for targeting
+        // for targetting
         if (idx >= 0)
         {
             textcolor(WHITE);
@@ -1223,7 +1223,7 @@ int update_monster_pane()
         // i_mons is incremented by _print_next_monster_desc
         if (i_print >= skip_lines && i_mons < (int) mons.size())
         {
-             int idx = crawl_state.mlist_targeting ? i_print - skip_lines : -1;
+             int idx = crawl_state.mlist_targetting ? i_print - skip_lines : -1;
              _print_next_monster_desc(mons, i_mons, full_info, idx);
         }
         else
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 359f040fe8..c17d50505e 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1049,10 +1049,10 @@ spret_type your_spells(spell_type spell, int powc,
         powc = calc_spell_power(spell, true);
 
     // XXX: This handles only some of the cases where spells need
-    // targeting.  There are others that do their own that will be
+    // targetting.  There are others that do their own that will be
     // missed by this (and thus will not properly ESC without cost
     // because of it).  Hopefully, those will eventually be fixed. - bwr
-    if ((flags & SPFLAG_TARGETING_MASK) && spell != SPELL_PORTAL_PROJECTILE)
+    if ((flags & SPFLAG_TARGETTING_MASK) && spell != SPELL_PORTAL_PROJECTILE)
     {
         targ_mode_type targ =
               (testbits(flags, SPFLAG_HELPFUL) ? TARG_FRIEND : TARG_HOSTILE);
@@ -1063,7 +1063,7 @@ spret_type your_spells(spell_type spell, int powc,
         if (spell == SPELL_DISPEL_UNDEAD)
             targ = TARG_HOSTILE_UNDEAD;
 
-        targeting_type dir  =
+        targetting_type dir  =
             (testbits(flags, SPFLAG_TARG_OBJ) ? DIR_TARGET_OBJECT :
              testbits(flags, SPFLAG_TARGET)   ? DIR_TARGET        :
              testbits(flags, SPFLAG_GRID)     ? DIR_TARGET        :
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index 676819205d..d9acc8b947 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -12,12 +12,12 @@
 enum spflag_type
 {
     SPFLAG_NONE                 = 0x000000,
-    SPFLAG_DIR_OR_TARGET        = 0x000001,      // use DIR_NONE targeting
-    SPFLAG_TARGET               = 0x000002,      // use DIR_TARGET targeting
-    SPFLAG_GRID                 = 0x000004,      // use DIR_GRID targeting
-    SPFLAG_DIR                  = 0x000008,      // use DIR_DIR targeting
+    SPFLAG_DIR_OR_TARGET        = 0x000001,      // use DIR_NONE targetting
+    SPFLAG_TARGET               = 0x000002,      // use DIR_TARGET targetting
+    SPFLAG_GRID                 = 0x000004,      // use DIR_GRID targetting
+    SPFLAG_DIR                  = 0x000008,      // use DIR_DIR targetting
     SPFLAG_TARG_OBJ             = 0x000010,      // use DIR_TARGET_OBJECT targ.
-    SPFLAG_TARGETING_MASK       = 0x00001f,      // used to test for targeting
+    SPFLAG_TARGETTING_MASK       = 0x00001f,      // used to test for targetting
     SPFLAG_HELPFUL              = 0x000020,      // TARG_FRIENDS used
     SPFLAG_NEUTRAL              = 0x000040,      // TARG_ANY used
     SPFLAG_NOT_SELF             = 0x000080,      // aborts on isMe
diff --git a/crawl-ref/source/spl-clouds.cc b/crawl-ref/source/spl-clouds.cc
index f79982f491..70396b5ed8 100644
--- a/crawl-ref/source/spl-clouds.cc
+++ b/crawl-ref/source/spl-clouds.cc
@@ -91,7 +91,7 @@ spret_type conjure_flame(int pow, const coord_def& where, bool fail)
         return SPRET_ABORT;
     }
 
-    // Note that self-targeting is handled by SPFLAG_NOT_SELF.
+    // Note that self-targetting is handled by SPFLAG_NOT_SELF.
     monster* mons = monster_at(where);
     if (mons)
     {
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index a9411124c5..d0e9514b95 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -114,7 +114,7 @@ void init_spell_descs(void)
                 data.title);
         }
 
-        if (data.flags & SPFLAG_TARGETING_MASK)
+        if (data.flags & SPFLAG_TARGETTING_MASK)
         {
             if (data.min_range <= -1 || data.max_range <= 0)
             {
@@ -425,7 +425,7 @@ bool spell_harms_target(spell_type spell)
     if (flags & (SPFLAG_HELPFUL | SPFLAG_NEUTRAL))
         return false;
 
-    if (flags & SPFLAG_TARGETING_MASK)
+    if (flags & SPFLAG_TARGETTING_MASK)
         return true;
 
     return false;
@@ -785,7 +785,7 @@ void apply_area_cloud(cloud_func func, const coord_def& where,
 // FIXME: this should accept a direction_chooser_args directly rather
 // than move the arguments into one.
 bool spell_direction(dist &spelld, bolt &pbolt,
-                      targeting_type restrict, targ_mode_type mode,
+                      targetting_type restrict, targ_mode_type mode,
                       int range,
                       bool needs_path, bool may_target_monster,
                       bool may_target_self, const char *target_prefix,
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index 2fd2e88a66..e23bc4cede 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -118,7 +118,7 @@ void apply_area_cloud(cloud_func func, const coord_def& where,
                       int excl_rad = -1);
 
 bool spell_direction(dist &spelld, bolt &pbolt,
-                      targeting_type restrict = DIR_NONE,
+                      targetting_type restrict = DIR_NONE,
                       targ_mode_type mode = TARG_HOSTILE,
                       // pbolt.range if applicable, otherwise LOS_RADIUS
                       int range = 0,
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index df22e64d82..bd3b4ce80b 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -39,7 +39,7 @@ game_state::game_state()
       lua_calls_no_turn(0), stat_gain_prompt(false),
       level_annotation_shown(false),
 #ifndef USE_TILE_LOCAL
-      mlist_targeting(false),
+      mlist_targetting(false),
 #else
       title_screen(true),
 #endif
diff --git a/crawl-ref/source/state.h b/crawl-ref/source/state.h
index fca6f8d356..f1a129dc54 100644
--- a/crawl-ref/source/state.h
+++ b/crawl-ref/source/state.h
@@ -92,10 +92,10 @@ struct game_state
     bool level_annotation_shown;
 
 #ifndef USE_TILE_LOCAL
-    // Are we currently targeting using the mlist?
+    // Are we currently targetting using the mlist?
     // This is global because the monster pane uses this when
     // drawing.
-    bool mlist_targeting;
+    bool mlist_targetting;
 #else
     bool title_screen;
 #endif
diff --git a/crawl-ref/source/tilereg-dgn.cc b/crawl-ref/source/tilereg-dgn.cc
index be111a2369..7d82d7e156 100644
--- a/crawl-ref/source/tilereg-dgn.cc
+++ b/crawl-ref/source/tilereg-dgn.cc
@@ -354,11 +354,11 @@ void DungeonRegion::on_resize()
 
 // FIXME: If the player is targeted, the game asks the player to target
 // something with the mouse, then targets the player anyway and treats
-// mouse click as if it hadn't come during targeting (moves the player
+// mouse click as if it hadn't come during targetting (moves the player
 // to the clicked cell, whatever).
-static void _add_targeting_commands(const coord_def& pos)
+static void _add_targetting_commands(const coord_def& pos)
 {
-    // Force targeting cursor back onto center to start off on a clean
+    // Force targetting cursor back onto center to start off on a clean
     // slate.
     macro_buf_add_cmd(CMD_TARGET_FIND_YOU);
 
@@ -391,7 +391,7 @@ static const bool _is_appropriate_spell(spell_type spell,
     ASSERT(is_valid_spell(spell));
 
     const unsigned int flags    = get_spell_flags(spell);
-    const bool         targeted = flags & SPFLAG_TARGETING_MASK;
+    const bool         targeted = flags & SPFLAG_TARGETTING_MASK;
 
     // We don't handle grid targeted spells yet.
     if (flags & SPFLAG_GRID)
@@ -544,13 +544,13 @@ static bool _evoke_item_on_target(actor* target)
 
     macro_buf_add_cmd(CMD_EVOKE);
     macro_buf_add(index_to_letter(item->link)); // Inventory letter.
-    _add_targeting_commands(target->pos());
+    _add_targetting_commands(target->pos());
     return (true);
 }
 
 static bool _spell_in_range(spell_type spell, actor* target)
 {
-    if (!(get_spell_flags(spell) & SPFLAG_TARGETING_MASK))
+    if (!(get_spell_flags(spell) & SPFLAG_TARGETTING_MASK))
         return (true);
 
     int range = calc_spell_range(spell);
@@ -646,8 +646,8 @@ static bool _cast_spell_on_target(actor* target)
     if (item_slot != -1)
         macro_buf_add(item_slot);
 
-    if (get_spell_flags(spell) & SPFLAG_TARGETING_MASK)
-        _add_targeting_commands(target->pos());
+    if (get_spell_flags(spell) & SPFLAG_TARGETTING_MASK)
+        _add_targetting_commands(target->pos());
 
     return (true);
 }
@@ -690,7 +690,7 @@ static bool _handle_distant_monster(monster* mon, unsigned char mod)
                      && !mon->wont_attack()))
     {
         macro_buf_add_cmd(CMD_FIRE);
-        _add_targeting_commands(mon->pos());
+        _add_targetting_commands(mon->pos());
         return (true);
     }
 
@@ -706,7 +706,7 @@ static bool _handle_distant_monster(monster* mon, unsigned char mod)
         if (dist > 2 && weapon && reach_range(weapon_reach(*weapon)) >= dist)
         {
             macro_buf_add_cmd(CMD_EVOKE_WIELDED);
-            _add_targeting_commands(mon->pos());
+            _add_targetting_commands(mon->pos());
             return (true);
         }
     }
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 3013b7c091..b060aeda25 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -513,7 +513,7 @@ int TilesFramework::getch_ck()
 
     int key = 0;
 
-    // Don't update tool tips etc. in targeting mode.
+    // Don't update tool tips etc. in targetting mode.
     const bool mouse_target_mode
                 = (mouse_control::current_mode() == MOUSE_MODE_TARGET_PATH
                    || mouse_control::current_mode() == MOUSE_MODE_TARGET_DIR);
diff --git a/crawl-ref/source/util/docs/key_changes.tex b/crawl-ref/source/util/docs/key_changes.tex
index be547363bf..7ba25f0b6b 100644
--- a/crawl-ref/source/util/docs/key_changes.tex
+++ b/crawl-ref/source/util/docs/key_changes.tex
@@ -120,7 +120,7 @@ new key      & command          & old key \\ \hline
 \end{tabular}
 \end{center}
 
-There are additional changes to the targeting interface: \\
+There are additional changes to the targetting interface: \\
 The functions of \key{!} and \key{.} have been swapped. So firing with
 \key{.} will now stop at the target, whereas \key{!} will shoot further
 if the target was missed (and \key{Enter}, \key{Del}, \key{Space} still
diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index df16b65e7a..3b60741d99 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -382,7 +382,7 @@ static bool _fsim_mon_hit_you(FILE *ostat, monster &mon, int)
         // for the user, but slow down the sim with all the calls to kbhit().
         if (kbhit() && getchk() == 27)
         {
-            mprf("Canceling simulation\n");
+            mprf("Cancelling simulation\n");
             return (false);
         }
     }
@@ -402,7 +402,7 @@ static bool _fsim_mon_hit_you(FILE *ostat, monster &mon, int)
         // for the user, but slow down the sim with all the calls to kbhit().
         if (kbhit() && getchk() == 27)
         {
-            mprf("Canceling simulation\n");
+            mprf("Cancelling simulation\n");
             return (false);
         }
     }
@@ -430,7 +430,7 @@ static bool _fsim_you_hit_mon(FILE *ostat, monster &mon, int missile_slot)
         // for the user, but slow down the sim with all the calls to kbhit().
         if (kbhit() && getchk() == 27)
         {
-            mprf("Canceling simulation\n");
+            mprf("Cancelling simulation\n");
             return (false);
         }
     }
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 39f592693d..071c177b10 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -798,7 +798,7 @@ void wizard_unidentify_pack()
     you.redraw_quiver = true;
 
     // Forget things that nearby monsters are carrying, as well.
-    // (For use with the "give monster an item" wizard targeting
+    // (For use with the "give monster an item" wizard targetting
     // command.)
     for (monster_iterator mon(you.get_los()); mon; ++mon)
     {
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 82b884eeda..acfa1d00e4 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -4073,7 +4073,7 @@ static int _death_is_worth_saving(const kill_method_type killed_by,
 
     // Don't protect the player from these.
     case KILLED_BY_SELF_AIMED:
-    case KILLED_BY_TARGETING:
+    case KILLED_BY_TARGETTING:
         return (false);
 
     // Only if not caused by equipment.