1.1 --- a/public_html/docs/english/config.html	Sun Oct 11 22:19:31 2009 +0200
     1.2 +++ b/public_html/docs/english/config.html	Sat Oct 17 11:17:43 2009 +0200
     1.3 @@ -999,10 +999,8 @@
     1.4    <td valign="top">If you chose 'imagemagick' for
     1.5      <code>$_CONF['image_lib']</code> above, then this should hold the
     1.6      <strong>complete path</strong> to the mogrify executable (from the
     1.7 -    ImageMagick package), e.g. '/usr/bin/mogrify'.<br>
     1.8 -    You will need a fairly recent version of <a
     1.9 -    href="http://www.imagemagick.org/">ImageMagick</a> for this to work
    1.10 -    (version 5.4.9 or newer is recommended).</td></tr>
    1.11 +    <a href="http://www.imagemagick.org/">ImageMagick</a> package), e.g.
    1.12 +    '<tt>/usr/bin/mogrify</tt>' (ImageMagick 5.4.9 or newer recommended).</td></tr>
    1.13  <tr>
    1.14    <td valign="top"><a name="desc_path_to_netpbm">path_to_netpbm</a></td>
    1.15    <td valign="top"><i>(disabled)</i></td>
    1.16 @@ -1050,7 +1048,7 @@
    1.17    <td valign="top">When set to <code>true</code>, this option enables debugging
    1.18      output to be written into Geeklog's <tt>error.log</tt> file during the
    1.19      upload of an image. This is useful to track down problems with the image
    1.20 -    upload.</td></tr>
    1.21 +    upload and resizing.</td></tr>
    1.22  </table>
    1.23  
    1.24  <h3><a name="images_articles">Images: Images in Articles</a></h3>
    1.25 @@ -1140,8 +1138,9 @@
    1.26    <td valign="top"><i>(disabled)</i></td>
    1.27    <td valign="top">When enabled, this option should point to an image (full URL
    1.28      required!) that should be displayed for users without a user photo. When
    1.29 -    this option is not set and a user does not have a user photo (or an avatar)
    1.30 -    then Geeklog will simply not display anything.</td></tr>
    1.31 +    this option is not set and a user does not have a user photo (or an <a 
    1.32 +    href="#images_gravatar">avatar</a>) then Geeklog will simply not display
    1.33 +    anything.</td></tr>
    1.34  </table>
    1.35  
    1.36  <h3><a name="images_gravatar">Images: Gravatar</a></h3>
    1.37 @@ -1156,7 +1155,7 @@
    1.38    <td valign="top">If enabled (set to <tt>true</tt>), a user's avatar image will
    1.39      be requested from <a href="http://gravatar.com/">gravatar.com</a> if the
    1.40      user didn't upload a user photo (i.e. an uploaded photo always takes
    1.41 -    priority).<br>
    1.42 +    precedence).<br>
    1.43      Please note that this option may slow down your site on pages that display
    1.44      a lot of userphotos for different users (e.g. forum threads).</td></tr>
    1.45  <tr>
    1.46 @@ -1415,7 +1414,10 @@
    1.47      display the actual error message to members of the Root group (to prevent
    1.48      leakage of possibly sensitive information). When set to <code>true</code>,
    1.49      this information will be displayed to <em>all</em> users. <strong>Use only
    1.50 -    for debugging purposes!</strong></td></tr>
    1.51 +    for debugging purposes!</strong><br>
    1.52 +    Tip: If an error prevents you from logging into your site to enable that
    1.53 +    option, you can also <a href="#desc_rootdebug_siteconfig">enable it in your
    1.54 +    <tt>siteconfig.php</tt></a> file.</td></tr>
    1.55  </table>
    1.56  
    1.57  <h3><a name="misc_digest">Miscellaneous: Daily Digest</a></h3>
    1.58 @@ -1602,6 +1604,19 @@
    1.59      another character encoding.<br>
    1.60      For <a href="http://wiki.geeklog.net/wiki/index.php/Multi-Language_Support">multi-language</a> setups, using <code>'utf-8'</code> as the default character
    1.61      set is recommended.</td></tr>
    1.62 +<tr>
    1.63 +  <td valign="top"><a name="desc_rootdebug_siteconfig">rootdebug</a></td>
    1.64 +  <td valign="top"><i>(disabled)</i></td>
    1.65 +  <td valign="top">Same as the '<a href="#desc_rootdebug">rootdebug</a>' option
    1.66 +    in the Configuration. However, sometimes an error may occur that prevents
    1.67 +    you from logging into your site and enabling the 'rootdebug' option. In
    1.68 +    such a case, you can uncomment this line and enable the option here.<br>
    1.69 +    In addition to 'true' and 'false', you can also set this option to 'force'
    1.70 +    (only in <tt>siteconfig.php</tt>). This will enable displaying of sensitive
    1.71 +    information like passwords and cookies.<br>
    1.72 +    In any case, the same strong warning as <a href="#desc_rootdebug">above</a>
    1.73 +    applies here, too: <strong>Do not leave this option enabled on a "live"
    1.74 +    site!</strong></td></tr>
    1.75  </table>
    1.76  
    1.77