--- a/abbreviations.lua	Wed Mar 20 20:49:11 2013 -0400
+++ b/abbreviations.lua	Thu Nov 13 22:12:33 2014 -0500
@@ -3,7 +3,7 @@
 write a small addon like this.  Lines with * are crucial and should not be
 changed from how they're shown here.
 
-        Interface/AddOns/YourMod/YourMod.toc:
+      Interface/AddOns/YourMod/YourMod.toc:
         =================================
         ## Interface: xxxxx
         ## Title: Ouro Loot For My Guild
@@ -16,7 +16,7 @@
 
 Then replace specific entries like this:
 
-        Interface/AddOns/YourMod/main.lua:
+      Interface/AddOns/YourMod/main.lua:
         =================================
       * local ouroloot = LibStub("AceAddon-3.0"):GetAddon("Ouro Loot")
     
@@ -29,38 +29,52 @@
         ouroloot:Print [[Tweaked stuff for mah guildies!]]
         =================================
 
-This lets you update Ouro Loot with a new version (overwriting this file)
-without losing any of your changes.
+This lets you update Ouro Loot with a new version (which would overwrite
+this file) without losing any of your changes.
 ]==]
 
 local addon = select(2,...)
 if addon.NOLOAD then return end
 
--- Currently indexed by GetInstanceInfo() values.
+--[==[
+The index is the universal InstanceMapID value, which can be looked up here:
+   http://wowpedia.org/InstanceMapID
+You can also use the official English localized name, which was the only
+available method in the past.  Note that these names are case-sensistive.
+]==]
 addon.instance_abbrev = {
+	-------- WoD
+	--[] = "", -- Highmaul
+	--[] = "BRF", -- Blackrock Foundry
+
 	-------- MoP
-	["Mogu'shan Vaults"] = "MV",
-	["Heart of Fear"] = "HoF",
-	["Terrace of Endless Spring"] = "ToES",
+	[1008] = "MV", -- Mogu'shan Vaults
+	[1009] = "HoF", -- Heart of Fear
+	[996] = "ToES", -- Terrace of Endless Spring
+	[1098] = "ToT", -- Throne of Thunder
+	[1136] = "SoO", -- Siege of Orgrimmar
 
 	-------- Cata
-	["Baradin Hold"] = "BH",
-	["The Bastion of Twilight"] = "BoT",
-	["Blackwing Descent"] = "BWD",
-	["Throne of the Four Winds"] = "To4W",
-	--["Firelands"] = "Firelands",
+	[757] = "BH", -- Baradin Hold
+	[671] = "BoT", -- The Bastion of Twilight
+	[669] = "BWD", -- Blackwing Descent
+	[754] = "To4W", -- Throne of the Four Winds
+	-- surely these names are short enough already...?
+	--[720] = "F", -- Firelands
+	--[967] = "DS", -- Dragon Soul
 
 	-------- WotLK
-	["Icecrown Citadel"] = "ICC",
-	["Trial of the Champion"] = "ToC",
-	["Trial of the Crusader"] = "ToC",
-	["Trial of the Grand Crusader"] = "ToGC",  -- does not actually trigger, need to test heroic
-	["Vault of Archavon"] = "VoA",
+	[631] = "ICC", -- Icecrown Citadel
+	[650] = "ToC", -- Trial of the Champion (dungeon)
+	[649] = "ToC", -- Trial of the Crusader (raid)
+	[624] = "VoA", -- Vault of Archavon
 }
 
 -- Currently indexed by "boss name" values, as generated by whatever boss mod
 -- is in use; see specific boss mod handling code to see how they get it.
 addon.boss_abbrev = {
+	-------- WoD
+
 	-------- MoP
 	-- MV
 	["Will of the Emperor"] = "Talk to the Open Hand",