From ac8579152574a0d25223aca6fb67cd0d2e979f5f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 21 Mar 2012 15:25:30 +0100
Subject: [PATCH] Expand documentation for autofocus a bit

Issue #459
---
 doc/manual.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8867b2f7d1..cb83800dcd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -275,8 +275,11 @@ <h2 id="config">Configuration</h2>
       will be assigned.</dd>
 
       <dt id="option_autofocus"><code>autofocus (boolean)</code></dt>
-      <dd>When set to <code>true</code>, causes the editor to be
-      focused after initialization. Default is <code>false</code>.</dd>
+      <dd>Can be used to make CodeMirror focus itself on
+      initialization. Defaults to off.
+      When <a href="#fromTextArea"><code>fromTextArea</code></a> is
+      used, and no explicit value is given for this option, it will
+      inherit the setting from the textarea.</dd>
 
       <dt id="option_onKeyEvent"><code>onKeyEvent (function)</code></dt>
       <dd>This provides a rather low-level hook into CodeMirror's key