Fix 2021696: allow_self_target = no even forbidding self-targetting for

area effect spells (now prompts)
Fix 2028704: spell view toggle 'I' preventing forgetting spell slot 'I'

Allow intelligent summoned monsters to equip themselves.


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

1 files changed, 6 insertions, 5 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index db2b168d55..baa8b1776d 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -508,11 +508,12 @@ default_friendly_pickup = (friend | none | all)
         when you start a new game, or when you enter a level for the first
         time.
 
-        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.
+        Note that this only works for intelligent allies (such as you 
+        can get when worshipping Beogh or when summoning intelligent 
+        monsters), 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.