updating docs/changelog

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1022 7f574dfc-610e-0410-a909-a81674777703

diff --git a/AUTHORS b/AUTHORS
index 46837aa..6a619c8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -196,6 +196,9 @@ Nattfodd <Nattfodd@gmail.com>
 nathanj439 <nathanj439 at users dot sourceforge dot net>
   MPD time fix
 
+Nikos Ntarmos <ntarmos at users dot sourceforge dot net>
+  FreeBSD total memory patch
+
 Pascal Eberhard <pascal dor eberhard at gmail dot com>
   graph and bar fix for right alignment
 

diff --git a/ChangeLog b/ChangeLog
index 3ffd36e..4e28738 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,12 @@
        some servers now).
        * Added preliminary support for parsing the output of external commands
        (via $execp)
+       * Applied FreeBSD total memory patch (thanks Nikos)
 
 2008-03-19
        * Fixed a number of small memory leaks.
-       * Performed some minor profiling on Conky; introduced
-       small_text_buffer_size and large_text_buffer_size config options instead
-       of just text_buffer_size.
+       * Performed some minor profiling on Conky; reduced text_buffer_size
+       default to 128 bytes to improve performance.
        * Fixed some minor bugs introduced by new patches.
 
 2008-03-17

diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 1cd2095..6a01f9e 100644 (file)
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -229,20 +229,11 @@
 </varlistentry>
 
 <varlistentry>
-       <term><command><option>large_text_buffer_size</option></command>
+       <term><command><option>text_buffer_size</option></command>
                <option>bytes</option>
        </term>
        <listitem>
-               Size of the standard large text buffer (default is 1024 bytes).  This buffer is used for the entirety of Conky's text.  Increasing the buffer's size will decrease performance and increase the memory footprint of Conky, but it will allow for more text to be displayed in Conky.
-               <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term><command><option>small_text_buffer_size</option></command>
-               <option>bytes</option>
-       </term>
-       <listitem>
-               Size of the standard small text buffer (default is 128 bytes).  This buffer is used for intermediary text, such as individual lines, output from $exec vars, and various other variables.  Increasing the size of this buffer can drastically reduce Conky's performance, but will allow for more text display per variable.  The size of this buffer cannot be smaller than the default value of 128 bytes.
+               Size of the standard text buffer (default is 128 bytes).  This buffer is used for intermediary text, such as individual lines, output from $exec vars, and various other variables.  Increasing the size of this buffer can drastically reduce Conky's performance, but will allow for more text display per variable.  The size of this buffer cannot be smaller than the default value of 128 bytes.
                <para></para></listitem>
 </varlistentry>