summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/time.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8771a5a450..77cc3a4b8bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-21 Jari Aalto <jari.aalto@cante.net>
+
+ * time.el (display-time-default-load-average): Doc fix.
+
2009-03-21 Eli Zaretskii <eliz@gnu.org>
* simple.el (handle-shift-selection): Doc fix. (Bug#2738)
diff --git a/lisp/time.el b/lisp/time.el
index 965024bf7c2..874b606e3c2 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -65,7 +65,12 @@ directory `display-time-mail-directory' contains nonempty files."
(defcustom display-time-default-load-average 0
"Which load average value will be shown in the mode line.
Almost every system can provide values of load for past 1 minute, past 5 or
-past 15 minutes. The default is to display 1 minute load average."
+past 15 minutes. The default is to display 1 minute load average.
+The value can be one of:
+
+ 0 => 1 minute load
+ 1 => 5 minutes load
+ 2 => 15 minutes load"
:type '(choice (const :tag "1 minute load" 0)
(const :tag "5 minutes load" 1)
(const :tag "15 minutes load" 2)