From bb1a43486d55344a44efc7a2cc9a64176f1afd7f Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Wed, 27 Jul 2005 06:10:24 +0000 Subject: [PATCH] small fix, doc update git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@19 7f574dfc-610e-0410-a909-a81674777703 --- README | 6 ++++-- conky.1 | 2 +- conky.c | 6 +++--- conkyrc.sample | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README b/README index 71dcaeb8..d8ef1189 100644 --- a/README +++ b/README @@ -76,8 +76,10 @@ draw_outline Draw outlines? font Font name in X, xfontsel can be used to get a nice font - gap_x Gap between right or left border of screen - gap_y Gap between top or bottom border of screen + gap_x Gap between right or left border of screen, same as + passing -x at command line + gap_y Gap between top or bottom border of screen, same as + passing -y at command line no_buffers Substract (file system) buffers from used memory? mail_spool Mail spool for mail checking metar_station METAR station code for weather, see diff --git a/conky.1 b/conky.1 index 95bc948f..5d204651 100644 --- a/conky.1 +++ b/conky.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH CONKY "1" "July 2005" "Conky 1.2 compiled Jul 25 2005" "User Commands" +.TH CONKY "1" "July 2005" "Conky 1.2 compiled Jul 27 2005" "User Commands" .SH NAME Conky .SH SYNOPSIS diff --git a/conky.c b/conky.c index adf995d9..4b2c07fb 100644 --- a/conky.c +++ b/conky.c @@ -2008,9 +2008,9 @@ static void generate_text() else if ( strcmp(&data.cldTypHgt[0].cloud_type[0], "FEW") == 0 ) snprintf(p, n, "Few clouds"); else if ( strcmp(&data.cldTypHgt[0].cloud_type[0], "SCT") == 0 ) - snprintf(p, n, "Scattered"); + snprintf(p, n, "Scattered clouds"); else if ( strcmp(&data.cldTypHgt[0].cloud_type[0], "BKN") == 0 ) - snprintf(p, n, "Broken"); + snprintf(p, n, "Broken clouds"); else if ( strcmp(&data.cldTypHgt[0].cloud_type[0], "OVC") == 0 ) snprintf(p, n, "Overcast"); else @@ -3448,7 +3448,7 @@ else if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) && *s) || ((s = getenv("LANG")) && *s)) { - if (strstr(s, "UTF-8")) + if (strstr(s, "UTF-8") || strstr(s, "utf-8")) utf8_mode = 1; } if (!setlocale(LC_CTYPE, "")) { diff --git a/conkyrc.sample b/conkyrc.sample index c959b095..4d251b2a 100644 --- a/conkyrc.sample +++ b/conkyrc.sample @@ -80,6 +80,7 @@ alignment bottom_left #alignment bottom_right # Gap between borders of screen and text +# same thing as passing -x at command line gap_x 12 gap_y 12