Apply various documentation fixes to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6664 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 28 insertions, 26 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 2d091afb04..e1d12733e6 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -1655,14 +1655,14 @@ patches of thick fur, and their mouths are full of ichor-dripping fangs.
 
 They can rip creatures apart with their claws, and regenerate very
 quickly from even the most terrible wounds. They learn very slowly
-indeed -- even more slowly than High Elves -- and need a great amount
-of food to survive.
+indeed -- as slowly as High Elves -- and need a great amount of food to
+survive.
 
 Minotaurs
 ---------
 The Minotaurs are yet another race of hybrids -- human bodies with
 bovine heads. They delve into the Dungeon because of their instinctive
-love of  twisting passageways.
+love of twisting passageways.
 
 Minotaurs are extremely good at all forms of physical combat, but are
 awful at using any type of magic. They can wear all armour except for
@@ -1784,7 +1784,7 @@ Mummies
   increase in levels, they become increasingly in touch with the powers
   of death, but cannot use some types of necromancy which only affect
   living creatures. The side effects of necromantic magic tend to be
-  relatively harmless to Mummies. However, their dessicated bodies are
+  relatively harmless to Mummies. However, their desiccated bodies are
   highly flammable. They also do not need to eat or drink, and in any
   case are incapable of doing so.
 
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index d0cff5bb8d..f182fed5ec 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -1332,11 +1332,9 @@ force_more_message = <list of regexes>
         The syntax is identical to that of travel_stop_message (4-g).
 
 msg_condense_repeats = true
-        If the same message is repeated multiple times without repetition,
-        then the Show Previous Message command (Ctrl-P) will condense them
-        into one line indicating how many times it was repeated.  For
-        example:
-
+        If the same message is repeated multiple times, then the Show
+        Previous Message command (Ctrl-P) will condense them into one
+        line indicating how many times it was repeated.  For example:
             You hear a distant "Zot!" (x3)
 
 4-k     Missiles.
diff --git a/crawl-ref/docs/ssh_guide.txt b/crawl-ref/docs/ssh_guide.txt
index 2742a21b5a..f9639548e2 100644
--- a/crawl-ref/docs/ssh_guide.txt
+++ b/crawl-ref/docs/ssh_guide.txt
@@ -85,6 +85,11 @@ type:' Here you need to choose the SSH button; it should be highlighted
 green.  If it's not already, simply click on it so that it is green.  
 When SSH is selected, the Port field will automatically change to 22.
 
+Finally, enable SSH compression by using
+Category: Connection > SSH > Protocol Options > Enable compression.
+It's disabled by default but helps on a busy server as akrasiac.
+
+
 3. Set controls to 'Nethack'
 ----------------------------
 That is all we do for the connection part.  Next we need to ensure our
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index fd21e04a20..9c5835a431 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2268,7 +2268,7 @@ orc sorcerer
 @_wizard_@
 
 w:1
-@_generic_orc_speech@
+@_generic_orc_speech_@
 
 w:1
 __NONE
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index f62aa38193..ea73826b09 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -52,7 +52,7 @@ ENDMAP
 # Generic Orc entry
 #
 NAME: david_orc_2
-TAGS: orc_entry
+TAGS: orc_entry no_rotate
 MONS: weight:50 orc / orc warrior / nothing
 ORIENT: float
 MAP
@@ -270,7 +270,7 @@ ENDMAP
 # Orc-henge
 #
 NAME: erik_orc_4
-TAGS: orc_entry
+TAGS: orc_entry no_rotate
 MONS: human/goblin/hobgoblin/weight:2 orc, orc priest, orc
 MONS: orc priest/orc wizard/weight:2 goblin/nothing, orc warrior/warg
 ORIENT: float
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index a55dc77498..a0a0f5c6ce 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -514,22 +514,21 @@ NAME:    zaba_temple_1
 PLACE:   Temple
 FLAGS:   no_rotate
 ORIENT:  encompass
-COLOUR:  b = magenta
+COLOUR:  c = magenta
 SHUFFLE: {[
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxbbbbbbbbbxxxxxbbbbbbbbbxxxxxbbbbbbbbbxxxxx
-xxxbbb.......bbbxbbb.......bbbxbbb.......bbbxxx
-xxbb...B...B...bbb...B...B...bbb...B...B...bbxx
-xxb.............b.............b.............bxx
-xxbb...........bbb...........bbb...........bbxx
-xxxbbb...(.............[.............{....bbxxx
-xxbb...........bbb...........bbb...........bbxx
-xxb.............b.............b.............bxx
-xxbb...B...B...bbb...B...B...bbb...B...B...bbxx
-xxxbbb.......bbbxbbb.......bbbxbbb.......bbbxxx
-xxxxxbbbbbbbbbxxxxxbbbbbbbbbxxxxxbbbbbbbbbxxxxx
+xxcccccccccccccccccccccccccccccccccccccccccccxx
+xxcccc.......ccccccc.......ccccccc.......ccccxx
+xxcc...B...B...ccc...B...B...ccc...B...B...ccxx
+xxc.............c.............c.............cxx
+xxcc...........ccc...........ccc...........ccxx
+xxcccc...(.............[.............{....cccxx
+xxcc...........ccc...........ccc...........ccxx
+xxc.............c.............c.............cxx
+xxcc...B...B...ccc...B...B...ccc...B...B...ccxx
+xxcccc.......ccccccc.......ccccccc.......ccccxx
+xxcccccccccccccccccccccccccccccccccccccccccccxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index 014d802d3c..d0fd736eed 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -37,7 +37,7 @@
 
 #define CRAWL "Dungeon Crawl Stone Soup"
 
-#define VER_NUM  "0.4.1"
+#define VER_NUM  "0.4.2"
 #define VER_QUAL ""
 
 // last updated 07august2001 {mv}