updating docs/changelog, again

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

diff --git a/README b/README
index 234f142..9365104 100644 (file)
--- a/README
+++ b/README
@@ -278,22 +278,14 @@ CONFIGURATION SETTINGS
              config file (default is 16384 bytes)
 
 
-       large_text_buffer_size bytes
-             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.
-
-
-       small_text_buffer_size bytes
-             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.  In-
-             creasing  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.
+       text_buffer_size 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 perfor-
+             mance, but will allow for more text display  per  variable.  The
+             size  of this buffer cannot be smaller than the default value of
+             128 bytes.
 
 
        maximum_width pixels

diff --git a/doc/conky.1 b/doc/conky.1
index 5764eea..5ad053b 100644 (file)
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -267,12 +267,8 @@ Maximum size of user text buffer, i.e. layout below TEXT line in config file
 (default is 16384 bytes)
 
 .TP 
-\fB\*(T<\fBlarge_text_buffer_size\fR\*(T>\fR \*(T<\fBbytes\fR\*(T> 
-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.
-
-.TP 
-\fB\*(T<\fBsmall_text_buffer_size\fR\*(T>\fR \*(T<\fBbytes\fR\*(T> 
-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.
+\fB\*(T<\fBtext_buffer_size\fR\*(T>\fR \*(T<\fBbytes\fR\*(T> 
+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.
 
 .TP 
 \fB\*(T<\fBmaximum_width\fR\*(T>\fR \*(T<\fBpixels\fR\*(T>