5 files changed, 49 insertions, 11 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 090e393965..f5b01ada60 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -885,7 +885,13 @@ static void recap_feat_keys(std::vector<std::string> &keys)
     for (unsigned int i = 0, size = keys.size(); i < size; i++)
     {
         dungeon_feature_type type = feat_by_desc(keys[i]);
-        keys[i] = feature_description(type);
+        if (type == DNGN_ENTER_SHOP)
+            keys[i] = "A shop";
+        else
+        {
+            keys[i] = feature_description(type, NUM_TRAPS, false, DESC_CAP_A,
+                                          false);
+        }
         //fprintf(stderr, "%s\n", keys[i].c_str());
     }
 }
diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt
index 79f8268cb1..f4ea3c35d7 100644
--- a/crawl-ref/source/dat/descript/branches.txt
+++ b/crawl-ref/source/dat/descript/branches.txt
@@ -5,11 +5,13 @@ Describe branch here.
 %%%%
 Temple
 
-Describe branch here.
+The Temple of some of the Gods, a place of peace and refuge
+from the insanity of the dungeon.
 %%%%
 Orcish Mines
 
-Describe branch here.
+The mines of the orcs, filled with their gold, but 
+treacherous and easy to get trapped in.
 %%%%
 Elven Halls
 
@@ -21,19 +23,24 @@ Describe branch here.
 %%%%
 Swamp
 
-Describe branch here.
+A swampy waste land, complete with ooze, muck, flies, and
+large slavering carnivorous monsters.
 %%%%
 Shoals
 
-Describe branch here.
+Here be the Shoals: exotic underground beaches, salty spray and
+creatures that bite, stab, and maul.
 %%%%
 Slime Pits
 
-Describe branch here.
+The amorphous realm of acids, jellies and slimes. 
+Any trace of intelligent beings has long been dissolved. Still, 
+there are rumours of great treasures deep down, hidden safely away
+in secret chambers without door or window for acid to leak in.
 %%%%
 Snake Pit
 
-Describe branch here.
+Home of the serpent, lair of the naga.
 %%%%
 Hive
 
@@ -53,7 +60,19 @@ Describe branch here.
 %%%%
 Tomb
 
-Describe branch here.
+The Tomb of the Ancients, a place of damnation, of horrors animated 
+by the vilest necromancy.
+
+"In the depths of every heart, there is a tomb and a dungeon, though
+the lights, the music, and revelry above may cause us to forget their
+existence, and the buried ones, or prisoners whom they hide. But
+sometimes, and oftenest at midnight, those dark receptacles are flung
+wide open. In an hour like this, when the mind has a passive
+sensibility, but no active strength; when the imagination is a mirror,
+imparting vividness to all ideas, without the power of selecting or
+controlling them; then pray that your grieves may slumber, and the
+brotherhood of remorse not break their chain."
+    - Nathaniel Hawthorne
 %%%%
 Hell
 
@@ -79,3 +98,4 @@ Zot
 
 Describe branch here.
 %%%%
+
diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index 131b3dfcd1..8d84a62630 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -25,6 +25,10 @@ A fountain of clear blue water
 
 'q'uaff to drink from this fountain. But it's far more pretty than useful, unless you're trying to fetch the Orb without eating, I guess.
 %%%%
+A fountain of blood
+
+'q'uaff to drink from this fountain, if you absolutely wish to.
+%%%%
 A fountain of sparkling water
 
 'q'uaff to drink from this magic fountain. Expect magical effects, as long as it's still magic.
@@ -100,8 +104,8 @@ substance impermanent and whimsical, filled with creatures out
 of nightmare.
 
 "And if you gaze for long into an abyss,
- the abyss gazes also into you.”
-    – Friedrich Nietzsche, "Beyond Good and Evil"
+ the abyss gazes also into you."
+    - Friedrich Nietzsche, "Beyond Good and Evil"
 %%%%
 A rock wall
 
@@ -293,3 +297,4 @@ Some shallow water
 
 This waist-deep, misty water makes movement and combat cumbersome for landlubbers -- sometimes dangerous, but never directly fatal.
 %%%%
+
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 77faf0caeb..1016f3670d 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -777,6 +777,12 @@ potion of blood
 A potion containing the essence of life. Vital for all living
 creatures, as well as some undead ones.
 %%%%
+potion of coagulated blood
+
+A potion containing the essence of life. Vital for all living
+creatures, as well as some undead ones. The blood within won't 
+be palatable much longer.
+%%%%
 potion of confusion
 
 A potion which confuses your perceptions and reduces your control over
@@ -1518,3 +1524,4 @@ young poisoner's handbook
 A book of magic spells. Beware, for some of the more powerful
 grimoires are not to be toyed with.
 %%%%
+
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index aa2d619e99..8783f0d88b 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -593,7 +593,7 @@ static std::string _query_database(DBM *db, std::string key,
 
 std::string getLongDescription(const std::string &key)
 {
-    if (! DescriptionDB.get())
+    if (!DescriptionDB.get())
         return ("");
 
     return _query_database(DescriptionDB.get(), key, true, true);