Remove some stray text that shouldn't have been checked in.

New descriptions:
 Cacodemon
 Dispater
 Tiamat
 Geryon
 bumblebee
 ghoul
 human
 player ghost
 program bug
 A gateway to Hell
 A granite statute


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4060 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 90 insertions, 13 deletions

diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index df24caf527..aab45e16f0 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -58,6 +58,9 @@ A gateway to Gehenna
 %%%%
 A gateway to Hell
 
+"Lasciate ogne speranza, voi ch'intrate."
+	-Dante Alighieri, _Divina Commedia_, "L'Inferno", Canto III.
+	circa 1315.
 %%%%
 A gateway to the Iron City of Dis
 
@@ -76,6 +79,21 @@ A glowing white marble altar of Zin
 %%%%
 A granite statue
 
+"I met a traveller from an antique land
+Who said: Two vast and trunkless legs of stone
+Stand in the desert. Near them on the sand,
+Half sunk, a shatter'd visage lies, whose frown
+And wrinkled lip and sneer of cold command
+Tell that its sculptor well those passions read
+Which yet survive, stamp'd on these lifeless things,
+The hand that mock'd them and the heart that fed.
+And on the pedestal these words appear:
+"My name is Ozymandias, king of kings:
+Look on my works, ye Mighty, and despair!"
+Nothing beside remains: round the decay
+Of that colossal wreck, boundless and bare,
+The lone and level sands stretch far away."
+	-Percy Bysshe Shelley, "Ozymandias".  1818.
 %%%%
 A labyrinth entrance
 
@@ -160,7 +178,7 @@ A staircase to the Crypt
 %%%%
 A staircase to the Ecumenical Temple
 
-An entrance to the Temple of the Gods, a place of peace and refuge
+An entrance to the Temple of the Gods, a place of peace, and a refuge
 from the insanity of the dungeon.
 %%%%
 A staircase to the Elven Halls
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index a87c7529c4..2f2cc52048 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -102,9 +102,6 @@ the Ingredients have infuſed eight or ten Days the Liquor is to be ſtrain'd
 again and put into Bottles and ſo kept."
 	-Charles Carter, _The Compleat City and Country Cook:
 	Or, Accomplish'd House-wife_.  1732.
-
-  <a href="http://books.google.com/books?id=yYYEAAAAYAAJ&dq=apricot+date:1000-1800&lr=&pg=RA1-PA203&ci=46,134,779,604&source=bookclip">The Compleat City and Country Cook Or, Accomplish'd House-wife. Containing, Several Hundred of the Most Approv'd Receipts in Cookery, Confectionary, Cordials [etc.] ... Illustrated with Forty-nine Large Copper Plates, Directing the Regular Placing the Various Dishes on the Table ... Also, Bills of Fare According to the Several Seasons for Every Month of the Year ... By Charles Carter</a>
-
 %%%%
 arrow
 
@@ -162,8 +159,8 @@ grimoires are not to be toyed with.
 %%%%
 book of cantrips
 
-A book of magic spells. Beware, for some of the more powerful
-grimoires are not to be toyed with.
+A book of magic spells. Unlike most of the other grimoires, 
+this one can be toyed with.
 %%%%
 book of changes
 
@@ -826,9 +823,6 @@ with them and beat all well together.  Put it into gallipots and tie
 it down ſo as properly to prevent the air getting to it."
 	-Francis Collingwood, John Woollams, _The Universal
 	Cook: And City and Country Housekeeper. 1792.
-
-
-  <a href="http://books.google.com/books?id=xJMEAAAAYAAJ&dq=orange+date:1000-1800&lr=&pg=PA292&ci=89,879,795,332&source=bookclip">The Universal Cook And City and Country Housekeeper By Francis Collingwood,  John Woollams</a>
 %%%%
 orb of zot
 
@@ -1474,7 +1468,6 @@ order or apparent arrangement. From that garden Bentham sent specimens
 of the Sultana raisin to England which he believed to have been the first 
 of that species which had ever reachedahis country."
 	-John Bowring, _The Works of Jeremy Bentham_.  1839.  
-
 %%%%
 swamp dragon armour
 
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 969bd4ae04..676b3eb1fd 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -56,6 +56,12 @@ An ancient lich. The air around his shrouded form crackles with evil energy.
 Cacodemon
 
 A hideously ugly demon of rage and legendary power.
+
+"We'll call him Cacodemon, with his black Gib there, his Succuba, his 
+Devil's Seed, his Spawn of Phlegethon, that o' my Conſience was bred 
+o' the Spume of Cocytus."
+    -John Fletcher, _The Knight of Malta_.  1647.
+
 %%%%
 Cerebov
 
@@ -68,6 +74,9 @@ A divine agent of the Shining One, it is a towering winged figure with an aura o
 Dispater
 
 The lord of the Iron City of Dis.
+
+"Hoc idem magis ostendit antiquius Iovis nomen: nam olim Diovis et Diespiter dictus, id est dies pater; a quo dei dicti qui inde, et dius et divum, unde sub divo, Dius Fidius. Itaque inde eius perforatum tectum, ut ea videatur divum, id est caelum. Quidam negant sub tecto per hunc deierare oportere. Aelius Dium Fidium dicebat Diovis filium, ut Graeci Dioskopon Castorem, et putabat hunc esse Sancum ab Sabina lingua et Herculem a Graeca. Idem hic Dis pater dicitur infimus, qui est coniunctus terrae, ubi omnia ut oriuntur ita aboriuntur; quorum quod finis ortuum, Orcus dictus."
+	-Marcus Terentius Varro, _De Lingua Latina_, Liber V, circa 40 BC.
 %%%%
 Donald
 
@@ -117,7 +126,15 @@ A svelte fighter-mage, wearing a gold-rimmed monocle.
 %%%%
 Geryon
 
-A huge, winged arch-demon, guardian of the gates of Hell.
+A huge, three-headed, winged arch-demon, guardian of the gates of Hell.
+
+"Khrysaor, married to Kallirhoe, daughter of glorious Okeanos, was father to the
+triple-headed Geryon, but Geryon was killed by the great strength of Herakles at
+sea-circled Erytheis beside his own shambling cattle on that day when Herakles drove
+those broad-faced cattle toward holy Tiryns, when he crossed the stream of Okeanos and
+had killed Orthos and the oxherd Eurytion out in the gloomy meadow beyond fabulous 
+Okeanos."
+	-Hesiod, _Theogony_, circa 700 BCE.
 %%%%
 Gloorx Vloq
 
@@ -283,6 +300,24 @@ An evil human fighter.
 Tiamat
 
 A powerful dragon with mighty wings.  Her scales seem to shimmer and change colour as you watch.
+
+"He saith that Tiamat our mother hath conceived a hatred for us,
+With all her force she rageth, full of wrath.
+All the gods have turned to her,
+With those, whom ye created, they go at her side.
+They are banded together, and at the side of Tiamat they advance;
+They are furious, they devise mischief without resting night and day.
+They prepare for battle, fuming and raging;
+They have joined their forces and are making war.
+Tiamat who formed all things,
+Made in addition weapons invincible; she spawned monster-serpents,
+Sharp of tooth, and merciless of fang;
+With poison, instead of blood, she filled their bodies.
+Fierce monster-vipers she clothed with terror,
+With splendor she decked them, she made them of lofty stature.
+Whoever beheld them, terror overcame him,
+Their bodies reared up and none could withstand their attack."
+	-Enuma Elish, Third Tablet. circa 668 BCE.
 %%%%
 Urug
 
@@ -404,6 +439,12 @@ A large brown snake.
 bumblebee
 
 A very large and fat hairy bee.
+
+"How doth the little busy Bee 
+     Improve each shining Hour, 
+And gather Honey all the day 
+     From every opening Flower!"
+	-Isaac Watts.  1715.
 %%%%
 butterfly
 
@@ -703,6 +744,18 @@ A hideous stone statue come to life.
 ghoul
 
 An undead humanoid creature created from a decaying corpse by some unholy means of necromancy. It exists to spread disease and decay, and gains power from decaying corpses in the same way a necrophage does.
+
+"In the desert
+I saw a creature, naked, bestial,
+Who, squatting upon the ground,
+Held his heart in his hands,
+And ate of it.
+I said, 'Is it good, friend?'
+'It is bitter - bitter', he answered,
+'But I like it
+Because it is bitter,
+And because it is my heart.'"
+	-Stephen Crane, _The Black Riders and Other Lines_.  1895.
 %%%%
 giant amoeba
 
@@ -932,7 +985,14 @@ A huge and hideous form, created or summoned by some arcane process.
 %%%%
 human
 
-A remarkably nondescript person.  How odd!
+A remarkably nondescript person.  How odd.
+
+"Do you know
+ Do I know
+ What's this thing called 'man'?
+ God only knows what a man is!
+ I only know his price."
+	-Bertolt Brecht, "The Measures Taken". 1930. 
 %%%%
 hungry ghost
 
@@ -1272,6 +1332,9 @@ Few plants can grow in the unpleasant dungeon environment, but some have managed
 player ghost
 
 The apparition of an unfortunate adventurer.
+
+"Know thyself."
+	-Inscription in the pronaos of the Temple of Apollo at Delphi	
 %%%%
 polar bear
 
@@ -1281,6 +1344,9 @@ program bug
 
 A ravenous and incredibly buggy monster. Please report its existence
 to the DevTeam.
+
+"If builders built buildings the way programmers wrote programs, then the first woodpecker that came along would destroy civilization"
+	-Gerald Weinberg, Weinberg's Second Law
 %%%%
 pulsating lump
 
@@ -1322,7 +1388,7 @@ rat
 
 Wherever there are men, there are rats -- rattus rattus.  This rat has grown large and aggressive in the pestilential dungeon environment.
 
-How now? a rat? Dead, for a ducat, dead!
+"How now? a rat? Dead, for a ducat, dead!"
      -William Shakespeare, Hamlet, Act III, 4
 %%%%
 reaper