diff --git a/ChangeLog b/ChangeLog index 99f60520..77eb5ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ # $Id$ 2007-08-05 + * Conky 1.4.6 released * Updated to libmpdclient 0.13.0 * Added 'post_21_kernel' config param to specify kernels 2.6.22 and newer so i2c works properly diff --git a/README b/README index 59c16b23..13e4c96e 100644 --- a/README +++ b/README @@ -345,6 +345,10 @@ CONFIGURATION SETTINGS Print text to stdout. + post_21_kernel + Set to yes if you have Linux kernel 2.6.22 or newer + + pad_percents Pad percentages to this many decimals (0 = no padding) @@ -974,7 +978,7 @@ VARIABLES Playing, stopped, et cetera. - mpd_title + mpd_title (max length) Title of current MPD song diff --git a/configure.ac.in b/configure.ac.in index d8ce8b68..bf8a618d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -4,7 +4,7 @@ dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) m4_define([conky_version_micro], [6]) -m4_define([conky_version_tag], [svn]) dnl [] for releases +m4_define([conky_version_tag], []) dnl [] for releases m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( diff --git a/doc/conky.1 b/doc/conky.1 index a5407892..827f1951 100644 --- a/doc/conky.1 +++ b/doc/conky.1 @@ -336,6 +336,10 @@ of window can be useful for certain situations. \fB\*(T<\fBout_to_console\fR\*(T>\fR Print text to stdout. +.TP +\fB\*(T<\fBpost_21_kernel\fR\*(T>\fR +Set to yes if you have Linux kernel 2.6.22 or newer + .TP \fB\*(T<\fBpad_percents\fR\*(T>\fR Pad percentages to this many decimals (0 = no padding) @@ -893,7 +897,7 @@ Bitrate of current song Playing, stopped, et cetera. .TP -\fB\*(T<\fBmpd_title\fR\*(T>\fR +\fB\*(T<\fBmpd_title\fR\*(T>\fR \*(T<\fB(max length)\fR\*(T> Title of current MPD song .TP