Clean up the change log a bit, and modify the monster speech

documentation.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 38a7979f5c..1be63424a4 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -433,7 +433,7 @@ default_friendly_pickup = (none | friend | all)
                       (This is the old friendly pick up behaviour.)
              friend = They will pick up anything they or another ally 
                       dropped, e.g. if another ally dies.
-                      (This is the default value.)
+                      (This is the default setting.)
              all    = They will pick up anything they want to have.
                       (This is how it works for hostile monsters.)
 
@@ -441,11 +441,11 @@ default_friendly_pickup = (none | friend | all)
         when you start a new game, or when you enter a level for the first
         time.
 
-        Note that this only works for permanent allies (such as you can
-        get when worshipping Beogh or the Shining One), and that monsters
-        have their own reasonings for which items they may need, and when
-        they feel safe enough to pick them up. Except for "none", these 
-        options won't let you override these restrictions.
+        Note that this only works for intelligent permanent allies (such
+        as you can get when worshipping Beogh or the Shining One), and
+        that monsters have their own reasonings for which items they may
+        need, and when they feel safe enough to pick them up. Except for
+        "none", these options won't let you override these requirements.
         Also, friendly jellies won't ever eat any items, regardless of
         this option.