diff --git a/ChangeLog b/ChangeLog
index 60ff39ab..e0c529a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
    Make Toggle Case use the current word if there's no selection.
    Make Toggle Case keep an existing selection.
    Rename ui_widgets.popup_items to popup_copy_items.
+ * doc/geany.txt, doc/geany.html:
+   Edit how to manually edit geany.conf hidden prefs.
 
 
 2007-09-11  Enrico Tröger  <enrico.troeger@uvena.de>
diff --git a/doc/geany.html b/doc/geany.html
index ec97e537..1710c9f5 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -2477,12 +2477,18 @@ menus. Some less common commands with no menu equivalent are:</p>
 <div class="section">
 <h1><a class="toc-backref" href="#id103" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1>
 <p>There are some uncommon preferences that are not shown in the
-Preferences dialog. These can be set by using a second instance of
-Geany to edit <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>. After saving the file, restart
-the first instance, and the new settings will be used. Otherwise,
-the configuration file changes are overwritten when Geany is closed.</p>
-<p>The table below refers to the key names in the configuration file, under the
-<tt class="docutils literal"><span class="pre">[geany]</span></tt> group.</p>
+Preferences dialog. These can be set in two ways:</p>
+<ol class="arabic simple">
+<li>By quitting all instances of Geany and using another editor to edit
+<tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>.</li>
+<li>By using Geany to edit <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>, then after saving
+the file, start a second instance of Geany, and the new settings
+will be used. Make sure to then quit the first instance.</li>
+</ol>
+<p>Otherwise, the configuration file changes are overwritten when Geany
+is closed.</p>
+<p>The table below refers to the key names in the configuration file,
+under the <tt class="docutils literal"><span class="pre">[geany]</span></tt> group.</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="33%" />
@@ -3036,7 +3042,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-09-12 11:56 UTC.
+Generated on: 2007-09-12 15:30 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index f02145c3..91d3da14 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -2255,13 +2255,19 @@ Hidden preferences
 ==================
 
 There are some uncommon preferences that are not shown in the
-Preferences dialog. These can be set by using a second instance of
-Geany to edit ``~/.geany/geany.conf``. After saving the file, restart
-the first instance, and the new settings will be used. Otherwise,
-the configuration file changes are overwritten when Geany is closed.
+Preferences dialog. These can be set in two ways:
 
-The table below refers to the key names in the configuration file, under the
-``[geany]`` group.
+1. By quitting all instances of Geany and using another editor to edit
+   ``~/.geany/geany.conf``.
+2. By using Geany to edit ``~/.geany/geany.conf``, then after saving
+   the file, start a second instance of Geany, and the new settings
+   will be used. Make sure to then quit the first instance.
+
+Otherwise, the configuration file changes are overwritten when Geany
+is closed.
+
+The table below refers to the key names in the configuration file,
+under the ``[geany]`` group.
 
 ==============================  ============================================    ==================
 Option                          Description                                     Default