From 3a03e55068747637db4480d4f3a8ab8ef26c50b1 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 12 Jun 2008 23:18:32 +0200
Subject: [PATCH] Imported upstream version 1.3.0.

---
 CHANGES                         | 106 ++++++
 CONTRIBUTORS                    |   2 +-
 TODO                            |   4 +-
 bindings/perl-piped/RRDp.pm     |   2 +-
 bindings/perl-shared/RRDs.pm    |   2 +-
 bindings/python/rrdtoolmodule.c |   4 +-
 configure                       |  22 +-
 configure.ac                    |   4 +-
 doc/bin_dec_hex.1               |   2 +-
 doc/bin_dec_hex.txt             |   2 +-
 doc/cdeftutorial.1              |   2 +-
 doc/cdeftutorial.txt            |   2 +-
 doc/rpntutorial.1               |   2 +-
 doc/rpntutorial.txt             |   2 +-
 doc/rrd-beginners.1             |   2 +-
 doc/rrd-beginners.txt           |   2 +-
 doc/rrdbuild.1                  |  12 +-
 doc/rrdbuild.html               |  10 +-
 doc/rrdbuild.pod                |  10 +-
 doc/rrdbuild.txt                |  12 +-
 doc/rrdcgi.1                    |   2 +-
 doc/rrdcgi.txt                  |   2 +-
 doc/rrdcreate.1                 |  78 ++---
 doc/rrdcreate.html              |  56 ++-
 doc/rrdcreate.pod               |  24 +-
 doc/rrdcreate.txt               | 317 ++++++++---------
 doc/rrddump.1                   |   2 +-
 doc/rrddump.txt                 |   2 +-
 doc/rrdfetch.1                  |   2 +-
 doc/rrdfetch.txt                |   2 +-
 doc/rrdfirst.1                  |   2 +-
 doc/rrdfirst.txt                |   2 +-
 doc/rrdgraph.1                  | 190 +++++-----
 doc/rrdgraph.html               |  81 +++--
 doc/rrdgraph.pod                |  23 +-
 doc/rrdgraph.txt                | 595 ++++++++++++++++----------------
 doc/rrdgraph_data.1             |   2 +-
 doc/rrdgraph_data.txt           |   2 +-
 doc/rrdgraph_examples.1         |   2 +-
 doc/rrdgraph_examples.txt       |   2 +-
 doc/rrdgraph_graph.1            | 102 +++---
 doc/rrdgraph_graph.html         | 130 +++----
 doc/rrdgraph_graph.pod          |  40 +--
 doc/rrdgraph_graph.txt          | 313 +++++++++--------
 doc/rrdgraph_rpn.1              |   2 +-
 doc/rrdgraph_rpn.txt            |   2 +-
 doc/rrdinfo.1                   |   2 +-
 doc/rrdinfo.txt                 |   2 +-
 doc/rrdlast.1                   |   2 +-
 doc/rrdlast.txt                 |   2 +-
 doc/rrdlastupdate.1             |   2 +-
 doc/rrdlastupdate.txt           |   2 +-
 doc/rrdresize.1                 |   2 +-
 doc/rrdresize.txt               |   2 +-
 doc/rrdrestore.1                |   2 +-
 doc/rrdrestore.txt              |   2 +-
 doc/rrdthreads.1                |   2 +-
 doc/rrdthreads.txt              |   2 +-
 doc/rrdtool.1                   |   2 +-
 doc/rrdtool.txt                 |   2 +-
 doc/rrdtune.1                   |   2 +-
 doc/rrdtune.txt                 |   2 +-
 doc/rrdtutorial.1               |   2 +-
 doc/rrdtutorial.txt             |   2 +-
 doc/rrdupdate.1                 |   2 +-
 doc/rrdupdate.txt               |   2 +-
 doc/rrdxport.1                  |   2 +-
 doc/rrdxport.txt                |   2 +-
 rrdtool.spec                    | 152 ++++++--
 src/Makefile.am                 |   2 +-
 src/Makefile.in                 |   2 +-
 src/librrd.sym                  |  11 +
 src/pngsize.c                   |   8 +-
 src/rrd.h                       |  67 +++-
 src/rrd_cgi.c                   |   2 +-
 src/rrd_create.c                |  21 +-
 src/rrd_diff.c                  |   4 +-
 src/rrd_dump.c                  |   4 +-
 src/rrd_error.c                 |  19 +-
 src/rrd_fetch.c                 |   4 +-
 src/rrd_first.c                 |   2 +-
 src/rrd_format.c                |   4 +-
 src/rrd_format.h                |  14 +-
 src/rrd_gfx.c                   |   2 +-
 src/rrd_graph.c                 |  24 +-
 src/rrd_graph.h                 |   4 +-
 src/rrd_graph_helper.c          |   2 +-
 src/rrd_hw.c                    |   2 +-
 src/rrd_hw.h                    |   2 +-
 src/rrd_hw_math.c               |   1 +
 src/rrd_hw_update.c             |   1 +
 src/rrd_i18n.h                  |   2 +-
 src/rrd_info.c                  | 133 +++----
 src/rrd_is_thread_safe.h        |   4 +-
 src/rrd_last.c                  |   2 +-
 src/rrd_lastupdate.c            |   2 +-
 src/rrd_not_thread_safe.c       |   4 +-
 src/rrd_open.c                  |  13 +-
 src/rrd_parsetime.c             |  14 +-
 src/rrd_resize.c                |   2 +-
 src/rrd_restore.c               |   4 +-
 src/rrd_rpncalc.c               |   2 +-
 src/rrd_rpncalc.h               |   2 +-
 src/rrd_thread_safe.c           |   4 +-
 src/rrd_thread_safe_nt.c        |   4 +-
 src/rrd_tool.c                  |   4 +-
 src/rrd_tool.h                  |  37 +-
 src/rrd_tune.c                  |   4 +-
 src/rrd_update.c                |  34 +-
 src/rrd_version.c               |   2 +-
 src/rrd_xport.c                 |   2 +-
 src/rrd_xport.h                 |   2 +-
 src/rrdupdate.c                 |   4 +-
 win32/config.h                  |   5 +-
 114 files changed, 1548 insertions(+), 1319 deletions(-)

diff --git a/CHANGES b/CHANGES
index b931de5..059edee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,109 @@
+2008-06-10 23:12  oetiker
+
+	* bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
+	  doc/rrdbuild.pod, doc/rrdcreate.pod, doc/rrdgraph.pod,
+	  doc/rrdgraph_graph.pod, rrdtool.spec, src/pngsize.c, src/rrd.h,
+	  src/rrd_cgi.c, src/rrd_create.c, src/rrd_datalang.c,
+	  src/rrd_diff.c, src/rrd_dump.c, src/rrd_error.c, src/rrd_fetch.c,
+	  src/rrd_first.c, src/rrd_format.c, src/rrd_format.h,
+	  src/rrd_gfx.c, src/rrd_graph.c, src/rrd_graph_helper.c,
+	  src/rrd_hw.c, src/rrd_hw.h, src/rrd_i18n.h, src/rrd_info.c,
+	  src/rrd_is_thread_safe.h, src/rrd_last.c, src/rrd_lastupdate.c,
+	  src/rrd_not_thread_safe.c, src/rrd_open.c, src/rrd_resize.c,
+	  src/rrd_restore.c, src/rrd_rpncalc.c, src/rrd_rpncalc.h,
+	  src/rrd_thread_safe.c, src/rrd_thread_safe_nt.c, src/rrd_tool.c,
+	  src/rrd_tool.h, src/rrd_tune.c, src/rrd_update.c,
+	  src/rrd_version.c, src/rrd_xport.c, src/rrd_xport.h,
+	  src/rrdupdate.c: prepare for the release of rrdtool-1.3.0
+
+2008-06-10 23:11  oetiker
+
+	* trunk/website/bin/htmlfix.sh, trunk/website/gallery/index.en.html,
+	  trunk/website/index.wml: updated website online
+
+2008-06-10 16:41  oetiker
+
+	* branches/1.2/website/index.wml, trunk/website, trunk/website/bin,
+	  trunk/website/download.wml, trunk/website/gallery,
+	  trunk/website/inc, trunk/website/index.wml,
+	  trunk/website/license.wml, trunk/website/logos,
+	  trunk/website/newbanner250x60.gif, trunk/website/rrdtool.dtd,
+	  trunk/website/rrdworld, trunk/website/sponsor.wml,
+	  trunk/website/tut: added website to trunk
+
+2008-06-10 16:38  oetiker
+
+	* trunk/website: using the 1.2 website as a basis for the new 1.3
+	  website
+
+2008-06-10 16:38  oetiker
+
+	* configure.ac: oops it is 1.3.0 not 1.4.0 yet
+
+2008-06-10 16:37  oetiker
+
+	* 00README, CONTRIBUTORS, PROJECTS, TODO, configure.ac,
+	  rrdtool-1.3-release: preparing for 1.3
+
+2008-06-10 16:32  oetiker
+
+	* src/Makefile.am, src/rrd.h, src/rrd_format.h, src/rrd_hw_math.c,
+	  src/rrd_hw_update.c, src/rrd_tool.h: document the 'internal'
+	  functions in rrd.h but mark them as deprecated, so that anyone
+	  using them will see that they should not be doing it.
+
+2008-06-10 11:16  oetiker
+
+	* src/rrd_create.c: flip check for row_count with setting for better
+	  code logic
+
+2008-06-10 09:35  oetiker
+
+	* doc/rrdcreate.pod, src/rrd_create.c: check row count in RRAs to be
+	  > 0 ... by Sebastian Harl
+
+2008-06-10 07:18  oetiker
+
+	* src/rrd_create.c, src/rrd_open.c: for windows we must open files
+	  in O_BINARY mode
+
+2008-06-09 16:10  oetiker
+
+	* src/rrd.h, src/rrd_tool.h: do NOT export lowlevel functions, since
+	  I have no intention supporting these interfaces across versions.
+	  The symbols are in the library, so if someone WANTS to code to
+	  them, they are free todo so, but they will have to use our
+	  internal header files.
+
+2008-06-09 15:49  oetiker
+
+	* src/librrd.sym, src/rrd.h, src/rrd_tool.h: add all lowlevel file
+	  access functions from the rrd_open interface to the export list.
+
+2008-06-09 05:12  oetiker
+
+	* bindings/python/rrdtoolmodule.c, src/pngsize.c, src/rrd.h,
+	  src/rrd_error.c, src/rrd_graph.h, src/rrd_info.c, src/rrd_open.c,
+	  src/rrd_parsetime.c, src/rrd_tool.c, src/rrd_update.c: fixed
+	  indenting
+
+2008-06-09 05:11  oetiker
+
+	* rrdtool.spec: update to rpm spec from Jarod Wilson
+
+2008-06-08 21:15  oetiker
+
+	* src/librrd.sym: export some more symbols from librrd
+
+2008-06-08 21:06  oetiker
+
+	* win32/config.h: windows should use a windows font
+
+2008-06-08 21:05  oetiker
+
+	* src/rrd_graph.c: drop special case windows font code ... it makes
+	  no sense with the new setup
+
 2008-06-08 17:08  oetiker
 
 	* bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3a33ebe..847c1d1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -21,7 +21,7 @@ David Grimes <dgrimes with navisite.com> SQRT/SORT/REV/SHIFT/TREND
 David L. Barker <dave with ncomtech.com> xport function bug fixes
 Evan Miller <emiller with imvu.com> Multiplicative HW Enhancements
 Frank Strauss <strauss with escape.de> TCL bindings
-Florian octo Forster <rrdtool nospam.verplant.org> rrd_restore libxml2 rewrite
+Florian octo Forster <rrdtool nospam.verplant.org> rrd_restore libxml2 rewrite deprecated function export
 Henrik Storner <henrik with hswn.dk> functions for min/max values of data in graph
 Hermann Hueni <hueni with glue.ch> (SunOS porting)
 Jakob Ilves <jilves with se.oracle.com> HPUX 11
diff --git a/TODO b/TODO
index c7a06c9..00ebc24 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 Random Feature Ideas for RRDtool
 --------------------------------
-Updated: 2008-05-26
+Updated: 2008-06-26
+
+add accessor functions for rrd manipulation
 
 reverse order of stacked graph entries prior to plotting ... this is to make
 plotting order more naturally fit with the ordering of the legend ...
diff --git a/bindings/perl-piped/RRDp.pm b/bindings/perl-piped/RRDp.pm
index 18151f3..a99e56e 100644
--- a/bindings/perl-piped/RRDp.pm
+++ b/bindings/perl-piped/RRDp.pm
@@ -120,7 +120,7 @@ sub cmd (@);
 sub end ();
 sub read ();
 
-$VERSION=1.299908060801;
+$VERSION=1.3000;
 
 sub start ($){
   croak "rrdtool is already running"
diff --git a/bindings/perl-shared/RRDs.pm b/bindings/perl-shared/RRDs.pm
index e5b06ad..d151db4 100644
--- a/bindings/perl-shared/RRDs.pm
+++ b/bindings/perl-shared/RRDs.pm
@@ -7,7 +7,7 @@ use vars qw(@ISA $VERSION);
 
 require DynaLoader;
 
-$VERSION=1.299908060801;
+$VERSION=1.3000;
 
 bootstrap RRDs $VERSION;
 
diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c
index 109d66f..1b85f96 100644
--- a/bindings/python/rrdtoolmodule.c
+++ b/bindings/python/rrdtoolmodule.c
@@ -220,7 +220,7 @@ static PyObject *PyRRD_fetch(
 
         for (i = 0; i < ds_cnt; i++)
             rrd_freemem(ds_namv[i]);
-        rrd_freemem(ds_namv);  /* rrdtool don't use PyMem_Malloc :) */
+        rrd_freemem(ds_namv);   /* rrdtool don't use PyMem_Malloc :) */
         rrd_freemem(data);
     }
 
@@ -404,7 +404,7 @@ static PyObject *PyRRD_resize(
 }
 
 static PyObject *PyDict_FromInfo(
-    rrd_info_t *data)
+    rrd_info_t * data)
 {
     PyObject *r;
 
diff --git a/configure b/configure
index 2a40d08..3985c27 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for rrdtool 1.3rc9.
+# Generated by GNU Autoconf 2.61 for rrdtool 1.3.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='rrdtool'
 PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.3rc9'
-PACKAGE_STRING='rrdtool 1.3rc9'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='rrdtool 1.3.0'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix=/usr/local/rrdtool-$PACKAGE_VERSION
@@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rrdtool 1.3rc9 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rrdtool 1.3rc9:";;
+     short | recursive ) echo "Configuration of rrdtool 1.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1721,7 +1721,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rrdtool configure 1.3rc9
+rrdtool configure 1.3.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1735,7 +1735,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rrdtool $as_me 1.3rc9, which was
+It was created by rrdtool $as_me 1.3.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2089,7 +2089,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-NUMVERS=1.299908060801
+NUMVERS=1.3000
 
 
 LIBVERS=4:0:0
@@ -2538,7 +2538,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rrdtool'
- VERSION='1.3rc9'
+ VERSION='1.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -32973,7 +32973,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rrdtool $as_me 1.3rc9, which was
+This file was extended by rrdtool $as_me 1.3.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33026,7 +33026,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-rrdtool config.status 1.3rc9
+rrdtool config.status 1.3.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index d634c05..7a15b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,14 +9,14 @@ dnl tell automake the this script is for rrdtool
 
 dnl the official version number is
 dnl a.b.c
-AC_INIT([rrdtool],[1.3rc9])
+AC_INIT([rrdtool],[1.3.0])
 
 dnl for testing a numberical version number comes handy
 dnl the released version are
 dnl a.bccc
 dnl the devel versions will be something like
 dnl a.b999yymmddhh 
-NUMVERS=1.299908060801
+NUMVERS=1.3000
 AC_SUBST(NUMVERS)
 
 dnl for the linker to understand which version the library is compatible with
diff --git a/doc/bin_dec_hex.1 b/doc/bin_dec_hex.1
index 6db3ffd..dd06561 100644
--- a/doc/bin_dec_hex.1
+++ b/doc/bin_dec_hex.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIN_DEC_HEX 1"
-.TH BIN_DEC_HEX 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH BIN_DEC_HEX 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 bin_dec_hex \- How to use binary, decimal, and hexadecimal notation.
 .SH "DESCRIPTION"
diff --git a/doc/bin_dec_hex.txt b/doc/bin_dec_hex.txt
index 9598444..3fe4075 100644
--- a/doc/bin_dec_hex.txt
+++ b/doc/bin_dec_hex.txt
@@ -371,4 +371,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                    BIN_DEC_HEX(1)
+1.3.0                             2008-03-15                    BIN_DEC_HEX(1)
diff --git a/doc/cdeftutorial.1 b/doc/cdeftutorial.1
index ba1dba8..dd5d9c9 100644
--- a/doc/cdeftutorial.1
+++ b/doc/cdeftutorial.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CDEFTUTORIAL 1"
-.TH CDEFTUTORIAL 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH CDEFTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 cdeftutorial \- Alex van den Bogaerdt's CDEF tutorial
 .SH "DESCRIPTION"
diff --git a/doc/cdeftutorial.txt b/doc/cdeftutorial.txt
index d6b4d54..0b0ec47 100644
--- a/doc/cdeftutorial.txt
+++ b/doc/cdeftutorial.txt
@@ -799,4 +799,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                   CDEFTUTORIAL(1)
+1.3.0                             2008-03-15                   CDEFTUTORIAL(1)
diff --git a/doc/rpntutorial.1 b/doc/rpntutorial.1
index a99e7a7..8cdfbaa 100644
--- a/doc/rpntutorial.1
+++ b/doc/rpntutorial.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RPNTUTORIAL 1"
-.TH RPNTUTORIAL 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RPNTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rpntutorial \- Reading RRDtool RPN Expressions by Steve Rader
 .SH "DESCRIPTION"
diff --git a/doc/rpntutorial.txt b/doc/rpntutorial.txt
index 1650f67..9605c4b 100644
--- a/doc/rpntutorial.txt
+++ b/doc/rpntutorial.txt
@@ -187,4 +187,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                    RPNTUTORIAL(1)
+1.3.0                             2008-03-15                    RPNTUTORIAL(1)
diff --git a/doc/rrd-beginners.1 b/doc/rrd-beginners.1
index 206e6f4..906e235 100644
--- a/doc/rrd-beginners.1
+++ b/doc/rrd-beginners.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRD-BEGINNERS 1"
-.TH RRD-BEGINNERS 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRD-BEGINNERS 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrd\-beginners \- RRDtool Beginners' Guide
 .SH "SYNOPSIS"
diff --git a/doc/rrd-beginners.txt b/doc/rrd-beginners.txt
index fa45d9c..27ae855 100644
--- a/doc/rrd-beginners.txt
+++ b/doc/rrd-beginners.txt
@@ -318,4 +318,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                  RRD-BEGINNERS(1)
+1.3.0                             2008-03-15                  RRD-BEGINNERS(1)
diff --git a/doc/rrdbuild.1 b/doc/rrdbuild.1
index ff82477..1ba620b 100644
--- a/doc/rrdbuild.1
+++ b/doc/rrdbuild.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDBUILD 1"
-.TH RRDBUILD 1 "2008-06-08" "1.3rc9" "rrdtool"
+.TH RRDBUILD 1 "2008-06-11" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdbuild \- Instructions for building RRDtool
 .SH "OVERVIEW"
@@ -163,7 +163,7 @@ Once you have decided. Save the two locations into environment variables.
 .PP
 .Vb 2
 \& BUILD_DIR=/tmp/rrdbuild
-\& INSTALL_DIR=/usr/local/rrdtool\-1.3rc9
+\& INSTALL_DIR=/usr/local/rrdtool\-1.3.0
 .Ve
 .PP
 If your \fI/tmp\fR is mounted with the option noexec (\s-1RHEL\s0 seems todo that) you have to choose
@@ -180,9 +180,9 @@ Lets first assume you already have all the necessary libraries
 pre\-installed. 
 .PP
 .Vb 4
-\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3rc9.tar.gz
-\& gunzip \-c rrdtool\-1.3rc9.tar.gz | tar xf \-
-\& cd rrdtool\-1.3rc9
+\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3.0.tar.gz
+\& gunzip \-c rrdtool\-1.3.0.tar.gz | tar xf \-
+\& cd rrdtool\-1.3.0
 \& ./configure \-\-prefix=$INSTALL_DIR && make && make install
 .Ve
 .PP
@@ -485,7 +485,7 @@ tcl setups that would prevent rrdtool from building if they are included in
 their current state.
 .PP
 .Vb 5
-\& cd $BUILD_DIR/rrdtool\-1.3rc9
+\& cd $BUILD_DIR/rrdtool\-1.3.0
 \& ./configure \-\-prefix=$INSTALL_DIR \-\-disable\-tcl \-\-disable\-python
 \& $MAKE clean
 \& $MAKE
diff --git a/doc/rrdbuild.html b/doc/rrdbuild.html
index bd24888..01a9efc 100644
--- a/doc/rrdbuild.html
+++ b/doc/rrdbuild.html
@@ -79,7 +79,7 @@ tar</strong> and <strong>GNU make</strong> respectively. It could be that they a
 <p>Once you have decided. Save the two locations into environment variables.</p>
 <pre>
  BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3rc9</pre>
+ INSTALL_DIR=/usr/local/rrdtool-1.3.0</pre>
 <p>If your <em>/tmp</em> is mounted with the option noexec (RHEL seems todo that) you have to choose
 a different directory!</p>
 <p>Now make sure the BUILD_DIR exists and go there:</p>
@@ -89,9 +89,9 @@ a different directory!</p>
 <p>Lets first assume you already have all the necessary libraries
 pre-installed.</p>
 <pre>
- wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc9.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc9.tar.gz</a>
- gunzip -c rrdtool-1.3rc9.tar.gz | tar xf -
- cd rrdtool-1.3rc9
+ wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz</a>
+ gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
+ cd rrdtool-1.3.0
  ./configure --prefix=$INSTALL_DIR &amp;&amp; make &amp;&amp; make install</pre>
 <p>Ok, this was very optimistic. This try will probably have ended with
 <strong>configure</strong> complaining about several missing libraries.</p>
@@ -376,7 +376,7 @@ because it seems that a fair number of people have ill configured python and
 tcl setups that would prevent rrdtool from building if they are included in
 their current state.</p>
 <pre>
- cd $BUILD_DIR/rrdtool-1.3rc9
+ cd $BUILD_DIR/rrdtool-1.3.0
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE
diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index d244137..1a281e5 100644
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
@@ -41,7 +41,7 @@ Where you want to install the software.
 Once you have decided. Save the two locations into environment variables.
 
  BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3rc9
+ INSTALL_DIR=/usr/local/rrdtool-1.3.0
 
 
 If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
@@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there:
 Lets first assume you already have all the necessary libraries
 pre-installed. 
 
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc9.tar.gz
- gunzip -c rrdtool-1.3rc9.tar.gz | tar xf -
- cd rrdtool-1.3rc9
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz
+ gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
+ cd rrdtool-1.3.0
  ./configure --prefix=$INSTALL_DIR && make && make install
 
 Ok, this was very optimistic. This try will probably have ended with
@@ -336,7 +336,7 @@ because it seems that a fair number of people have ill configured python and
 tcl setups that would prevent rrdtool from building if they are included in
 their current state.
 
- cd $BUILD_DIR/rrdtool-1.3rc9
+ cd $BUILD_DIR/rrdtool-1.3.0
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE
diff --git a/doc/rrdbuild.txt b/doc/rrdbuild.txt
index f3f0846..b16b571 100644
--- a/doc/rrdbuild.txt
+++ b/doc/rrdbuild.txt
@@ -35,7 +35,7 @@ OOPPTTIIMMIISSTTIICC BBUUIILLDD
        ables.
 
         BUILD_DIR=/tmp/rrdbuild
-        INSTALL_DIR=/usr/local/rrdtool-1.3rc9
+        INSTALL_DIR=/usr/local/rrdtool-1.3.0
 
        If your _/_t_m_p is mounted with the option noexec (RHEL seems todo that)
        you have to choose a different directory!
@@ -48,9 +48,9 @@ OOPPTTIIMMIISSTTIICC BBUUIILLDD
        Lets first assume you already have all the necessary libraries
        pre-installed.
 
-        wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc9.tar.gz
-        gunzip -c rrdtool-1.3rc9.tar.gz | tar xf -
-        cd rrdtool-1.3rc9
+        wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz
+        gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
+        cd rrdtool-1.3.0
         ./configure --prefix=$INSTALL_DIR && make && make install
 
        Ok, this was very optimistic. This try will probably have ended with
@@ -304,7 +304,7 @@ BBUUIILLDDIINNGG DDEEPPEENNDDEENNCCIIEESS
        python and tcl setups that would prevent rrdtool from building if they
        are included in their current state.
 
-        cd $BUILD_DIR/rrdtool-1.3rc9
+        cd $BUILD_DIR/rrdtool-1.3.0
         ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
         $MAKE clean
         $MAKE
@@ -323,4 +323,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-06-08                       RRDBUILD(1)
+1.3.0                             2008-06-11                       RRDBUILD(1)
diff --git a/doc/rrdcgi.1 b/doc/rrdcgi.1
index 6c63592..5607901 100644
--- a/doc/rrdcgi.1
+++ b/doc/rrdcgi.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDCGI 1"
-.TH RRDCGI 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDCGI 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdcgi \- Create web pages containing RRD graphs based on templates
 .SH "SYNOPSIS"
diff --git a/doc/rrdcgi.txt b/doc/rrdcgi.txt
index 39bd614..7325ba8 100644
--- a/doc/rrdcgi.txt
+++ b/doc/rrdcgi.txt
@@ -204,4 +204,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                         RRDCGI(1)
+1.3.0                             2008-03-15                         RRDCGI(1)
diff --git a/doc/rrdcreate.1 b/doc/rrdcreate.1
index 53fc8d9..8809ca0 100644
--- a/doc/rrdcreate.1
+++ b/doc/rrdcreate.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDCREATE 1"
-.TH RRDCREATE 1 "2008-05-12" "1.3rc9" "rrdtool"
+.TH RRDCREATE 1 "2008-06-11" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdcreate \- Set up a new Round Robin Database
 .SH "SYNOPSIS"
@@ -144,48 +144,47 @@ rrdcreate \- Set up a new Round Robin Database
 The create function of RRDtool lets you set up new Round Robin
 Database (\fB\s-1RRD\s0\fR) files.  The file is created at its final, full size
 and filled with \fI*UNKNOWN*\fR data.
-.IP "\fIfilename\fR" 8
-.IX Item "filename"
+.Sh "\fIfilename\fP"
+.IX Subsection "filename"
 The name of the \fB\s-1RRD\s0\fR you want to create. \fB\s-1RRD\s0\fR files should end
 with the extension \fI.rrd\fR. However, \fBRRDtool\fR will accept any
 filename.
-.IP "\fB\-\-start\fR|\fB\-b\fR \fIstart time\fR (default: now \- 10s)" 8
-.IX Item "--start|-b start time (default: now - 10s)"
+.Sh "\fB\-\-start\fP|\fB\-b\fP \fIstart time\fP (default: now \- 10s)"
+.IX Subsection "--start|-b start time (default: now - 10s)"
 Specifies the time in seconds since 1970\-01\-01 \s-1UTC\s0 when the first
 value should be added to the \fB\s-1RRD\s0\fR. \fBRRDtool\fR will not accept
 any data timed before or at the time specified.
-.Sp
+.PP
 See also AT-STYLE \s-1TIME\s0 \s-1SPECIFICATION\s0 section in the
 \&\fIrrdfetch\fR documentation for other ways to specify time.
-.IP "\fB\-\-step\fR|\fB\-s\fR \fIstep\fR (default: 300 seconds)" 8
-.IX Item "--step|-s step (default: 300 seconds)"
+.Sh "\fB\-\-step\fP|\fB\-s\fP \fIstep\fP (default: 300 seconds)"
+.IX Subsection "--step|-s step (default: 300 seconds)"
 Specifies the base interval in seconds with which data will be fed
 into the \fB\s-1RRD\s0\fR.
-.IP "\fB\s-1DS:\s0\fR\fIds-name\fR\fB:\fR\fI\s-1DST\s0\fR\fB:\fR\fIdst arguments\fR" 8
-.IX Item "DS:ds-name:DST:dst arguments"
+.Sh "\fB\s-1DS:\s0\fP\fIds-name\fP\fB:\fP\fI\s-1DST\s0\fP\fB:\fP\fIdst arguments\fP"
+.IX Subsection "DS:ds-name:DST:dst arguments"
 A single \fB\s-1RRD\s0\fR can accept input from several data sources (\fB\s-1DS\s0\fR),
 for example incoming and outgoing traffic on a specific communication
 line. With the \fB\s-1DS\s0\fR configuration option you must define some basic
 properties of each data source you want to store in the \fB\s-1RRD\s0\fR.
-.Sp
+.PP
 \&\fIds-name\fR is the name you will use to reference this particular data
 source from an \fB\s-1RRD\s0\fR. A \fIds-name\fR must be 1 to 19 characters long in
 the characters [a\-zA\-Z0\-9_].
-.Sp
+.PP
 \&\fI\s-1DST\s0\fR defines the Data Source Type. The remaining arguments of a
 data source entry depend on the data source type. For \s-1GAUGE\s0, \s-1COUNTER\s0,
 \&\s-1DERIVE\s0, and \s-1ABSOLUTE\s0 the format for a data source entry is:
-.Sp
+.PP
 \&\fB\s-1DS:\s0\fR\fIds-name\fR\fB:\fR\fI\s-1GAUGE\s0 | \s-1COUNTER\s0 | \s-1DERIVE\s0 | \s-1ABSOLUTE\s0\fR\fB:\fR\fIheartbeat\fR\fB:\fR\fImin\fR\fB:\fR\fImax\fR
-.Sp
+.PP
 For \s-1COMPUTE\s0 data sources, the format is:
-.Sp
+.PP
 \&\fB\s-1DS:\s0\fR\fIds-name\fR\fB:\fR\fI\s-1COMPUTE\s0\fR\fB:\fR\fIrpn-expression\fR
-.Sp
+.PP
 In order to decide which data source type to use, review the
 definitions that follow. Also consult the section on \*(L"\s-1HOW\s0 \s-1TO\s0 \s-1MEASURE\s0\*(R"
 for further insight.
-.RS 8
 .IP "\fB\s-1GAUGE\s0\fR" 4
 .IX Item "GAUGE"
 is for things like temperatures or number of people in a room or the
@@ -207,9 +206,9 @@ example, to measure the rate of people entering or leaving a
 room. Internally, derive works exactly like \s-1COUNTER\s0 but without
 overflow checks. So if your counter does not reset at 32 or 64 bit you
 might want to use \s-1DERIVE\s0 and combine it with a \s-1MIN\s0 value of 0.
-.RS 4
-.IP "\s-1NOTE\s0 on \s-1COUNTER\s0 vs \s-1DERIVE\s0" 4
-.IX Item "NOTE on COUNTER vs DERIVE"
+.Sp
+\&\fB\s-1NOTE\s0 on \s-1COUNTER\s0 vs \s-1DERIVE\s0\fR
+.Sp
 by Don Baarda <don.baarda@baesystems.com>
 .Sp
 If you cannot tolerate ever mistaking the occasional counter reset for a
@@ -226,9 +225,6 @@ for high bandwidth interfaces and a 32bit counter, \s-1DERIVE\s0 with min=0 is
 probably preferable. If you are using a 64bit counter, just about any max
 setting will eliminate the possibility of mistaking a reset for a counter
 wrap.
-.RE
-.RS 4
-.RE
 .IP "\fB\s-1ABSOLUTE\s0\fR" 4
 .IX Item "ABSOLUTE"
 is for counters which get reset upon reading. This is used for fast counters
@@ -246,24 +242,22 @@ formula. Consolidation functions are then applied normally to the PDPs
 of the \s-1COMPUTE\s0 data source (that is the rpn-expression is only applied
 to generate PDPs). In database software, such data sets are referred
 to as \*(L"virtual\*(R" or \*(L"computed\*(R" columns.
-.RE
-.RS 8
-.Sp
+.PP
 \&\fIheartbeat\fR defines the maximum number of seconds that may pass
 between two updates of this data source before the value of the
 data source is assumed to be \fI*UNKNOWN*\fR.
-.Sp
+.PP
 \&\fImin\fR and \fImax\fR define the expected range values for data supplied by a
 data source. If \fImin\fR and/or \fImax\fR any value outside the defined range
 will be regarded as \fI*UNKNOWN*\fR. If you do not know or care about min and
 max, set them to U for unknown. Note that min and max always refer to the
 processed values of the \s-1DS\s0. For a traffic\-\fB\s-1COUNTER\s0\fR type \s-1DS\s0 this would be
 the maximum and minimum data-rate expected from the device.
-.Sp
+.PP
 \&\fIIf information on minimal/maximal expected values is available,
 always set the min and/or max properties. This will help RRDtool in
 doing a simple sanity check on the data supplied when running update.\fR
-.Sp
+.PP
 \&\fIrpn-expression\fR defines the formula used to compute the PDPs of a
 \&\s-1COMPUTE\s0 data source from other data sources in the same <\s-1RRD\s0>. It is
 similar to defining a \fB\s-1CDEF\s0\fR argument for the graph command. Please
@@ -274,22 +268,20 @@ the \s-1RPN\s0 expression, the \s-1COMPUTE\s0 data source may only refer to the
 names of data source listed previously in the create command. This is
 similar to the restriction that \fB\s-1CDEF\s0\fRs must refer only to \fB\s-1DEF\s0\fRs
 and \fB\s-1CDEF\s0\fRs previously defined in the same graph command.
-.RE
-.IP "\fB\s-1RRA:\s0\fR\fI\s-1CF\s0\fR\fB:\fR\fIcf arguments\fR" 8
-.IX Item "RRA:CF:cf arguments"
+.Sh "\fB\s-1RRA:\s0\fP\fI\s-1CF\s0\fP\fB:\fP\fIcf arguments\fP"
+.IX Subsection "RRA:CF:cf arguments"
 The purpose of an \fB\s-1RRD\s0\fR is to store data in the round robin archives
 (\fB\s-1RRA\s0\fR). An archive consists of a number of data values or statistics for
 each of the defined data-sources (\fB\s-1DS\s0\fR) and is defined with an \fB\s-1RRA\s0\fR line.
-.Sp
+.PP
 When data is entered into an \fB\s-1RRD\s0\fR, it is first fit into time slots
 of the length defined with the \fB\-s\fR option, thus becoming a \fIprimary
 data point\fR.
-.Sp
+.PP
 The data is also processed with the consolidation function (\fI\s-1CF\s0\fR) of
 the archive. There are several consolidation functions that
 consolidate primary data points via an aggregate function: \fB\s-1AVERAGE\s0\fR,
 \&\fB\s-1MIN\s0\fR, \fB\s-1MAX\s0\fR, \fB\s-1LAST\s0\fR. 
-.RS 8
 .IP "\s-1AVERAGE\s0" 4
 .IX Item "AVERAGE"
 the average of the data points is stored.
@@ -302,29 +294,27 @@ the largest of the data points is stored.
 .IP "\s-1LAST\s0" 4
 .IX Item "LAST"
 the last data points is used.
-.RE
-.RS 8
-.Sp
+.PP
 Note that data aggregation inevitably leads to loss of precision and
 information. The trick is to pick the aggregate function such that the
 \&\fIinteresting\fR properties of your data is kept across the aggregation
 process.
-.Sp
+.PP
 The format of \fB\s-1RRA\s0\fR line for these
 consolidation functions is:
-.Sp
+.PP
 \&\fB\s-1RRA:\s0\fR\fI\s-1AVERAGE\s0 | \s-1MIN\s0 | \s-1MAX\s0 | \s-1LAST\s0\fR\fB:\fR\fIxff\fR\fB:\fR\fIsteps\fR\fB:\fR\fIrows\fR
-.Sp
+.PP
 \&\fIxff\fR The xfiles factor defines what part of a consolidation interval may
 be made up from \fI*UNKNOWN*\fR data while the consolidated value is still
 regarded as known. It is given as the ratio of allowed \fI*UNKNOWN*\fR PDPs
 to the number of PDPs in the interval. Thus, it ranges from 0 to 1 (exclusive).
-.Sp
+.PP
 \&\fIsteps\fR defines how many of these \fIprimary data points\fR are used to build
 a \fIconsolidated data point\fR which then goes into the archive.
-.Sp
+.PP
 \&\fIrows\fR defines how many generations of data values are kept in an \fB\s-1RRA\s0\fR.
-.RE
+Obviously, this has to be greater than zero.
 .SH "Aberrant Behavior Detection with Holt-Winters Forecasting"
 .IX Header "Aberrant Behavior Detection with Holt-Winters Forecasting"
 In addition to the aggregate functions, there are a set of specialized
diff --git a/doc/rrdcreate.html b/doc/rrdcreate.html
index 52b82c1..97172f6 100644
--- a/doc/rrdcreate.html
+++ b/doc/rrdcreate.html
@@ -18,6 +18,15 @@
 	<li><a href="#name">NAME</a></li>
 	<li><a href="#synopsis">SYNOPSIS</a></li>
 	<li><a href="#description">DESCRIPTION</a></li>
+	<ul>
+
+		<li><a href="#filename"><em>filename</em></a></li>
+		<li><a href="#start_b_start_time__default__now__10s_"><strong>-start</strong>|<strong>-b</strong> <em>start time</em> (default: now - 10s)</a></li>
+		<li><a href="#step_s_step__default__300_seconds_"><strong>-step</strong>|<strong>-s</strong> <em>step</em> (default: 300 seconds)</a></li>
+		<li><a href="#ds_dsname_dst_dst_arguments"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>dst arguments</em></a></li>
+		<li><a href="#rra_cf_cf_arguments"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>cf arguments</em></a></li>
+	</ul>
+
 	<li><a href="#aberrant_behavior_detection_with_holtwinters_forecasting">Aberrant Behavior Detection with Holt-Winters Forecasting</a></li>
 	<li><a href="#the_heartbeat_and_the_step">The HEARTBEAT and the STEP</a></li>
 	<li><a href="#how_to_measure">HOW TO MEASURE</a></li>
@@ -49,32 +58,28 @@
 <p>The create function of RRDtool lets you set up new Round Robin
 Database (<strong>RRD</strong>) files.  The file is created at its final, full size
 and filled with <em>*UNKNOWN*</em> data.</p>
-<dl>
-<dt><strong><a name="item_filename"><em>filename</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="filename"><em>filename</em></a></h2>
 <p>The name of the <strong>RRD</strong> you want to create. <strong>RRD</strong> files should end
 with the extension <em>.rrd</em>. However, <strong>RRDtool</strong> will accept any
 filename.</p>
-</dd>
-<dt><strong><a name="item_time"><strong>--start</strong>|<strong>-b</strong> <em>start time</em> (default: now - 10s)</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="start_b_start_time__default__now__10s_"><strong>--start</strong>|<strong>-b</strong> <em>start time</em> (default: now - 10s)</a></h2>
 <p>Specifies the time in seconds since 1970-01-01 UTC when the first
 value should be added to the <strong>RRD</strong>. <strong>RRDtool</strong> will not accept
 any data timed before or at the time specified.</p>
 <p>See also AT-STYLE TIME SPECIFICATION section in the
 <em>rrdfetch</em> documentation for other ways to specify time.</p>
-</dd>
-<dt><strong><a name="item_step"><strong>--step</strong>|<strong>-s</strong> <em>step</em> (default: 300 seconds)</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="step_s_step__default__300_seconds_"><strong>--step</strong>|<strong>-s</strong> <em>step</em> (default: 300 seconds)</a></h2>
 <p>Specifies the base interval in seconds with which data will be fed
 into the <strong>RRD</strong>.</p>
-</dd>
-<dt><strong><a name="item_ds_3ads_2dname_3adst_3adst_arguments"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>dst arguments</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="ds_dsname_dst_dst_arguments"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>dst arguments</em></a></h2>
 <p>A single <strong>RRD</strong> can accept input from several data sources (<strong>DS</strong>),
 for example incoming and outgoing traffic on a specific communication
 line. With the <strong>DS</strong> configuration option you must define some basic
@@ -118,10 +123,7 @@ example, to measure the rate of people entering or leaving a
 room. Internally, derive works exactly like COUNTER but without
 overflow checks. So if your counter does not reset at 32 or 64 bit you
 might want to use DERIVE and combine it with a MIN value of 0.</p>
-<dl>
-<dt><strong><a name="item_note_on_counter_vs_derive">NOTE on COUNTER vs DERIVE</a></strong></dt>
-
-<dd>
+<p><strong>NOTE on COUNTER vs DERIVE</strong></p>
 <p>by Don Baarda &lt;<a href="mailto:don.baarda@baesystems.com">don.baarda@baesystems.com</a>&gt;</p>
 <p>If you cannot tolerate ever mistaking the occasional counter reset for a
 legitimate counter wrap, and would prefer ``Unknowns'' for all legitimate
@@ -137,8 +139,6 @@ probably preferable. If you are using a 64bit counter, just about any max
 setting will eliminate the possibility of mistaking a reset for a counter
 wrap.</p>
 </dd>
-</dl>
-</dd>
 <dt><strong><a name="item_absolute"><strong>ABSOLUTE</strong></a></strong></dt>
 
 <dd>
@@ -183,10 +183,9 @@ the RPN expression, the COMPUTE data source may only refer to the
 names of data source listed previously in the create command. This is
 similar to the restriction that <strong>CDEF</strong>s must refer only to <strong>DEF</strong>s
 and <strong>CDEF</strong>s previously defined in the same graph command.</p>
-</dd>
-<dt><strong><a name="item_rra_3acf_3acf_arguments"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>cf arguments</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="rra_cf_cf_arguments"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>cf arguments</em></a></h2>
 <p>The purpose of an <strong>RRD</strong> is to store data in the round robin archives
 (<strong>RRA</strong>). An archive consists of a number of data values or statistics for
 each of the defined data-sources (<strong>DS</strong>) and is defined with an <strong>RRA</strong> line.</p>
@@ -232,9 +231,8 @@ regarded as known. It is given as the ratio of allowed <em>*UNKNOWN*</em> PDPs
 to the number of PDPs in the interval. Thus, it ranges from 0 to 1 (exclusive).</p>
 <p><em>steps</em> defines how many of these <em>primary data points</em> are used to build
 a <em>consolidated data point</em> which then goes into the archive.</p>
-<p><em>rows</em> defines how many generations of data values are kept in an <strong>RRA</strong>.</p>
-</dd>
-</dl>
+<p><em>rows</em> defines how many generations of data values are kept in an <strong>RRA</strong>.
+Obviously, this has to be greater than zero.</p>
 <p>
 </p>
 <hr />
diff --git a/doc/rrdcreate.pod b/doc/rrdcreate.pod
index 86817bd..abb42fc 100644
--- a/doc/rrdcreate.pod
+++ b/doc/rrdcreate.pod
@@ -16,15 +16,13 @@ The create function of RRDtool lets you set up new Round Robin
 Database (B<RRD>) files.  The file is created at its final, full size
 and filled with I<*UNKNOWN*> data.
 
-=over 8
-
-=item I<filename>
+=head2 I<filename>
 
 The name of the B<RRD> you want to create. B<RRD> files should end
 with the extension F<.rrd>. However, B<RRDtool> will accept any
 filename.
 
-=item B<--start>|B<-b> I<start time> (default: now - 10s)
+=head2 B<--start>|B<-b> I<start time> (default: now - 10s)
 
 Specifies the time in seconds since 1970-01-01 UTC when the first
 value should be added to the B<RRD>. B<RRDtool> will not accept
@@ -33,12 +31,12 @@ any data timed before or at the time specified.
 See also AT-STYLE TIME SPECIFICATION section in the
 I<rrdfetch> documentation for other ways to specify time.
 
-=item B<--step>|B<-s> I<step> (default: 300 seconds)
+=head2 B<--step>|B<-s> I<step> (default: 300 seconds)
 
 Specifies the base interval in seconds with which data will be fed
 into the B<RRD>.
 
-=item B<DS:>I<ds-name>B<:>I<DST>B<:>I<dst arguments>
+=head2 B<DS:>I<ds-name>B<:>I<DST>B<:>I<dst arguments>
 
 A single B<RRD> can accept input from several data sources (B<DS>),
 for example incoming and outgoing traffic on a specific communication
@@ -63,7 +61,7 @@ In order to decide which data source type to use, review the
 definitions that follow. Also consult the section on "HOW TO MEASURE"
 for further insight.
 
-=over 4
+=over
 
 =item B<GAUGE>
 
@@ -89,9 +87,7 @@ room. Internally, derive works exactly like COUNTER but without
 overflow checks. So if your counter does not reset at 32 or 64 bit you
 might want to use DERIVE and combine it with a MIN value of 0.
 
-=over
-
-=item NOTE on COUNTER vs DERIVE
+B<NOTE on COUNTER vs DERIVE>
 
 by Don Baarda E<lt>don.baarda@baesystems.comE<gt>
 
@@ -110,8 +106,6 @@ probably preferable. If you are using a 64bit counter, just about any max
 setting will eliminate the possibility of mistaking a reset for a counter
 wrap.
 
-=back
-
 =item B<ABSOLUTE>
 
 is for counters which get reset upon reading. This is used for fast counters
@@ -159,8 +153,7 @@ names of data source listed previously in the create command. This is
 similar to the restriction that B<CDEF>s must refer only to B<DEF>s
 and B<CDEF>s previously defined in the same graph command.
 
-=item B<RRA:>I<CF>B<:>I<cf arguments>
-
+=head2 B<RRA:>I<CF>B<:>I<cf arguments>
 
 The purpose of an B<RRD> is to store data in the round robin archives
 (B<RRA>). An archive consists of a number of data values or statistics for
@@ -216,8 +209,7 @@ I<steps> defines how many of these I<primary data points> are used to build
 a I<consolidated data point> which then goes into the archive.
 
 I<rows> defines how many generations of data values are kept in an B<RRA>.
-
-=back
+Obviously, this has to be greater than zero.
 
 =head1 Aberrant Behavior Detection with Holt-Winters Forecasting
 
diff --git a/doc/rrdcreate.txt b/doc/rrdcreate.txt
index 1e361a8..22a83a6 100644
--- a/doc/rrdcreate.txt
+++ b/doc/rrdcreate.txt
@@ -15,188 +15,177 @@ DDEESSCCRRIIPPTTIIOONN
        with _*_U_N_K_N_O_W_N_* data.
 
        _f_i_l_e_n_a_m_e
-               The name of the RRRRDD you want to create. RRRRDD files should end
-               with the extension _._r_r_d. However, RRRRDDttooooll will accept any file-
-               name.
 
-       ----ssttaarrtt|--bb _s_t_a_r_t _t_i_m_e (default: now - 10s)
-               Specifies the time in seconds since 1970-01-01 UTC when the
-               first value should be added to the RRRRDD. RRRRDDttooooll will not accept
-               any data timed before or at the time specified.
+       The name of the RRRRDD you want to create. RRRRDD files should end with the
+       extension _._r_r_d. However, RRRRDDttooooll will accept any filename.
 
-               See also AT-STYLE TIME SPECIFICATION section in the _r_r_d_f_e_t_c_h
-               documentation for other ways to specify time.
+       ----ssttaarrtt||--bb _s_t_a_r_t _t_i_m_e ((ddeeffaauulltt:: nnooww -- 1100ss))
 
-       ----sstteepp|--ss _s_t_e_p (default: 300 seconds)
-               Specifies the base interval in seconds with which data will be
-               fed into the RRRRDD.
+       Specifies the time in seconds since 1970-01-01 UTC when the first value
+       should be added to the RRRRDD. RRRRDDttooooll will not accept any data timed
+       before or at the time specified.
+
+       See also AT-STYLE TIME SPECIFICATION section in the _r_r_d_f_e_t_c_h documenta-
+       tion for other ways to specify time.
+
+       ----sstteepp||--ss _s_t_e_p ((ddeeffaauulltt:: 330000 sseeccoonnddss))
+
+       Specifies the base interval in seconds with which data will be fed into
+       the RRRRDD.
 
        DDSS::_d_s_-_n_a_m_e::_D_S_T::_d_s_t _a_r_g_u_m_e_n_t_s
-               A single RRRRDD can accept input from several data sources (DDSS),
-               for example incoming and outgoing traffic on a specific commu-
-               nication line. With the DDSS configuration option you must define
-               some basic properties of each data source you want to store in
-               the RRRRDD.
-
-               _d_s_-_n_a_m_e is the name you will use to reference this particular
-               data source from an RRRRDD. A _d_s_-_n_a_m_e must be 1 to 19 characters
-               long in the characters [a-zA-Z0-9_].
-
-               _D_S_T defines the Data Source Type. The remaining arguments of a
-               data source entry depend on the data source type. For GAUGE,
-               COUNTER, DERIVE, and ABSOLUTE the format for a data source
-               entry is:
-
-               DDSS::_d_s_-_n_a_m_e::_G_A_U_G_E _| _C_O_U_N_T_E_R _| _D_E_R_I_V_E _| _A_B_S_O_L_U_T_E::_h_e_a_r_t_-
-               _b_e_a_t::_m_i_n::_m_a_x
-
-               For COMPUTE data sources, the format is:
-
-               DDSS::_d_s_-_n_a_m_e::_C_O_M_P_U_T_E::_r_p_n_-_e_x_p_r_e_s_s_i_o_n
-
-               In order to decide which data source type to use, review the
-               definitions that follow. Also consult the section on "HOW TO
-               MEASURE" for further insight.
-
-               GGAAUUGGEE
-                   is for things like temperatures or number of people in a
-                   room or the value of a RedHat share.
-
-               CCOOUUNNTTEERR
-                   is for continuous incrementing counters like the ifInOctets
-                   counter in a router. The CCOOUUNNTTEERR data source assumes that
-                   the counter never decreases, except when a counter over-
-                   flows.  The update function takes the overflow into
-                   account.  The counter is stored as a per-second rate. When
-                   the counter overflows, RRDtool checks if the overflow hap-
-                   pened at the 32bit or 64bit border and acts accordingly by
-                   adding an appropriate value to the result.
-
-               DDEERRIIVVEE
-                   will store the derivative of the line going from the last
-                   to the current value of the data source. This can be useful
-                   for gauges, for example, to measure the rate of people
-                   entering or leaving a room. Internally, derive works
-                   exactly like COUNTER but without overflow checks. So if
-                   your counter does not reset at 32 or 64 bit you might want
-                   to use DERIVE and combine it with a MIN value of 0.
-
-                   NOTE on COUNTER vs DERIVE
-                       by Don Baarda <don.baarda@baesystems.com>
-
-                       If you cannot tolerate ever mistaking the occasional
-                       counter reset for a legitimate counter wrap, and would
-                       prefer "Unknowns" for all legitimate counter wraps and
-                       resets, always use DERIVE with min=0. Otherwise, using
-                       COUNTER with a suitable max will return correct values
-                       for all legitimate counter wraps, mark some counter
-                       resets as "Unknown", but can mistake some counter
-                       resets for a legitimate counter wrap.
-
-                       For a 5 minute step and 32-bit counter, the probability
-                       of mistaking a counter reset for a legitimate wrap is
-                       arguably about 0.8% per 1Mbps of maximum bandwidth.
-                       Note that this equates to 80% for 100Mbps interfaces,
-                       so for high bandwidth interfaces and a 32bit counter,
-                       DERIVE with min=0 is probably preferable. If you are
-                       using a 64bit counter, just about any max setting will
-                       eliminate the possibility of mistaking a reset for a
-                       counter wrap.
-
-               AABBSSOOLLUUTTEE
-                   is for counters which get reset upon reading. This is used
-                   for fast counters which tend to overflow. So instead of
-                   reading them normally you reset them after every read to
-                   make sure you have a maximum time available before the next
-                   overflow. Another usage is for things you count like number
-                   of messages since the last update.
-
-               CCOOMMPPUUTTEE
-                   is for storing the result of a formula applied to other
-                   data sources in the RRRRDD. This data source is not supplied a
-                   value on update, but rather its Primary Data Points (PDPs)
-                   are computed from the PDPs of the data sources according to
-                   the rpn-expression that defines the formula. Consolidation
-                   functions are then applied normally to the PDPs of the COM-
-                   PUTE data source (that is the rpn-expression is only
-                   applied to generate PDPs). In database software, such data
-                   sets are referred to as "virtual" or "computed" columns.
-
-               _h_e_a_r_t_b_e_a_t defines the maximum number of seconds that may pass
-               between two updates of this data source before the value of the
-               data source is assumed to be _*_U_N_K_N_O_W_N_*.
-
-               _m_i_n and _m_a_x define the expected range values for data supplied
-               by a data source. If _m_i_n and/or _m_a_x any value outside the
-               defined range will be regarded as _*_U_N_K_N_O_W_N_*. If you do not know
-               or care about min and max, set them to U for unknown. Note that
-               min and max always refer to the processed values of the DS. For
-               a traffic-CCOOUUNNTTEERR type DS this would be the maximum and minimum
-               data-rate expected from the device.
-
-               _I_f _i_n_f_o_r_m_a_t_i_o_n _o_n _m_i_n_i_m_a_l_/_m_a_x_i_m_a_l _e_x_p_e_c_t_e_d _v_a_l_u_e_s _i_s _a_v_a_i_l_a_b_l_e_,
-               _a_l_w_a_y_s _s_e_t _t_h_e _m_i_n _a_n_d_/_o_r _m_a_x _p_r_o_p_e_r_t_i_e_s_. _T_h_i_s _w_i_l_l _h_e_l_p _R_R_D_-
-               _t_o_o_l _i_n _d_o_i_n_g _a _s_i_m_p_l_e _s_a_n_i_t_y _c_h_e_c_k _o_n _t_h_e _d_a_t_a _s_u_p_p_l_i_e_d _w_h_e_n
-               _r_u_n_n_i_n_g _u_p_d_a_t_e_.
-
-               _r_p_n_-_e_x_p_r_e_s_s_i_o_n defines the formula used to compute the PDPs of
-               a COMPUTE data source from other data sources in the same
-               <RRD>. It is similar to defining a CCDDEEFF argument for the graph
-               command. Please refer to that manual page for a list and
-               description of RPN operations supported. For COMPUTE data
-               sources, the following RPN operations are not supported: COUNT,
-               PREV, TIME, and LTIME. In addition, in defining the RPN expres-
-               sion, the COMPUTE data source may only refer to the names of
-               data source listed previously in the create command. This is
-               similar to the restriction that CCDDEEFFs must refer only to DDEEFFs
-               and CCDDEEFFs previously defined in the same graph command.
+
+       A single RRRRDD can accept input from several data sources (DDSS), for exam-
+       ple incoming and outgoing traffic on a specific communication line.
+       With the DDSS configuration option you must define some basic properties
+       of each data source you want to store in the RRRRDD.
+
+       _d_s_-_n_a_m_e is the name you will use to reference this particular data
+       source from an RRRRDD. A _d_s_-_n_a_m_e must be 1 to 19 characters long in the
+       characters [a-zA-Z0-9_].
+
+       _D_S_T defines the Data Source Type. The remaining arguments of a data
+       source entry depend on the data source type. For GAUGE, COUNTER,
+       DERIVE, and ABSOLUTE the format for a data source entry is:
+
+       DDSS::_d_s_-_n_a_m_e::_G_A_U_G_E _| _C_O_U_N_T_E_R _| _D_E_R_I_V_E _| _A_B_S_O_L_U_T_E::_h_e_a_r_t_b_e_a_t::_m_i_n::_m_a_x
+
+       For COMPUTE data sources, the format is:
+
+       DDSS::_d_s_-_n_a_m_e::_C_O_M_P_U_T_E::_r_p_n_-_e_x_p_r_e_s_s_i_o_n
+
+       In order to decide which data source type to use, review the defini-
+       tions that follow. Also consult the section on "HOW TO MEASURE" for
+       further insight.
+
+       GGAAUUGGEE
+           is for things like temperatures or number of people in a room or
+           the value of a RedHat share.
+
+       CCOOUUNNTTEERR
+           is for continuous incrementing counters like the ifInOctets counter
+           in a router. The CCOOUUNNTTEERR data source assumes that the counter never
+           decreases, except when a counter overflows.  The update function
+           takes the overflow into account.  The counter is stored as a per-
+           second rate. When the counter overflows, RRDtool checks if the
+           overflow happened at the 32bit or 64bit border and acts accordingly
+           by adding an appropriate value to the result.
+
+       DDEERRIIVVEE
+           will store the derivative of the line going from the last to the
+           current value of the data source. This can be useful for gauges,
+           for example, to measure the rate of people entering or leaving a
+           room. Internally, derive works exactly like COUNTER but without
+           overflow checks. So if your counter does not reset at 32 or 64 bit
+           you might want to use DERIVE and combine it with a MIN value of 0.
+
+           NNOOTTEE oonn CCOOUUNNTTEERR vvss DDEERRIIVVEE
+
+           by Don Baarda <don.baarda@baesystems.com>
+
+           If you cannot tolerate ever mistaking the occasional counter reset
+           for a legitimate counter wrap, and would prefer "Unknowns" for all
+           legitimate counter wraps and resets, always use DERIVE with min=0.
+           Otherwise, using COUNTER with a suitable max will return correct
+           values for all legitimate counter wraps, mark some counter resets
+           as "Unknown", but can mistake some counter resets for a legitimate
+           counter wrap.
+
+           For a 5 minute step and 32-bit counter, the probability of mistak-
+           ing a counter reset for a legitimate wrap is arguably about 0.8%
+           per 1Mbps of maximum bandwidth. Note that this equates to 80% for
+           100Mbps interfaces, so for high bandwidth interfaces and a 32bit
+           counter, DERIVE with min=0 is probably preferable. If you are using
+           a 64bit counter, just about any max setting will eliminate the pos-
+           sibility of mistaking a reset for a counter wrap.
+
+       AABBSSOOLLUUTTEE
+           is for counters which get reset upon reading. This is used for fast
+           counters which tend to overflow. So instead of reading them nor-
+           mally you reset them after every read to make sure you have a maxi-
+           mum time available before the next overflow. Another usage is for
+           things you count like number of messages since the last update.
+
+       CCOOMMPPUUTTEE
+           is for storing the result of a formula applied to other data
+           sources in the RRRRDD. This data source is not supplied a value on
+           update, but rather its Primary Data Points (PDPs) are computed from
+           the PDPs of the data sources according to the rpn-expression that
+           defines the formula. Consolidation functions are then applied nor-
+           mally to the PDPs of the COMPUTE data source (that is the rpn-
+           expression is only applied to generate PDPs). In database software,
+           such data sets are referred to as "virtual" or "computed" columns.
+
+       _h_e_a_r_t_b_e_a_t defines the maximum number of seconds that may pass between
+       two updates of this data source before the value of the data source is
+       assumed to be _*_U_N_K_N_O_W_N_*.
+
+       _m_i_n and _m_a_x define the expected range values for data supplied by a
+       data source. If _m_i_n and/or _m_a_x any value outside the defined range will
+       be regarded as _*_U_N_K_N_O_W_N_*. If you do not know or care about min and max,
+       set them to U for unknown. Note that min and max always refer to the
+       processed values of the DS. For a traffic-CCOOUUNNTTEERR type DS this would be
+       the maximum and minimum data-rate expected from the device.
+
+       _I_f _i_n_f_o_r_m_a_t_i_o_n _o_n _m_i_n_i_m_a_l_/_m_a_x_i_m_a_l _e_x_p_e_c_t_e_d _v_a_l_u_e_s _i_s _a_v_a_i_l_a_b_l_e_, _a_l_w_a_y_s
+       _s_e_t _t_h_e _m_i_n _a_n_d_/_o_r _m_a_x _p_r_o_p_e_r_t_i_e_s_. _T_h_i_s _w_i_l_l _h_e_l_p _R_R_D_t_o_o_l _i_n _d_o_i_n_g _a
+       _s_i_m_p_l_e _s_a_n_i_t_y _c_h_e_c_k _o_n _t_h_e _d_a_t_a _s_u_p_p_l_i_e_d _w_h_e_n _r_u_n_n_i_n_g _u_p_d_a_t_e_.
+
+       _r_p_n_-_e_x_p_r_e_s_s_i_o_n defines the formula used to compute the PDPs of a
+       COMPUTE data source from other data sources in the same <RRD>. It is
+       similar to defining a CCDDEEFF argument for the graph command. Please refer
+       to that manual page for a list and description of RPN operations sup-
+       ported. For COMPUTE data sources, the following RPN operations are not
+       supported: COUNT, PREV, TIME, and LTIME. In addition, in defining the
+       RPN expression, the COMPUTE data source may only refer to the names of
+       data source listed previously in the create command. This is similar to
+       the restriction that CCDDEEFFs must refer only to DDEEFFs and CCDDEEFFs previously
+       defined in the same graph command.
 
        RRRRAA::_C_F::_c_f _a_r_g_u_m_e_n_t_s
-               The purpose of an RRRRDD is to store data in the round robin
-               archives (RRRRAA). An archive consists of a number of data values
-               or statistics for each of the defined data-sources (DDSS) and is
-               defined with an RRRRAA line.
 
-               When data is entered into an RRRRDD, it is first fit into time
-               slots of the length defined with the --ss option, thus becoming a
-               _p_r_i_m_a_r_y _d_a_t_a _p_o_i_n_t.
+       The purpose of an RRRRDD is to store data in the round robin archives
+       (RRRRAA). An archive consists of a number of data values or statistics for
+       each of the defined data-sources (DDSS) and is defined with an RRRRAA line.
+
+       When data is entered into an RRRRDD, it is first fit into time slots of
+       the length defined with the --ss option, thus becoming a _p_r_i_m_a_r_y _d_a_t_a
+       _p_o_i_n_t.
 
-               The data is also processed with the consolidation function (_C_F)
-               of the archive. There are several consolidation functions that
-               consolidate primary data points via an aggregate function:
-               AAVVEERRAAGGEE, MMIINN, MMAAXX, LLAASSTT.
+       The data is also processed with the consolidation function (_C_F) of the
+       archive. There are several consolidation functions that consolidate
+       primary data points via an aggregate function: AAVVEERRAAGGEE, MMIINN, MMAAXX, LLAASSTT.
 
-               AVERAGE
-                   the average of the data points is stored.
+       AVERAGE
+           the average of the data points is stored.
 
-               MIN the smallest of the data points is stored.
+       MIN the smallest of the data points is stored.
 
-               MAX the largest of the data points is stored.
+       MAX the largest of the data points is stored.
 
-               LAST
-                   the last data points is used.
+       LAST
+           the last data points is used.
 
-               Note that data aggregation inevitably leads to loss of preci-
-               sion and information. The trick is to pick the aggregate func-
-               tion such that the _i_n_t_e_r_e_s_t_i_n_g properties of your data is kept
-               across the aggregation process.
+       Note that data aggregation inevitably leads to loss of precision and
+       information. The trick is to pick the aggregate function such that the
+       _i_n_t_e_r_e_s_t_i_n_g properties of your data is kept across the aggregation pro-
+       cess.
 
-               The format of RRRRAA line for these consolidation functions is:
+       The format of RRRRAA line for these consolidation functions is:
 
-               RRRRAA::_A_V_E_R_A_G_E _| _M_I_N _| _M_A_X _| _L_A_S_T::_x_f_f::_s_t_e_p_s::_r_o_w_s
+       RRRRAA::_A_V_E_R_A_G_E _| _M_I_N _| _M_A_X _| _L_A_S_T::_x_f_f::_s_t_e_p_s::_r_o_w_s
 
-               _x_f_f The xfiles factor defines what part of a consolidation
-               interval may be made up from _*_U_N_K_N_O_W_N_* data while the consoli-
-               dated value is still regarded as known. It is given as the
-               ratio of allowed _*_U_N_K_N_O_W_N_* PDPs to the number of PDPs in the
-               interval. Thus, it ranges from 0 to 1 (exclusive).
+       _x_f_f The xfiles factor defines what part of a consolidation interval may
+       be made up from _*_U_N_K_N_O_W_N_* data while the consolidated value is still
+       regarded as known. It is given as the ratio of allowed _*_U_N_K_N_O_W_N_* PDPs
+       to the number of PDPs in the interval. Thus, it ranges from 0 to 1
+       (exclusive).
 
-               _s_t_e_p_s defines how many of these _p_r_i_m_a_r_y _d_a_t_a _p_o_i_n_t_s are used to
-               build a _c_o_n_s_o_l_i_d_a_t_e_d _d_a_t_a _p_o_i_n_t which then goes into the
-               archive.
+       _s_t_e_p_s defines how many of these _p_r_i_m_a_r_y _d_a_t_a _p_o_i_n_t_s are used to build a
+       _c_o_n_s_o_l_i_d_a_t_e_d _d_a_t_a _p_o_i_n_t which then goes into the archive.
 
-               _r_o_w_s defines how many generations of data values are kept in an
-               RRRRAA.
+       _r_o_w_s defines how many generations of data values are kept in an RRRRAA.
+       Obviously, this has to be greater than zero.
 
 AAbbeerrrraanntt BBeehhaavviioorr DDeetteeccttiioonn wwiitthh HHoolltt--WWiinntteerrss FFoorreeccaassttiinngg
        In addition to the aggregate functions, there are a set of specialized
@@ -541,4 +530,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-05-12                      RRDCREATE(1)
+1.3.0                             2008-06-11                      RRDCREATE(1)
diff --git a/doc/rrddump.1 b/doc/rrddump.1
index 9d444b1..cd71311 100644
--- a/doc/rrddump.1
+++ b/doc/rrddump.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDDUMP 1"
-.TH RRDDUMP 1 "2008-05-16" "1.3rc9" "rrdtool"
+.TH RRDDUMP 1 "2008-05-16" "1.3.0" "rrdtool"
 .SH "NAME"
 rrddump \- dump the contents of an RRD to XML format
 .SH "SYNOPSIS"
diff --git a/doc/rrddump.txt b/doc/rrddump.txt
index 164af9d..ca0c8c4 100644
--- a/doc/rrddump.txt
+++ b/doc/rrddump.txt
@@ -48,4 +48,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-05-16                        RRDDUMP(1)
+1.3.0                             2008-05-16                        RRDDUMP(1)
diff --git a/doc/rrdfetch.1 b/doc/rrdfetch.1
index 5c7de01..9685270 100644
--- a/doc/rrdfetch.1
+++ b/doc/rrdfetch.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDFETCH 1"
-.TH RRDFETCH 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDFETCH 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdfetch \- Fetch data from an RRD.
 .SH "SYNOPSIS"
diff --git a/doc/rrdfetch.txt b/doc/rrdfetch.txt
index 702903d..6033e37 100644
--- a/doc/rrdfetch.txt
+++ b/doc/rrdfetch.txt
@@ -228,4 +228,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                       RRDFETCH(1)
+1.3.0                             2008-03-15                       RRDFETCH(1)
diff --git a/doc/rrdfirst.1 b/doc/rrdfirst.1
index 128bcd9..212e086 100644
--- a/doc/rrdfirst.1
+++ b/doc/rrdfirst.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDFIRST 1"
-.TH RRDFIRST 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDFIRST 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdfirst \- Return the date of the first data sample in an RRA within an RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdfirst.txt b/doc/rrdfirst.txt
index ee3541c..659b106 100644
--- a/doc/rrdfirst.txt
+++ b/doc/rrdfirst.txt
@@ -26,4 +26,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                       RRDFIRST(1)
+1.3.0                             2008-03-15                       RRDFIRST(1)
diff --git a/doc/rrdgraph.1 b/doc/rrdgraph.1
index 096f25b..4983013 100644
--- a/doc/rrdgraph.1
+++ b/doc/rrdgraph.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDGRAPH 1"
-.TH RRDGRAPH 1 "2008-06-05" "1.3rc9" "rrdtool"
+.TH RRDGRAPH 1 "2008-06-11" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdgraph \- Round Robin Database tool grapher functions
 .SH "SYNOPSIS"
@@ -176,25 +176,25 @@ When you are done fetching and processing the data, it is time to
 graph it (or print it).  This ends the \fBrrdtool graph\fR sequence.
 .SH "OPTIONS"
 .IX Header "OPTIONS"
-.IP "\fBgraphv\fR" 4
-.IX Item "graphv"
+.Sh "\fBgraphv\fP"
+.IX Subsection "graphv"
 This alternate version of \fBgraph\fR takes the same arguments and performs the
 same function. The \fIv\fR stands for \fIverbose\fR, which describes the output
 returned. \fBgraphv\fR will return a lot of information about the graph using
 the same format as rrdtool info (key = value). See the bottom of the document for more information.
-.IP "filename" 4
-.IX Item "filename"
+.Sh "\fIfilename\fP"
+.IX Subsection "filename"
 The name and path of the graph to generate. It is recommended to
 end this in \f(CW\*(C`.png\*(C'\fR, \f(CW\*(C`.svg\*(C'\fR or \f(CW\*(C`.eps\*(C'\fR, but \fBRRDtool\fR does not enforce this.
-.Sp
+.PP
 \&\fIfilename\fR can be '\f(CW\*(C`\-\*(C'\fR' to send the image to \f(CW\*(C`stdout\*(C'\fR. In
 this case, no other output is generated.
-.IP "Time range" 4
-.IX Item "Time range"
+.Sh "Time range"
+.IX Subsection "Time range"
 [\fB\-s\fR|\fB\-\-start\fR \fItime\fR]
 [\fB\-e\fR|\fB\-\-end\fR \fItime\fR]
 [\fB\-S\fR|\fB\-\-step\fR \fIseconds\fR]
-.Sp
+.PP
 The start and end of the time series you would like to display, and which
 \&\fB\s-1RRA\s0\fR the data should come from.  Defaults are: 1 day ago until
 now, with the best possible resolution. \fBStart\fR and \fBend\fR can
@@ -206,46 +206,46 @@ resolution.  With the \fBstep\fR option you can alter this behaviour.
 If you want \fBrrdtool graph\fR to get data at a one-hour resolution
 from the \fB\s-1RRD\s0\fR, set \fBstep\fR to 3'600. Note: a step smaller than
 one pixel will silently be ignored.
-.IP "Labels" 4
-.IX Item "Labels"
+.Sh "Labels"
+.IX Subsection "Labels"
 [\fB\-t\fR|\fB\-\-title\fR \fIstring\fR]
 [\fB\-v\fR|\fB\-\-vertical\-label\fR \fIstring\fR]
-.Sp
+.PP
 A horizontal string at the top of the graph and/or a vertically
 placed string at the left hand side of the graph.
-.IP "Size" 4
-.IX Item "Size"
+.Sh "Size"
+.IX Subsection "Size"
 [\fB\-w\fR|\fB\-\-width\fR \fIpixels\fR]
 [\fB\-h\fR|\fB\-\-height\fR \fIpixels\fR]
 [\fB\-j\fR|\fB\-\-only\-graph\fR]
 [\fB\-D\fR|\fB\-\-full\-size\-mode\fR]
-.Sp
+.PP
 By default, the width and height of the \fBcanvas\fR (the part with
 the actual data and such). This defaults to 400 pixels by 100 pixels.
-.Sp
+.PP
 If you specify the \fB\-\-full\-size\-mode\fR option, the width and height
 specify the final dimensions of the output image and the canvas
 is automatically resized to fit.
-.Sp
+.PP
 If you specify the \fB\-\-only\-graph\fR option and set the height < 32
 pixels you will get a tiny graph image (thumbnail) to use as an icon
 for use in an overview, for example. All labeling will be stripped off
 the graph.
-.IP "Limits" 4
-.IX Item "Limits"
+.Sh "Limits"
+.IX Subsection "Limits"
 [\fB\-u\fR|\fB\-\-upper\-limit\fR \fIvalue\fR]
 [\fB\-l\fR|\fB\-\-lower\-limit\fR \fIvalue\fR]
 [\fB\-r\fR|\fB\-\-rigid\fR]
-.Sp
+.PP
 By default the graph will be autoscaling so that it will adjust the
 y\-axis to the range of the data. You can change this behaviour by
 explicitly setting the limits. The displayed y\-axis will then range at
 least from \fBlower-limit\fR to \fBupper-limit\fR. Autoscaling will still
 permit those boundaries to be stretched unless the \fBrigid\fR option is
 set.
-.Sp
+.PP
 [\fB\-A\fR|\fB\-\-alt\-autoscale\fR]
-.Sp
+.PP
 Sometimes the default algorithm for selecting the y\-axis scale is not
 satisfactory. Normally the scale is selected from a predefined
 set of ranges and this fails miserably when you need to graph something
@@ -253,38 +253,35 @@ like \f(CW\*(C`260 + 0.001 * sin(x)\*(C'\fR. This option calculates the minimum
 maximum y\-axis from the actual minimum and maximum data values. Our example
 would display slightly less than \f(CW\*(C`260\-0.001\*(C'\fR to slightly more than
 \&\f(CW\*(C`260+0.001\*(C'\fR (this feature was contributed by Sasha Mikheev).
-.Sp
+.PP
 [\fB\-J\fR|\fB\-\-alt\-autoscale\-min\fR]
-.Sp
+.PP
 Where \f(CW\*(C`\-\-alt\-autoscale\*(C'\fR will modify both the absolute maximum \s-1AND\s0 minimum
 values, this option will only affect the minimum value. The maximum
 value, if not defined on the command line, will be 0. This option can
 be useful when graphing router traffic when the \s-1WAN\s0 line uses compression,
 and thus the throughput may be higher than the \s-1WAN\s0 line speed.
-.Sp
+.PP
 [\fB\-M\fR|\fB\-\-alt\-autoscale\-max\fR]
-.Sp
+.PP
 Where \f(CW\*(C`\-\-alt\-autoscale\*(C'\fR will modify both the absolute maximum \s-1AND\s0 minimum
 values, this option will only affect the maximum value. The minimum
 value, if not defined on the command line, will be 0. This option can
 be useful when graphing router traffic when the \s-1WAN\s0 line uses compression,
 and thus the throughput may be higher than the \s-1WAN\s0 line speed.
-.Sp
+.PP
 [\fB\-N\fR|\fB\-\-no\-gridfit\fR]
-.Sp
+.PP
 In order to avoid anti-aliasing blurring effects rrdtool snaps
 points to device resolution pixels, this results in a crisper
 aperance. If this is not to your liking, you can use this switch
 to turn this behaviour off.
-.Sp
+.PP
 Gridfitting is turned off for \s-1PDF\s0, \s-1EPS\s0, \s-1SVG\s0 output by default.
-.IP "Grid" 4
-.IX Item "Grid"
-.RS 4
-.PD 0
+.Sh "Grid"
+.IX Subsection "Grid"
 .IP "X\-Axis" 4
 .IX Item "X-Axis"
-.PD
 [\fB\-x\fR|\fB\-\-x\-grid\fR \fI\s-1GTM\s0\fR\fB:\fR\fI\s-1GST\s0\fR\fB:\fR\fI\s-1MTM\s0\fR\fB:\fR\fI\s-1MST\s0\fR\fB:\fR\fI\s-1LTM\s0\fR\fB:\fR\fI\s-1LST\s0\fR\fB:\fR\fI\s-1LPR\s0\fR\fB:\fR\fI\s-1LFM\s0\fR]
 .Sp
 [\fB\-x\fR|\fB\-\-x\-grid\fR \fBnone\fR]
@@ -377,31 +374,28 @@ fideling with the y\-axis labeling.
 With this option y\-axis values on logarithmic graphs will be scaled to 
 the appropriate units (k, M, etc.) instead of using exponential notation.
 Note that for linear graphs, \s-1SI\s0 notation is used by default.
-.RE
-.RS 4
-.RE
-.IP "Miscellaneous" 4
-.IX Item "Miscellaneous"
+.Sh "Miscellaneous"
+.IX Subsection "Miscellaneous"
 [\fB\-z\fR|\fB\-\-lazy\fR]
-.Sp
+.PP
 Only generate the graph if the current graph is out of date or not
 existent.
-.Sp
+.PP
 [\fB\-f\fR|\fB\-\-imginfo\fR \fIprintfstr\fR]
-.Sp
+.PP
 After the image has been created, the graph function uses printf
 together with this format string to create output similar to the \s-1PRINT\s0
 function, only that the printf function is supplied with the parameters
 \&\fIfilename\fR, \fIxsize\fR and \fIysize\fR. In order to generate an \fB\s-1IMG\s0\fR tag
 suitable for including the graph into a web page, the command line
 would look like this:
-.Sp
+.PP
 .Vb 1
 \& \-\-imginfo \(aq<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">\(aq
 .Ve
-.Sp
+.PP
 [\fB\-c\fR|\fB\-\-color\fR \fI\s-1COLORTAG\s0\fR#\fIrrggbb\fR[\fIaa\fR]]
-.Sp
+.PP
 Override the default colors for the standard elements of the graph. The
 \&\fI\s-1COLORTAG\s0\fR is one of \f(CW\*(C`BACK\*(C'\fR background, \f(CW\*(C`CANVAS\*(C'\fR for the background of
 the actual graph, \f(CW\*(C`SHADEA\*(C'\fR for the left and top border, \f(CW\*(C`SHADEB\*(C'\fR for the
@@ -413,35 +407,35 @@ specifying its rgb color component (00 is off, \s-1FF\s0 is maximum) of red, gre
 and blue. Optionally you may add another hexadecimal number specifying the
 transparency (\s-1FF\s0 is solid). You may set this option several times to alter
 multiple defaults.
-.Sp
+.PP
 A green arrow is made by: \f(CW\*(C`\-\-color ARROW#00FF00\*(C'\fR
-.Sp
+.PP
 [\fB\-\-zoom\fR \fIfactor\fR]
-.Sp
+.PP
 Zoom the graphics by the given amount. The factor must be > 0
-.Sp
+.PP
 [\fB\-n\fR|\fB\-\-font\fR \fI\s-1FONTTAG\s0\fR\fB:\fR\fIsize\fR\fB:\fR[\fIfont\fR]]
-.Sp
+.PP
 This lets you customize which font to use for the various text
 elements on the \s-1RRD\s0 graphs. \f(CW\*(C`DEFAULT\*(C'\fR sets the default value for all
 elements, \f(CW\*(C`TITLE\*(C'\fR for the title, \f(CW\*(C`AXIS\*(C'\fR for the axis labels, \f(CW\*(C`UNIT\*(C'\fR
 for the vertical unit label, \f(CW\*(C`LEGEND\*(C'\fR for the graph legend.
-.Sp
+.PP
 Use Times for the title: \f(CW\*(C`\-\-font TITLE:13:Times\*(C'\fR
-.Sp
+.PP
 If you do not give a font string you can modify just the sice of the default font:
 \&\f(CW\*(C`\-\-font TITLE:13:\*(C'\fR.
-.Sp
+.PP
 If you specify the size 0 then you can modify just the font without touching
 the size. This is especially usefull for altering the default font without
 resetting the default fontsizes: \f(CW\*(C`\-\-font DEFAULT:0:Courier\*(C'\fR.
-.Sp
+.PP
 RRDtool comes with a preset default font. You can set the environment
 variable \f(CW\*(C`RRD_DEFAULT_FONT\*(C'\fR if you want to change this.
-.Sp
+.PP
 RRDtool uses Pango for its font handling. This means you can to use
 the full Pango syntax when selecting your font:
-.Sp
+.PP
 The font name has the form "[\fIFAMILY-LIST\fR] [\fISTYLE-OPTIONS\fR] [\fI\s-1SIZE\s0\fR]",
 where \fIFAMILY-LIST\fR is a comma separated list of families optionally
 terminated by a comma, \fI\s-1STYLE_OPTIONS\s0\fR is a whitespace separated list of
@@ -449,37 +443,37 @@ words where each \s-1WORD\s0 describes one of style, variant, weight, stretch, o
 gravity, and \fI\s-1SIZE\s0\fR is a decimal number (size in points) or optionally
 followed by the unit modifier \*(L"px\*(R" for absolute size. Any one of the options
 may be absent.
-.Sp
+.PP
 [\fB\-R\fR|\fB\-\-font\-render\-mode\fR {\fBnormal\fR,\fBlight\fR,\fBmono\fR}]
-.Sp
+.PP
 There are 3 font render modes:
-.Sp
+.PP
 \&\fBnormal\fR: Full Hinting and Antialiasing (default)
-.Sp
+.PP
 \&\fBlight\fR: Slight Hinting and Antialiasing
-.Sp
+.PP
 \&\fBmono\fR: Full Hinting and \s-1NO\s0 Antialiasing
-.Sp
+.PP
 [\fB\-B\fR|\fB\-\-font\-smoothing\-threshold\fR \fIsize\fR]
-.Sp
+.PP
 (this gets ignored in 1.3 for now!)
-.Sp
+.PP
 This specifies the largest font size which will be rendered
 bitmapped, that is, without any font smoothing. By default,
 no text is rendered bitmapped.
-.Sp
+.PP
 [\fB\-P\fR|\fB\-\-pango\-markup\fR]
-.Sp
+.PP
 All text in rrdtool is rendered using Pango. With the \fB\-\-pango\-markup\fR option, all
 text will be processed by pango markup. This allows to embed some simple html
 like markup tags using 
-.Sp
+.PP
 .Vb 1
 \& <span key="value">text</span>
 .Ve
-.Sp
+.PP
 Apart from the verbose syntax, there are also the following short tags available.
-.Sp
+.PP
 .Vb 9
 \& b     Bold
 \& big   Makes font relatively larger, equivalent to <span size="larger">
@@ -491,74 +485,74 @@ Apart from the verbose syntax, there are also the following short tags available
 \& tt    Monospace font
 \& u     Underline
 .Ve
-.Sp
+.PP
 More details on <http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html>.
-.Sp
+.PP
 [\fB\-G\fR|\fB\-\-graph\-render\-mode\fR {\fBnormal\fR,\fBmono\fR}]
-.Sp
+.PP
 There are 2 render modes:
-.Sp
+.PP
 \&\fBnormal\fR: Graphs are fully Antialiased (default)
-.Sp
+.PP
 \&\fBmono\fR: No Antialiasing
-.Sp
+.PP
 [\fB\-E\fR|\fB\-\-slope\-mode\fR]
-.Sp
+.PP
 RRDtool graphs are composed of stair case curves by default. This is in line with
 the way RRDtool calculates its data. Some people favor a more 'organic' look
 for their graphs even though it is not all that true.
-.Sp
+.PP
 [\fB\-a\fR|\fB\-\-imgformat\fR \fB\s-1PNG\s0\fR|\fB\s-1SVG\s0\fR|\fB\s-1EPS\s0\fR|\fB\s-1PDF\s0\fR]
-.Sp
+.PP
 Image format for the generated graph. For the vector formats you can
 choose among the standard Postscript fonts Courier\-Bold,
 Courier\-BoldOblique, Courier\-Oblique, Courier, Helvetica\-Bold,
 Helvetica\-BoldOblique, Helvetica\-Oblique, Helvetica, Symbol,
 Times\-Bold, Times\-BoldItalic, Times\-Italic, Times\-Roman, and ZapfDingbats.
-.Sp
+.PP
 [\fB\-i\fR|\fB\-\-interlaced\fR]
-.Sp
+.PP
 (this gets ignored in 1.3 for now!)
-.Sp
+.PP
 If images are interlaced they become visible on browsers more quickly.
-.Sp
+.PP
 [\fB\-g\fR|\fB\-\-no\-legend\fR]
-.Sp
+.PP
 Suppress generation of the legend; only render the graph.
-.Sp
+.PP
 [\fB\-F\fR|\fB\-\-force\-rules\-legend\fR]
-.Sp
+.PP
 Force the generation of \s-1HRULE\s0 and \s-1VRULE\s0 legends even if those \s-1HRULE\s0 or
 \&\s-1VRULE\s0 will not be drawn because out of graph boundaries (mimics
 behaviour of pre 1.0.42 versions).
-.Sp
+.PP
 [\fB\-T\fR|\fB\-\-tabwidth\fR \fIvalue\fR]
-.Sp
+.PP
 By default the tab-width is 40 pixels, use this option to change it.
-.Sp
+.PP
 [\fB\-b\fR|\fB\-\-base\fR \fIvalue\fR]
-.Sp
+.PP
 If you are graphing memory (and \s-1NOT\s0 network traffic) this switch
 should be set to 1024 so that one Kb is 1024 byte. For traffic
 measurement, 1 kb/s is 1000 b/s.
-.Sp
+.PP
 [\fB\-W\fR|\fB\-\-watermark\fR \fIstring\fR]
-.Sp
+.PP
 Adds the given string as a watermark, horizontally centred, at the bottom 
 of the graph.
-.IP "Data and variables" 4
-.IX Item "Data and variables"
+.Sh "Data and variables"
+.IX Subsection "Data and variables"
 \&\fB\s-1DEF:\s0\fR\fIvname\fR\fB=\fR\fIrrdfile\fR\fB:\fR\fIds-name\fR\fB:\fR\fI\s-1CF\s0\fR[\fB:step=\fR\fIstep\fR][\fB:start=\fR\fItime\fR][\fB:end=\fR\fItime\fR]
-.Sp
+.PP
 \&\fB\s-1CDEF:\s0\fR\fIvname\fR\fB=\fR\fI\s-1RPN\s0 expression\fR
-.Sp
+.PP
 \&\fB\s-1VDEF:\s0\fR\fIvname\fR\fB=\fR\fI\s-1RPN\s0 expression\fR
-.Sp
+.PP
 You need at least one \fB\s-1DEF\s0\fR statement to generate anything. The
 other statements are useful but optional.
 See rrdgraph_data and rrdgraph_rpn for the exact format.
-.IP "Graph and print elements" 4
-.IX Item "Graph and print elements"
+.Sh "Graph and print elements"
+.IX Subsection "Graph and print elements"
 You need at least one graph element to generate an image and/or
 at least one print statement to generate a report.
 See rrdgraph_graph for the exact format.
diff --git a/doc/rrdgraph.html b/doc/rrdgraph.html
index 5415923..b4db55e 100644
--- a/doc/rrdgraph.html
+++ b/doc/rrdgraph.html
@@ -22,6 +22,16 @@
 	<li><a href="#options">OPTIONS</a></li>
 	<ul>
 
+		<li><a href="#graphv"><strong>graphv</strong></a></li>
+		<li><a href="#filename"><em>filename</em></a></li>
+		<li><a href="#time_range">Time range</a></li>
+		<li><a href="#labels">Labels</a></li>
+		<li><a href="#size">Size</a></li>
+		<li><a href="#limits">Limits</a></li>
+		<li><a href="#grid">Grid</a></li>
+		<li><a href="#miscellaneous">Miscellaneous</a></li>
+		<li><a href="#data_and_variables">Data and variables</a></li>
+		<li><a href="#graph_and_print_elements">Graph and print elements</a></li>
 		<li><a href="#graphv">graphv</a></li>
 	</ul>
 
@@ -83,26 +93,23 @@ graph it (or print it).  This ends the <strong>rrdtool graph</strong> sequence.<
 </p>
 <hr />
 <h1><a name="options">OPTIONS</a></h1>
-<dl>
-<dt><strong><a name="item_graphv"><strong>graphv</strong></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="graphv"><strong>graphv</strong></a></h2>
 <p>This alternate version of <strong>graph</strong> takes the same arguments and performs the
 same function. The <em>v</em> stands for <em>verbose</em>, which describes the output
 returned. <strong>graphv</strong> will return a lot of information about the graph using
 the same format as rrdtool info (key = value). See the bottom of the document for more information.</p>
-</dd>
-<dt><strong><a name="item_filename">filename</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="filename"><em>filename</em></a></h2>
 <p>The name and path of the graph to generate. It is recommended to
 end this in <code>.png</code>, <code>.svg</code> or <code>.eps</code>, but <strong>RRDtool</strong> does not enforce this.</p>
 <p><em>filename</em> can be '<code>-</code>' to send the image to <code>stdout</code>. In
 this case, no other output is generated.</p>
-</dd>
-<dt><strong><a name="item_time_range">Time range</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="time_range">Time range</a></h2>
 <p>[<strong>-s</strong>|<strong>--start</strong> <em>time</em>]
 [<strong>-e</strong>|<strong>--end</strong> <em>time</em>]
 [<strong>-S</strong>|<strong>--step</strong> <em>seconds</em>]</p>
@@ -117,18 +124,16 @@ resolution.  With the <strong>step</strong> option you can alter this behaviour.
 If you want <strong>rrdtool graph</strong> to get data at a one-hour resolution
 from the <strong>RRD</strong>, set <strong>step</strong> to 3'600. Note: a step smaller than
 one pixel will silently be ignored.</p>
-</dd>
-<dt><strong><a name="item_labels">Labels</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="labels">Labels</a></h2>
 <p>[<strong>-t</strong>|<strong>--title</strong> <em>string</em>]
 [<strong>-v</strong>|<strong>--vertical-label</strong> <em>string</em>]</p>
 <p>A horizontal string at the top of the graph and/or a vertically
 placed string at the left hand side of the graph.</p>
-</dd>
-<dt><strong><a name="item_size">Size</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="size">Size</a></h2>
 <p>[<strong>-w</strong>|<strong>--width</strong> <em>pixels</em>]
 [<strong>-h</strong>|<strong>--height</strong> <em>pixels</em>]
 [<strong>-j</strong>|<strong>--only-graph</strong>]
@@ -142,10 +147,9 @@ is automatically resized to fit.</p>
 pixels you will get a tiny graph image (thumbnail) to use as an icon
 for use in an overview, for example. All labeling will be stripped off
 the graph.</p>
-</dd>
-<dt><strong><a name="item_limits">Limits</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="limits">Limits</a></h2>
 <p>[<strong>-u</strong>|<strong>--upper-limit</strong> <em>value</em>]
 [<strong>-l</strong>|<strong>--lower-limit</strong> <em>value</em>]
 [<strong>-r</strong>|<strong>--rigid</strong>]</p>
@@ -181,9 +185,9 @@ points to device resolution pixels, this results in a crisper
 aperance. If this is not to your liking, you can use this switch
 to turn this behaviour off.</p>
 <p>Gridfitting is turned off for PDF, EPS, SVG output by default.</p>
-</dd>
-<dt><strong><a name="item_grid">Grid</a></strong></dt>
-
+<p>
+</p>
+<h2><a name="grid">Grid</a></h2>
 <dl>
 <dt><strong><a name="item_x_2daxis">X-Axis</a></strong></dt>
 
@@ -261,10 +265,9 @@ the appropriate units (k, M, etc.) instead of using exponential notation.
 Note that for linear graphs, SI notation is used by default.</p>
 </dd>
 </dl>
-</dd>
-<dt><strong><a name="item_miscellaneous">Miscellaneous</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="miscellaneous">Miscellaneous</a></h2>
 <p>[<strong>-z</strong>|<strong>--lazy</strong>]</p>
 <p>Only generate the graph if the current graph is out of date or not
 existent.</p>
@@ -377,25 +380,21 @@ measurement, 1 kb/s is 1000 b/s.</p>
 <p>[<strong>-W</strong>|<strong>--watermark</strong> <em>string</em>]</p>
 <p>Adds the given string as a watermark, horizontally centred, at the bottom 
 of the graph.</p>
-</dd>
-<dt><strong><a name="item_data_and_variables">Data and variables</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="data_and_variables">Data and variables</a></h2>
 <p><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrdfile</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em>[<strong>:step=</strong><em>step</em>][<strong>:start=</strong><em>time</em>][<strong>:end=</strong><em>time</em>]</p>
 <p><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>RPN expression</em></p>
 <p><strong>VDEF:</strong><em>vname</em><strong>=</strong><em>RPN expression</em></p>
 <p>You need at least one <strong>DEF</strong> statement to generate anything. The
 other statements are useful but optional.
 See <a href="././rrdgraph_data.html">the rrdgraph_data manpage</a> and <a href="././rrdgraph_rpn.html">the rrdgraph_rpn manpage</a> for the exact format.</p>
-</dd>
-<dt><strong><a name="item_graph_and_print_elements">Graph and print elements</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h2><a name="graph_and_print_elements">Graph and print elements</a></h2>
 <p>You need at least one graph element to generate an image and/or
 at least one print statement to generate a report.
 See <a href="././rrdgraph_graph.html">the rrdgraph_graph manpage</a> for the exact format.</p>
-</dd>
-</dl>
 <p>
 </p>
 <h2><a name="graphv">graphv</a></h2>
diff --git a/doc/rrdgraph.pod b/doc/rrdgraph.pod
index 159d6af..048171a 100644
--- a/doc/rrdgraph.pod
+++ b/doc/rrdgraph.pod
@@ -50,9 +50,8 @@ graph it (or print it).  This ends the B<rrdtool graph> sequence.
 
 =head1 OPTIONS
 
-=over 4
 
-=item B<graphv>
+=head2 B<graphv>
 
 This alternate version of B<graph> takes the same arguments and performs the
 same function. The I<v> stands for I<verbose>, which describes the output
@@ -60,7 +59,7 @@ returned. B<graphv> will return a lot of information about the graph using
 the same format as rrdtool info (key = value). See the bottom of the document for more information.
 
 
-=item filename
+=head2 I<filename>
 
 The name and path of the graph to generate. It is recommended to
 end this in C<.png>, C<.svg> or C<.eps>, but B<RRDtool> does not enforce this.
@@ -68,7 +67,7 @@ end this in C<.png>, C<.svg> or C<.eps>, but B<RRDtool> does not enforce this.
 I<filename> can be 'C<->' to send the image to C<stdout>. In
 this case, no other output is generated.
 
-=item Time range
+=head2 Time range
 
 [B<-s>|B<--start> I<time>]
 [B<-e>|B<--end> I<time>]
@@ -86,7 +85,7 @@ If you want B<rrdtool graph> to get data at a one-hour resolution
 from the B<RRD>, set B<step> to 3'600. Note: a step smaller than
 one pixel will silently be ignored.
 
-=item Labels
+=head2 Labels
 
 [B<-t>|B<--title> I<string>]
 [B<-v>|B<--vertical-label> I<string>]
@@ -94,7 +93,7 @@ one pixel will silently be ignored.
 A horizontal string at the top of the graph and/or a vertically
 placed string at the left hand side of the graph.
 
-=item Size
+=head2 Size
 
 [B<-w>|B<--width> I<pixels>]
 [B<-h>|B<--height> I<pixels>]
@@ -113,7 +112,7 @@ pixels you will get a tiny graph image (thumbnail) to use as an icon
 for use in an overview, for example. All labeling will be stripped off
 the graph.
 
-=item Limits
+=head2 Limits
 
 [B<-u>|B<--upper-limit> I<value>]
 [B<-l>|B<--lower-limit> I<value>]
@@ -161,9 +160,9 @@ to turn this behaviour off.
 
 Gridfitting is turned off for PDF, EPS, SVG output by default.
 
-=item Grid
+=head2 Grid
 
-=over 4
+=over
 
 =item X-Axis
 
@@ -259,7 +258,7 @@ Note that for linear graphs, SI notation is used by default.
 
 =back
 
-=item Miscellaneous
+=head2 Miscellaneous
 
 [B<-z>|B<--lazy>]
 
@@ -421,7 +420,7 @@ measurement, 1 kb/s is 1000 b/s.
 Adds the given string as a watermark, horizontally centred, at the bottom 
 of the graph.
 
-=item Data and variables
+=head2 Data and variables
 
 B<DEF:>I<vname>B<=>I<rrdfile>B<:>I<ds-name>B<:>I<CF>[B<:step=>I<step>][B<:start=>I<time>][B<:end=>I<time>]
 
@@ -433,7 +432,7 @@ You need at least one B<DEF> statement to generate anything. The
 other statements are useful but optional.
 See L<rrdgraph_data> and L<rrdgraph_rpn> for the exact format.
 
-=item Graph and print elements
+=head2 Graph and print elements
 
 You need at least one graph element to generate an image and/or
 at least one print statement to generate a report.
diff --git a/doc/rrdgraph.txt b/doc/rrdgraph.txt
index 641c1fd..3adf75a 100644
--- a/doc/rrdgraph.txt
+++ b/doc/rrdgraph.txt
@@ -42,385 +42,382 @@ OOVVEERRVVIIEEWW
 
 OOPPTTIIOONNSS
        ggrraapphhvv
-           This alternate version of ggrraapphh takes the same arguments and per-
-           forms the same function. The _v stands for _v_e_r_b_o_s_e, which describes
-           the output returned. ggrraapphhvv will return a lot of information about
-           the graph using the same format as rrdtool info (key = value). See
-           the bottom of the document for more information.
-
-       filename
-           The name and path of the graph to generate. It is recommended to
-           end this in ".png", ".svg" or ".eps", but RRRRDDttooooll does not enforce
-           this.
-
-           _f_i_l_e_n_a_m_e can be '"-"' to send the image to "stdout". In this case,
-           no other output is generated.
-
-       Time range
-           [--ss|----ssttaarrtt _t_i_m_e] [--ee|----eenndd _t_i_m_e] [--SS|----sstteepp _s_e_c_o_n_d_s]
-
-           The start and end of the time series you would like to display, and
-           which RRRRAA the data should come from.  Defaults are: 1 day ago until
-           now, with the best possible resolution. SSttaarrtt and eenndd can be speci-
-           fied in several formats, see AT-STYLE TIME SPECIFICATION and rrd-
-           graph_examples.  By default, rrrrddttooooll ggrraapphh calculates the width of
-           one pixel in the time domain and tries to get data from an RRRRAA with
-           that resolution.  With the sstteepp option you can alter this
-           behaviour.  If you want rrrrddttooooll ggrraapphh to get data at a one-hour
-           resolution from the RRRRDD, set sstteepp to 3'600. Note: a step smaller
-           than one pixel will silently be ignored.
-
-       Labels
-           [--tt|----ttiittllee _s_t_r_i_n_g] [--vv|----vveerrttiiccaall--llaabbeell _s_t_r_i_n_g]
-
-           A horizontal string at the top of the graph and/or a vertically
-           placed string at the left hand side of the graph.
-
-       Size
-           [--ww|----wwiiddtthh _p_i_x_e_l_s] [--hh|----hheeiigghhtt _p_i_x_e_l_s] [--jj|----oonnllyy--ggrraapphh]
-           [--DD|----ffuullll--ssiizzee--mmooddee]
-
-           By default, the width and height of the ccaannvvaass (the part with the
-           actual data and such). This defaults to 400 pixels by 100 pixels.
-
-           If you specify the ----ffuullll--ssiizzee--mmooddee option, the width and height
-           specify the final dimensions of the output image and the canvas is
-           automatically resized to fit.
-
-           If you specify the ----oonnllyy--ggrraapphh option and set the height < 32 pix-
-           els you will get a tiny graph image (thumbnail) to use as an icon
-           for use in an overview, for example. All labeling will be stripped
-           off the graph.
-
-       Limits
-           [--uu|----uuppppeerr--lliimmiitt _v_a_l_u_e] [--ll|----lloowweerr--lliimmiitt _v_a_l_u_e] [--rr|----rriiggiidd]
-
-           By default the graph will be autoscaling so that it will adjust the
-           y-axis to the range of the data. You can change this behaviour by
-           explicitly setting the limits. The displayed y-axis will then range
-           at least from lloowweerr--lliimmiitt to uuppppeerr--lliimmiitt. Autoscaling will still
-           permit those boundaries to be stretched unless the rriiggiidd option is
-           set.
-
-           [--AA|----aalltt--aauuttoossccaallee]
-
-           Sometimes the default algorithm for selecting the y-axis scale is
-           not satisfactory. Normally the scale is selected from a predefined
-           set of ranges and this fails miserably when you need to graph some-
-           thing like "260 + 0.001 * sin(x)". This option calculates the mini-
-           mum and maximum y-axis from the actual minimum and maximum data
-           values. Our example would display slightly less than "260-0.001" to
-           slightly more than "260+0.001" (this feature was contributed by
-           Sasha Mikheev).
 
-           [--JJ|----aalltt--aauuttoossccaallee--mmiinn]
+       This alternate version of ggrraapphh takes the same arguments and performs
+       the same function. The _v stands for _v_e_r_b_o_s_e, which describes the output
+       returned. ggrraapphhvv will return a lot of information about the graph using
+       the same format as rrdtool info (key = value). See the bottom of the
+       document for more information.
+
+       _f_i_l_e_n_a_m_e
+
+       The name and path of the graph to generate. It is recommended to end
+       this in ".png", ".svg" or ".eps", but RRRRDDttooooll does not enforce this.
+
+       _f_i_l_e_n_a_m_e can be '"-"' to send the image to "stdout". In this case, no
+       other output is generated.
+
+       TTiimmee rraannggee
+
+       [--ss|----ssttaarrtt _t_i_m_e] [--ee|----eenndd _t_i_m_e] [--SS|----sstteepp _s_e_c_o_n_d_s]
+
+       The start and end of the time series you would like to display, and
+       which RRRRAA the data should come from.  Defaults are: 1 day ago until
+       now, with the best possible resolution. SSttaarrtt and eenndd can be specified
+       in several formats, see AT-STYLE TIME SPECIFICATION and rrdgraph_exam-
+       ples.  By default, rrrrddttooooll ggrraapphh calculates the width of one pixel in
+       the time domain and tries to get data from an RRRRAA with that resolution.
+       With the sstteepp option you can alter this behaviour.  If you want rrrrddttooooll
+       ggrraapphh to get data at a one-hour resolution from the RRRRDD, set sstteepp to
+       3'600. Note: a step smaller than one pixel will silently be ignored.
+
+       LLaabbeellss
+
+       [--tt|----ttiittllee _s_t_r_i_n_g] [--vv|----vveerrttiiccaall--llaabbeell _s_t_r_i_n_g]
+
+       A horizontal string at the top of the graph and/or a vertically placed
+       string at the left hand side of the graph.
+
+       SSiizzee
+
+       [--ww|----wwiiddtthh _p_i_x_e_l_s] [--hh|----hheeiigghhtt _p_i_x_e_l_s] [--jj|----oonnllyy--ggrraapphh]
+       [--DD|----ffuullll--ssiizzee--mmooddee]
+
+       By default, the width and height of the ccaannvvaass (the part with the
+       actual data and such). This defaults to 400 pixels by 100 pixels.
+
+       If you specify the ----ffuullll--ssiizzee--mmooddee option, the width and height spec-
+       ify the final dimensions of the output image and the canvas is automat-
+       ically resized to fit.
+
+       If you specify the ----oonnllyy--ggrraapphh option and set the height < 32 pixels
+       you will get a tiny graph image (thumbnail) to use as an icon for use
+       in an overview, for example. All labeling will be stripped off the
+       graph.
+
+       LLiimmiittss
+
+       [--uu|----uuppppeerr--lliimmiitt _v_a_l_u_e] [--ll|----lloowweerr--lliimmiitt _v_a_l_u_e] [--rr|----rriiggiidd]
 
-           Where "--alt-autoscale" will modify both the absolute maximum AND
-           minimum values, this option will only affect the minimum value. The
-           maximum value, if not defined on the command line, will be 0. This
-           option can be useful when graphing router traffic when the WAN line
-           uses compression, and thus the throughput may be higher than the
-           WAN line speed.
-
-           [--MM|----aalltt--aauuttoossccaallee--mmaaxx]
-
-           Where "--alt-autoscale" will modify both the absolute maximum AND
-           minimum values, this option will only affect the maximum value. The
-           minimum value, if not defined on the command line, will be 0. This
-           option can be useful when graphing router traffic when the WAN line
-           uses compression, and thus the throughput may be higher than the
-           WAN line speed.
+       By default the graph will be autoscaling so that it will adjust the
+       y-axis to the range of the data. You can change this behaviour by
+       explicitly setting the limits. The displayed y-axis will then range at
+       least from lloowweerr--lliimmiitt to uuppppeerr--lliimmiitt. Autoscaling will still permit
+       those boundaries to be stretched unless the rriiggiidd option is set.
 
-           [--NN|----nnoo--ggrriiddffiitt]
+       [--AA|----aalltt--aauuttoossccaallee]
 
-           In order to avoid anti-aliasing blurring effects rrdtool snaps
-           points to device resolution pixels, this results in a crisper aper-
-           ance. If this is not to your liking, you can use this switch to
-           turn this behaviour off.
+       Sometimes the default algorithm for selecting the y-axis scale is not
+       satisfactory. Normally the scale is selected from a predefined set of
+       ranges and this fails miserably when you need to graph something like
+       "260 + 0.001 * sin(x)". This option calculates the minimum and maximum
+       y-axis from the actual minimum and maximum data values. Our example
+       would display slightly less than "260-0.001" to slightly more than
+       "260+0.001" (this feature was contributed by Sasha Mikheev).
 
-           Gridfitting is turned off for PDF, EPS, SVG output by default.
-
-       Grid
-           X-Axis
-               [--xx|----xx--ggrriidd _G_T_M::_G_S_T::_M_T_M::_M_S_T::_L_T_M::_L_S_T::_L_P_R::_L_F_M]
+       [--JJ|----aalltt--aauuttoossccaallee--mmiinn]
 
-               [--xx|----xx--ggrriidd nnoonnee]
+       Where "--alt-autoscale" will modify both the absolute maximum AND mini-
+       mum values, this option will only affect the minimum value. The maximum
+       value, if not defined on the command line, will be 0. This option can
+       be useful when graphing router traffic when the WAN line uses compres-
+       sion, and thus the throughput may be higher than the WAN line speed.
 
-               The x-axis label is quite complex to configure. If you don't
-               have very special needs it is probably best to rely on the
-               autoconfiguration to get this right. You can specify the string
-               "none" to suppress the grid and labels altogether.
+       [--MM|----aalltt--aauuttoossccaallee--mmaaxx]
 
-               The grid is defined by specifying a certain amount of time in
-               the _?_T_M positions. You can choose from "SECOND", "MINUTE",
-               "HOUR", "DAY", "WEEK", "MONTH" or "YEAR". Then you define how
-               many of these should pass between each line or label.  This
-               pair (_?_T_M_:_?_S_T) needs to be specified for the base grid (_G_?_?),
-               the major grid (_M_?_?) and the labels (_L_?_?). For the labels you
-               also must define a precision in _L_P_R and a _s_t_r_f_t_i_m_e format
-               string in _L_F_M.  _L_P_R defines where each label will be placed. If
-               it is zero, the label will be placed right under the corre-
-               sponding line (useful for hours, dates etcetera).  If you spec-
-               ify a number of seconds here the label is centered on this
-               interval (useful for Monday, January etcetera).
-
-                --x-grid MINUTE:10:HOUR:1:HOUR:4:0:%X
-
-               This places grid lines every 10 minutes, major grid lines every
-               hour, and labels every 4 hours. The labels are placed under the
-               major grid lines as they specify exactly that time.
-
-                --x-grid HOUR:8:DAY:1:DAY:1:86400:%A
-
-               This places grid lines every 8 hours, major grid lines and
-               labels each day. The labels are placed exactly between two
-               major grid lines as they specify the complete day and not just
-               midnight.
+       Where "--alt-autoscale" will modify both the absolute maximum AND mini-
+       mum values, this option will only affect the maximum value. The minimum
+       value, if not defined on the command line, will be 0. This option can
+       be useful when graphing router traffic when the WAN line uses compres-
+       sion, and thus the throughput may be higher than the WAN line speed.
 
-           Y-Axis
-               [--yy|----yy--ggrriidd _g_r_i_d _s_t_e_p::_l_a_b_e_l _f_a_c_t_o_r]
+       [--NN|----nnoo--ggrriiddffiitt]
 
-               [--yy|----yy--ggrriidd nnoonnee]
+       In order to avoid anti-aliasing blurring effects rrdtool snaps points
+       to device resolution pixels, this results in a crisper aperance. If
+       this is not to your liking, you can use this switch to turn this
+       behaviour off.
 
-               Y-axis grid lines appear at each _g_r_i_d _s_t_e_p interval.  Labels
-               are placed every _l_a_b_e_l _f_a_c_t_o_r lines.  You can specify "-y none"
-               to suppress the grid and labels altogether.  The default for
-               this option is to automatically select sensible values.
+       Gridfitting is turned off for PDF, EPS, SVG output by default.
+
+       GGrriidd
+
+
+       X-Axis
+           [--xx|----xx--ggrriidd _G_T_M::_G_S_T::_M_T_M::_M_S_T::_L_T_M::_L_S_T::_L_P_R::_L_F_M]
+
+           [--xx|----xx--ggrriidd nnoonnee]
+
+           The x-axis label is quite complex to configure. If you don't have
+           very special needs it is probably best to rely on the autoconfigu-
+           ration to get this right. You can specify the string "none" to sup-
+           press the grid and labels altogether.
+
+           The grid is defined by specifying a certain amount of time in the
+           _?_T_M positions. You can choose from "SECOND", "MINUTE", "HOUR",
+           "DAY", "WEEK", "MONTH" or "YEAR". Then you define how many of these
+           should pass between each line or label.  This pair (_?_T_M_:_?_S_T) needs
+           to be specified for the base grid (_G_?_?), the major grid (_M_?_?) and
+           the labels (_L_?_?). For the labels you also must define a precision
+           in _L_P_R and a _s_t_r_f_t_i_m_e format string in _L_F_M.  _L_P_R defines where each
+           label will be placed. If it is zero, the label will be placed right
+           under the corresponding line (useful for hours, dates etcetera).
+           If you specify a number of seconds here the label is centered on
+           this interval (useful for Monday, January etcetera).
+
+            --x-grid MINUTE:10:HOUR:1:HOUR:4:0:%X
+
+           This places grid lines every 10 minutes, major grid lines every
+           hour, and labels every 4 hours. The labels are placed under the
+           major grid lines as they specify exactly that time.
+
+            --x-grid HOUR:8:DAY:1:DAY:1:86400:%A
+
+           This places grid lines every 8 hours, major grid lines and labels
+           each day. The labels are placed exactly between two major grid
+           lines as they specify the complete day and not just midnight.
+
+       Y-Axis
+           [--yy|----yy--ggrriidd _g_r_i_d _s_t_e_p::_l_a_b_e_l _f_a_c_t_o_r]
+
+           [--yy|----yy--ggrriidd nnoonnee]
+
+           Y-axis grid lines appear at each _g_r_i_d _s_t_e_p interval.  Labels are
+           placed every _l_a_b_e_l _f_a_c_t_o_r lines.  You can specify "-y none" to sup-
+           press the grid and labels altogether.  The default for this option
+           is to automatically select sensible values.
+
+           If you have set --y-grid to 'none' not only the labels get
+           supressed, also the space reserved for the labels is removed. You
+           can still add space manually if you use the --units-length command
+           to explicitly reserve space.
+
+           [--YY|----aalltt--yy--ggrriidd]
+
+           Place the Y grid dynamically based on the graph's Y range. The
+           algorithm ensures that you always have a grid, that there are
+           enough but not too many grid lines, and that the grid is metric.
+           That is the grid lines are placed every 1, 2, 5 or 10 units. This
+           parameter will also ensure that you get enough decimals displayed
+           even if your graph goes from 69.998 to 70.001.  (contributed by
+           Sasha Mikheev).
 
-               If you have set --y-grid to 'none' not only the labels get
-               supressed, also the space reserved for the labels is removed.
-               You can still add space manually if you use the --units-length
-               command to explicitly reserve space.
+           [--oo|----llooggaarriitthhmmiicc]
 
-               [--YY|----aalltt--yy--ggrriidd]
+           Logarithmic y-axis scaling.
 
-               Place the Y grid dynamically based on the graph's Y range. The
-               algorithm ensures that you always have a grid, that there are
-               enough but not too many grid lines, and that the grid is met-
-               ric. That is the grid lines are placed every 1, 2, 5 or 10
-               units. This parameter will also ensure that you get enough dec-
-               imals displayed even if your graph goes from 69.998 to 70.001.
-               (contributed by Sasha Mikheev).
+           [--XX|----uunniittss--eexxppoonneenntt _v_a_l_u_e]
 
-               [--oo|----llooggaarriitthhmmiicc]
+           This sets the 10**exponent scaling of the y-axis values. Normally,
+           values will be scaled to the appropriate units (k, M, etc.).  How-
+           ever, you may wish to display units always in k (Kilo, 10e3) even
+           if the data is in the M (Mega, 10e6) range, for instance. Value
+           should be an integer which is a multiple of 3 between -18 and 18
+           inclusively.  It is the exponent on the units you wish to use. For
+           example, use 3 to display the y-axis values in k (Kilo, 10e3, thou-
+           sands), use -6 to display the y-axis values in u (Micro, 10e-6,
+           millionths).  Use a value of 0 to prevent any scaling of the y-axis
+           values.
 
-               Logarithmic y-axis scaling.
+           This option is very effective at confusing the heck out of the
+           default rrdtool autoscaler and grid painter. If rrdtool detects
+           that it is not successful in labeling the graph under the given
+           circumstances, it will switch to the more robust ----aalltt--yy--ggrriidd mode.
 
-               [--XX|----uunniittss--eexxppoonneenntt _v_a_l_u_e]
+           [--LL|----uunniittss--lleennggtthh _v_a_l_u_e]
 
-               This sets the 10**exponent scaling of the y-axis values. Nor-
-               mally, values will be scaled to the appropriate units (k, M,
-               etc.).  However, you may wish to display units always in k
-               (Kilo, 10e3) even if the data is in the M (Mega, 10e6) range,
-               for instance. Value should be an integer which is a multiple of
-               3 between -18 and 18 inclusively.  It is the exponent on the
-               units you wish to use. For example, use 3 to display the y-axis
-               values in k (Kilo, 10e3, thousands), use -6 to display the
-               y-axis values in u (Micro, 10e-6, millionths).  Use a value of
-               0 to prevent any scaling of the y-axis values.
+           How many digits should rrdtool assume the y-axis labels to be? You
+           may have to use this option to make enough space once you start
+           fideling with the y-axis labeling.
 
-               This option is very effective at confusing the heck out of the
-               default rrdtool autoscaler and grid painter. If rrdtool detects
-               that it is not successful in labeling the graph under the given
-               circumstances, it will switch to the more robust ----aalltt--yy--ggrriidd
-               mode.
+           [----uunniittss==ssii]
 
-               [--LL|----uunniittss--lleennggtthh _v_a_l_u_e]
+           With this option y-axis values on logarithmic graphs will be scaled
+           to the appropriate units (k, M, etc.) instead of using exponential
+           notation.  Note that for linear graphs, SI notation is used by
+           default.
 
-               How many digits should rrdtool assume the y-axis labels to be?
-               You may have to use this option to make enough space once you
-               start fideling with the y-axis labeling.
+       MMiisscceellllaanneeoouuss
 
-               [----uunniittss==ssii]
+       [--zz|----llaazzyy]
 
-               With this option y-axis values on logarithmic graphs will be
-               scaled to the appropriate units (k, M, etc.) instead of using
-               exponential notation.  Note that for linear graphs, SI notation
-               is used by default.
+       Only generate the graph if the current graph is out of date or not
+       existent.
 
-       Miscellaneous
-           [--zz|----llaazzyy]
+       [--ff|----iimmggiinnffoo _p_r_i_n_t_f_s_t_r]
 
-           Only generate the graph if the current graph is out of date or not
-           existent.
+       After the image has been created, the graph function uses printf
+       together with this format string to create output similar to the PRINT
+       function, only that the printf function is supplied with the parameters
+       _f_i_l_e_n_a_m_e, _x_s_i_z_e and _y_s_i_z_e. In order to generate an IIMMGG tag suitable for
+       including the graph into a web page, the command line would look like
+       this:
 
-           [--ff|----iimmggiinnffoo _p_r_i_n_t_f_s_t_r]
+        --imginfo '<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">'
 
-           After the image has been created, the graph function uses printf
-           together with this format string to create output similar to the
-           PRINT function, only that the printf function is supplied with the
-           parameters _f_i_l_e_n_a_m_e, _x_s_i_z_e and _y_s_i_z_e. In order to generate an IIMMGG
-           tag suitable for including the graph into a web page, the command
-           line would look like this:
+       [--cc|----ccoolloorr _C_O_L_O_R_T_A_G#_r_r_g_g_b_b[_a_a]]
 
-            --imginfo '<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">'
+       Override the default colors for the standard elements of the graph. The
+       _C_O_L_O_R_T_A_G is one of "BACK" background, "CANVAS" for the background of
+       the actual graph, "SHADEA" for the left and top border, "SHADEB" for
+       the right and bottom border, "GRID", "MGRID" for the major grid, "FONT"
+       for the color of the font, "AXIS" for the axis of the graph, "FRAME"
+       for the line around the color spots and finally "ARROW" for the arrow
+       head pointing up and forward. Each color is composed out of three hex-
+       adecimal numbers specifying its rgb color component (00 is off, FF is
+       maximum) of red, green and blue. Optionally you may add another hex-
+       adecimal number specifying the transparency (FF is solid). You may set
+       this option several times to alter multiple defaults.
 
-           [--cc|----ccoolloorr _C_O_L_O_R_T_A_G#_r_r_g_g_b_b[_a_a]]
+       A green arrow is made by: "--color ARROW#00FF00"
 
-           Override the default colors for the standard elements of the graph.
-           The _C_O_L_O_R_T_A_G is one of "BACK" background, "CANVAS" for the back-
-           ground of the actual graph, "SHADEA" for the left and top border,
-           "SHADEB" for the right and bottom border, "GRID", "MGRID" for the
-           major grid, "FONT" for the color of the font, "AXIS" for the axis
-           of the graph, "FRAME" for the line around the color spots and
-           finally "ARROW" for the arrow head pointing up and forward. Each
-           color is composed out of three hexadecimal numbers specifying its
-           rgb color component (00 is off, FF is maximum) of red, green and
-           blue. Optionally you may add another hexadecimal number specifying
-           the transparency (FF is solid). You may set this option several
-           times to alter multiple defaults.
+       [----zzoooomm _f_a_c_t_o_r]
 
-           A green arrow is made by: "--color ARROW#00FF00"
+       Zoom the graphics by the given amount. The factor must be > 0
 
-           [----zzoooomm _f_a_c_t_o_r]
+       [--nn|----ffoonntt _F_O_N_T_T_A_G::_s_i_z_e::[_f_o_n_t]]
 
-           Zoom the graphics by the given amount. The factor must be > 0
+       This lets you customize which font to use for the various text elements
+       on the RRD graphs. "DEFAULT" sets the default value for all elements,
+       "TITLE" for the title, "AXIS" for the axis labels, "UNIT" for the ver-
+       tical unit label, "LEGEND" for the graph legend.
 
-           [--nn|----ffoonntt _F_O_N_T_T_A_G::_s_i_z_e::[_f_o_n_t]]
+       Use Times for the title: "--font TITLE:13:Times"
 
-           This lets you customize which font to use for the various text ele-
-           ments on the RRD graphs. "DEFAULT" sets the default value for all
-           elements, "TITLE" for the title, "AXIS" for the axis labels, "UNIT"
-           for the vertical unit label, "LEGEND" for the graph legend.
+       If you do not give a font string you can modify just the sice of the
+       default font: "--font TITLE:13:".
 
-           Use Times for the title: "--font TITLE:13:Times"
+       If you specify the size 0 then you can modify just the font without
+       touching the size. This is especially usefull for altering the default
+       font without resetting the default fontsizes: "--font
+       DEFAULT:0:Courier".
 
-           If you do not give a font string you can modify just the sice of
-           the default font: "--font TITLE:13:".
+       RRDtool comes with a preset default font. You can set the environment
+       variable "RRD_DEFAULT_FONT" if you want to change this.
 
-           If you specify the size 0 then you can modify just the font without
-           touching the size. This is especially usefull for altering the
-           default font without resetting the default fontsizes: "--font
-           DEFAULT:0:Courier".
+       RRDtool uses Pango for its font handling. This means you can to use the
+       full Pango syntax when selecting your font:
 
-           RRDtool comes with a preset default font. You can set the environ-
-           ment variable "RRD_DEFAULT_FONT" if you want to change this.
+       The font name has the form "[_F_A_M_I_L_Y_-_L_I_S_T] [_S_T_Y_L_E_-_O_P_T_I_O_N_S] [_S_I_Z_E]",
+       where _F_A_M_I_L_Y_-_L_I_S_T is a comma separated list of families optionally ter-
+       minated by a comma, _S_T_Y_L_E___O_P_T_I_O_N_S is a whitespace separated list of
+       words where each WORD describes one of style, variant, weight, stretch,
+       or gravity, and _S_I_Z_E is a decimal number (size in points) or optionally
+       followed by the unit modifier "px" for absolute size. Any one of the
+       options may be absent.
 
-           RRDtool uses Pango for its font handling. This means you can to use
-           the full Pango syntax when selecting your font:
+       [--RR|----ffoonntt--rreennddeerr--mmooddee {nnoorrmmaall,lliigghhtt,mmoonnoo}]
 
-           The font name has the form "[_F_A_M_I_L_Y_-_L_I_S_T] [_S_T_Y_L_E_-_O_P_T_I_O_N_S] [_S_I_Z_E]",
-           where _F_A_M_I_L_Y_-_L_I_S_T is a comma separated list of families optionally
-           terminated by a comma, _S_T_Y_L_E___O_P_T_I_O_N_S is a whitespace separated list
-           of words where each WORD describes one of style, variant, weight,
-           stretch, or gravity, and _S_I_Z_E is a decimal number (size in points)
-           or optionally followed by the unit modifier "px" for absolute size.
-           Any one of the options may be absent.
+       There are 3 font render modes:
 
-           [--RR|----ffoonntt--rreennddeerr--mmooddee {nnoorrmmaall,lliigghhtt,mmoonnoo}]
+       nnoorrmmaall: Full Hinting and Antialiasing (default)
 
-           There are 3 font render modes:
+       lliigghhtt: Slight Hinting and Antialiasing
 
-           nnoorrmmaall: Full Hinting and Antialiasing (default)
+       mmoonnoo: Full Hinting and NO Antialiasing
 
-           lliigghhtt: Slight Hinting and Antialiasing
+       [--BB|----ffoonntt--ssmmooootthhiinngg--tthhrreesshhoolldd _s_i_z_e]
 
-           mmoonnoo: Full Hinting and NO Antialiasing
+       (this gets ignored in 1.3 for now!)
 
-           [--BB|----ffoonntt--ssmmooootthhiinngg--tthhrreesshhoolldd _s_i_z_e]
+       This specifies the largest font size which will be rendered bitmapped,
+       that is, without any font smoothing. By default, no text is rendered
+       bitmapped.
 
-           (this gets ignored in 1.3 for now!)
+       [--PP|----ppaannggoo--mmaarrkkuupp]
 
-           This specifies the largest font size which will be rendered
-           bitmapped, that is, without any font smoothing. By default, no text
-           is rendered bitmapped.
+       All text in rrdtool is rendered using Pango. With the ----ppaannggoo--mmaarrkkuupp
+       option, all text will be processed by pango markup. This allows to
+       embed some simple html like markup tags using
 
-           [--PP|----ppaannggoo--mmaarrkkuupp]
+        <span key="value">text</span>
 
-           All text in rrdtool is rendered using Pango. With the
-           ----ppaannggoo--mmaarrkkuupp option, all text will be processed by pango markup.
-           This allows to embed some simple html like markup tags using
+       Apart from the verbose syntax, there are also the following short tags
+       available.
 
-            <span key="value">text</span>
+        b     Bold
+        big   Makes font relatively larger, equivalent to <span size="larger">
+        i     Italic
+        s     Strikethrough
+        sub   Subscript
+        sup   Superscript
+        small Makes font relatively smaller, equivalent to <span size="smaller">
+        tt    Monospace font
+        u     Underline
 
-           Apart from the verbose syntax, there are also the following short
-           tags available.
+       More details on <http://developer.gnome.org/doc/API/2.0/pango/Pango-
+       MarkupFormat.html>.
 
-            b     Bold
-            big   Makes font relatively larger, equivalent to <span size="larger">
-            i     Italic
-            s     Strikethrough
-            sub   Subscript
-            sup   Superscript
-            small Makes font relatively smaller, equivalent to <span size="smaller">
-            tt    Monospace font
-            u     Underline
+       [--GG|----ggrraapphh--rreennddeerr--mmooddee {nnoorrmmaall,mmoonnoo}]
 
-           More details on <http://developer.gnome.org/doc/API/2.0/pango/Pan-
-           goMarkupFormat.html>.
+       There are 2 render modes:
 
-           [--GG|----ggrraapphh--rreennddeerr--mmooddee {nnoorrmmaall,mmoonnoo}]
+       nnoorrmmaall: Graphs are fully Antialiased (default)
 
-           There are 2 render modes:
+       mmoonnoo: No Antialiasing
 
-           nnoorrmmaall: Graphs are fully Antialiased (default)
+       [--EE|----ssllooppee--mmooddee]
 
-           mmoonnoo: No Antialiasing
+       RRDtool graphs are composed of stair case curves by default. This is in
+       line with the way RRDtool calculates its data. Some people favor a more
+       'organic' look for their graphs even though it is not all that true.
 
-           [--EE|----ssllooppee--mmooddee]
+       [--aa|----iimmggffoorrmmaatt PPNNGG|SSVVGG|EEPPSS|PPDDFF]
 
-           RRDtool graphs are composed of stair case curves by default. This
-           is in line with the way RRDtool calculates its data. Some people
-           favor a more 'organic' look for their graphs even though it is not
-           all that true.
+       Image format for the generated graph. For the vector formats you can
+       choose among the standard Postscript fonts Courier-Bold,
+       Courier-BoldOblique, Courier-Oblique, Courier, Helvetica-Bold, Hel-
+       vetica-BoldOblique, Helvetica-Oblique, Helvetica, Symbol, Times-Bold,
+       Times-BoldItalic, Times-Italic, Times-Roman, and ZapfDingbats.
 
-           [--aa|----iimmggffoorrmmaatt PPNNGG|SSVVGG|EEPPSS|PPDDFF]
+       [--ii|----iinntteerrllaacceedd]
 
-           Image format for the generated graph. For the vector formats you
-           can choose among the standard Postscript fonts Courier-Bold,
-           Courier-BoldOblique, Courier-Oblique, Courier, Helvetica-Bold, Hel-
-           vetica-BoldOblique, Helvetica-Oblique, Helvetica, Symbol,
-           Times-Bold, Times-BoldItalic, Times-Italic, Times-Roman, and ZapfD-
-           ingbats.
+       (this gets ignored in 1.3 for now!)
 
-           [--ii|----iinntteerrllaacceedd]
+       If images are interlaced they become visible on browsers more quickly.
 
-           (this gets ignored in 1.3 for now!)
+       [--gg|----nnoo--lleeggeenndd]
 
-           If images are interlaced they become visible on browsers more
-           quickly.
+       Suppress generation of the legend; only render the graph.
 
-           [--gg|----nnoo--lleeggeenndd]
+       [--FF|----ffoorrccee--rruulleess--lleeggeenndd]
 
-           Suppress generation of the legend; only render the graph.
+       Force the generation of HRULE and VRULE legends even if those HRULE or
+       VRULE will not be drawn because out of graph boundaries (mimics
+       behaviour of pre 1.0.42 versions).
 
-           [--FF|----ffoorrccee--rruulleess--lleeggeenndd]
+       [--TT|----ttaabbwwiiddtthh _v_a_l_u_e]
 
-           Force the generation of HRULE and VRULE legends even if those HRULE
-           or VRULE will not be drawn because out of graph boundaries (mimics
-           behaviour of pre 1.0.42 versions).
+       By default the tab-width is 40 pixels, use this option to change it.
 
-           [--TT|----ttaabbwwiiddtthh _v_a_l_u_e]
+       [--bb|----bbaassee _v_a_l_u_e]
 
-           By default the tab-width is 40 pixels, use this option to change
-           it.
+       If you are graphing memory (and NOT network traffic) this switch should
+       be set to 1024 so that one Kb is 1024 byte. For traffic measurement, 1
+       kb/s is 1000 b/s.
 
-           [--bb|----bbaassee _v_a_l_u_e]
+       [--WW|----wwaatteerrmmaarrkk _s_t_r_i_n_g]
 
-           If you are graphing memory (and NOT network traffic) this switch
-           should be set to 1024 so that one Kb is 1024 byte. For traffic mea-
-           surement, 1 kb/s is 1000 b/s.
+       Adds the given string as a watermark, horizontally centred, at the bot-
+       tom of the graph.
 
-           [--WW|----wwaatteerrmmaarrkk _s_t_r_i_n_g]
+       DDaattaa aanndd vvaarriiaabblleess
 
-           Adds the given string as a watermark, horizontally centred, at the
-           bottom of the graph.
+       DDEEFF::_v_n_a_m_e==_r_r_d_f_i_l_e::_d_s_-_n_a_m_e::_C_F[::sstteepp==_s_t_e_p][::ssttaarrtt==_t_i_m_e][::eenndd==_t_i_m_e]
 
-       Data and variables
-           DDEEFF::_v_n_a_m_e==_r_r_d_f_i_l_e::_d_s_-_n_a_m_e::_C_F[::sstteepp==_s_t_e_p][::ssttaarrtt==_t_i_m_e][::eenndd==_t_i_m_e]
+       CCDDEEFF::_v_n_a_m_e==_R_P_N _e_x_p_r_e_s_s_i_o_n
 
-           CCDDEEFF::_v_n_a_m_e==_R_P_N _e_x_p_r_e_s_s_i_o_n
+       VVDDEEFF::_v_n_a_m_e==_R_P_N _e_x_p_r_e_s_s_i_o_n
 
-           VVDDEEFF::_v_n_a_m_e==_R_P_N _e_x_p_r_e_s_s_i_o_n
+       You need at least one DDEEFF statement to generate anything. The other
+       statements are useful but optional.  See rrdgraph_data and rrdgraph_rpn
+       for the exact format.
 
-           You need at least one DDEEFF statement to generate anything. The other
-           statements are useful but optional.  See rrdgraph_data and rrd-
-           graph_rpn for the exact format.
+       GGrraapphh aanndd pprriinntt eelleemmeennttss
 
-       Graph and print elements
-           You need at least one graph element to generate an image and/or at
-           least one print statement to generate a report.  See rrdgraph_graph
-           for the exact format.
+       You need at least one graph element to generate an image and/or at
+       least one print statement to generate a report.  See rrdgraph_graph for
+       the exact format.
 
        ggrraapphhvv
 
@@ -465,4 +462,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-06-05                       RRDGRAPH(1)
+1.3.0                             2008-06-11                       RRDGRAPH(1)
diff --git a/doc/rrdgraph_data.1 b/doc/rrdgraph_data.1
index 4b259b4..d0e5b20 100644
--- a/doc/rrdgraph_data.1
+++ b/doc/rrdgraph_data.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDGRAPH_DATA 1"
-.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdgraph_data \- preparing data for graphing in rrdtool graph
 .SH "SYNOPSIS"
diff --git a/doc/rrdgraph_data.txt b/doc/rrdgraph_data.txt
index b29b0e9..7d241aa 100644
--- a/doc/rrdgraph_data.txt
+++ b/doc/rrdgraph_data.txt
@@ -104,4 +104,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                  RRDGRAPH_DATA(1)
+1.3.0                             2008-03-15                  RRDGRAPH_DATA(1)
diff --git a/doc/rrdgraph_examples.1 b/doc/rrdgraph_examples.1
index e1d36fb..52a3249 100644
--- a/doc/rrdgraph_examples.1
+++ b/doc/rrdgraph_examples.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDGRAPH_EXAMPLES 1"
-.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3rc9" "rrdtool"
+.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdgraph_examples \- Examples for rrdtool graph
 .SH "SYNOPSIS"
diff --git a/doc/rrdgraph_examples.txt b/doc/rrdgraph_examples.txt
index 57ff36a..da34976 100644
--- a/doc/rrdgraph_examples.txt
+++ b/doc/rrdgraph_examples.txt
@@ -196,4 +196,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-25              RRDGRAPH_EXAMPLES(1)
+1.3.0                             2008-03-25              RRDGRAPH_EXAMPLES(1)
diff --git a/doc/rrdgraph_graph.1 b/doc/rrdgraph_graph.1
index 09940ba..952aee2 100644
--- a/doc/rrdgraph_graph.1
+++ b/doc/rrdgraph_graph.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDGRAPH_GRAPH 1"
-.TH RRDGRAPH_GRAPH 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDGRAPH_GRAPH 1 "2008-06-11" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdgraph_graph \- rrdtool graph command reference
 .SH "SYNOPSIS"
@@ -164,20 +164,20 @@ rrdgraph_graph \- rrdtool graph command reference
 These instructions allow you to generate your image or report.
 If you don't use any graph elements, no graph is generated.
 Similarly, no report is generated if you don't use print options.
-.SH "PRINT"
-.IX Header "PRINT"
-.IP "\fB\s-1PRINT:\s0\fR\fIvname\fR\fB:\fR\fIformat\fR[\fB:strftime\fR]" 4
-.IX Item "PRINT:vname:format[:strftime]"
+.Sh "\s-1PRINT\s0"
+.IX Subsection "PRINT"
+\fI\f(BI\s-1PRINT:\s0\fI\fIvname\fI\f(BI:\fI\fIformat\fI[\f(BI:strftime\fI]\fR
+.IX Subsection "PRINT:vname:format[:strftime]"
+.PP
 Depending on the context, either the value component or the time
 component of a \fB\s-1VDEF\s0\fR is printed using \fIformat\fR. It is an error
 to specify a \fIvname\fR generated by a \fB\s-1DEF\s0\fR or \fB\s-1CDEF\s0\fR.
-.Sp
+.PP
 Any text in \fIformat\fR is printed literally with one exception:
 The percent character introduces a formatter string. This string
 can be:
-.Sp
+.PP
 For printing values:
-.RS 4
 .IP "\fB%%\fR" 4
 .IX Item "%%"
 just prints a literal '%' character
@@ -201,9 +201,7 @@ magnitude unit. If there is no such unit yet, it tries to define
 one (just like \fB%s\fR) unless the value is zero, in which case the magnitude
 unit stays undefined. Thus, formatter strings using \fB%S\fR and no \fB%s\fR
 will all use the same magnitude unit except for zero values.
-.RE
-.RS 4
-.Sp
+.PP
 If you \s-1PRINT\s0 a \s-1VDEF\s0 value, you can also print the time associated with it by appending the string
 \&\fB:strftime\fR to the format. Note that rrdtool uses the strftime function of your OSs clibrary. This means that
 the conversion specifier may vary. Check the manual page if you are uncertain. The following is a list of
@@ -284,29 +282,35 @@ The time zone or name or abbreviation.
 .IP "\fB%%\fR" 4
 .IX Item "%%"
 A literal `%' character.
-.RE
-.RS 4
-.RE
-.IP "\fB\s-1PRINT:\s0\fR\fIvname\fR\fB:\fR\fI\s-1CF\s0\fR\fB:\fR\fIformat\fR" 4
-.IX Item "PRINT:vname:CF:format"
+.PP
+\fI\f(BI\s-1PRINT:\s0\fI\fIvname\fI\f(BI:\fI\fI\s-1CF\s0\fI\f(BI:\fI\fIformat\fI\fR
+.IX Subsection "PRINT:vname:CF:format"
+.PP
 \&\fIDeprecated. Use the new form of this command in new scripts.\fR
 The first form of this command is to be used with \fB\s-1CDEF\s0\fR \fIvname\fRs.
-.SH "GRAPH"
-.IX Header "GRAPH"
-.IP "\fB\s-1GPRINT\s0\fR\fB:\fR\fIvname\fR\fB:\fR\fIformat\fR" 4
-.IX Item "GPRINT:vname:format"
+.Sh "\s-1GRAPH\s0"
+.IX Subsection "GRAPH"
+\fI\f(BI\s-1GPRINT\s0\fI\f(BI:\fI\fIvname\fI\f(BI:\fI\fIformat\fI\fR
+.IX Subsection "GPRINT:vname:format"
+.PP
 This is the same as \f(CW\*(C`PRINT\*(C'\fR, but printed inside the graph.
-.IP "\fB\s-1GPRINT\s0\fR\fB:\fR\fIvname\fR\fB:\fR\fI\s-1CF\s0\fR\fB:\fR\fIformat\fR" 4
-.IX Item "GPRINT:vname:CF:format"
+.PP
+\fI\f(BI\s-1GPRINT\s0\fI\f(BI:\fI\fIvname\fI\f(BI:\fI\fI\s-1CF\s0\fI\f(BI:\fI\fIformat\fI\fR
+.IX Subsection "GPRINT:vname:CF:format"
+.PP
 \&\fIDeprecated. Use the new form of this command in new scripts.\fR
 This is the same as \f(CW\*(C`PRINT\*(C'\fR, but printed inside the graph.
-.IP "\fB\s-1COMMENT\s0\fR\fB:\fR\fItext\fR" 4
-.IX Item "COMMENT:text"
+.PP
+\fI\f(BI\s-1COMMENT\s0\fI\f(BI:\fI\fItext\fI\fR
+.IX Subsection "COMMENT:text"
+.PP
 Text is printed literally in the legend section of the graph. Note that in
 RRDtool 1.2 you have to escape colons in \s-1COMMENT\s0 text in the same way you
 have to escape them in \fB*PRINT\fR commands by writing \fB'\e:'\fR.
-.IP "\fB\s-1VRULE\s0\fR\fB:\fR\fItime\fR\fB#\fR\fIcolor\fR[\fB:\fR\fIlegend\fR][\fB:dashes\fR[\fB=\fR\fIon_s\fR[,\fIoff_s\fR[,\fIon_s\fR,\fIoff_s\fR]...]][\fB:dash\-offset=\fR\fIoffset\fR]]" 4
-.IX Item "VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
+\fI\f(BI\s-1VRULE\s0\fI\f(BI:\fI\fItime\fI\f(BI#\fI\fIcolor\fI[\f(BI:\fI\fIlegend\fI][\f(BI:dashes\fI[\f(BI=\fI\fIon_s\fI[,\fIoff_s\fI[,\fIon_s\fI,\fIoff_s\fI]...]][\f(BI:dash\-offset=\fI\fIoffset\fI]]\fR
+.IX Subsection "VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
 Draw a vertical line at \fItime\fR.  Its color is composed from three
 hexadecimal numbers specifying the rgb color components (00 is off, \s-1FF\s0 is
 maximum) red, green and blue followed by an optional alpha. Optionally, a legend box and string is
@@ -314,13 +318,17 @@ printed in the legend section. \fItime\fR may be a number or a variable
 from a \fB\s-1VDEF\s0\fR. It is an error to use \fIvname\fRs from \fB\s-1DEF\s0\fR or \fB\s-1CDEF\s0\fR here.
 Dashed lines can be drawn using the \fBdashes\fR modifier. See \fB\s-1LINE\s0\fR for more
 details.
-.IP "\fB\s-1HRULE\s0\fR\fB:\fR\fIvalue\fR\fB#\fR\fIcolor\fR[\fB:\fR\fIlegend\fR][\fB:dashes\fR[\fB=\fR\fIon_s\fR[,\fIoff_s\fR[,\fIon_s\fR,\fIoff_s\fR]...]][\fB:dash\-offset=\fR\fIoffset\fR]]" 4
-.IX Item "HRULE:value#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
+\fI\f(BI\s-1HRULE\s0\fI\f(BI:\fI\fIvalue\fI\f(BI#\fI\fIcolor\fI[\f(BI:\fI\fIlegend\fI][\f(BI:dashes\fI[\f(BI=\fI\fIon_s\fI[,\fIoff_s\fI[,\fIon_s\fI,\fIoff_s\fI]...]][\f(BI:dash\-offset=\fI\fIoffset\fI]]\fR
+.IX Subsection "HRULE:value#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
 Draw a horizontal line at \fIvalue\fR.  \s-1HRULE\s0 acts much like \s-1LINE\s0 except that
 will have no effect on the scale of the graph. If a \s-1HRULE\s0 is outside the
 graphing area it will just not be visible.
-.IP "\fB\s-1LINE\s0\fR[\fIwidth\fR]\fB:\fR\fIvalue\fR[\fB#\fR\fIcolor\fR][\fB:\fR[\fIlegend\fR][\fB:STACK\fR]][\fB:dashes\fR[\fB=\fR\fIon_s\fR[,\fIoff_s\fR[,\fIon_s\fR,\fIoff_s\fR]...]][\fB:dash\-offset=\fR\fIoffset\fR]]" 4
-.IX Item "LINE[width]:value[#color][:[legend][:STACK]][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
+\fI\f(BI\s-1LINE\s0\fI[\fIwidth\fI]\f(BI:\fI\fIvalue\fI[\f(BI#\fI\fIcolor\fI][\f(BI:\fI[\fIlegend\fI][\f(BI:STACK\fI]][\f(BI:dashes\fI[\f(BI=\fI\fIon_s\fI[,\fIoff_s\fI[,\fIon_s\fI,\fIoff_s\fI]...]][\f(BI:dash\-offset=\fI\fIoffset\fI]]\fR
+.IX Subsection "LINE[width]:value[#color][:[legend][:STACK]][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]]"
+.PP
 Draw a line of the specified width onto the graph. \fIwidth\fR can be a
 floating point number. If the color is not specified, the drawing is done
 \&'invisibly'. This is useful when stacking something else on top of this
@@ -329,7 +337,7 @@ the legend section if specified. The \fBvalue\fR can be generated by \fB\s-1DEF\
 \&\fB\s-1VDEF\s0\fR, and \fB\s-1CDEF\s0\fR.  If the optional \fB\s-1STACK\s0\fR modifier is used, this line
 is stacked on top of the previous element which can be a \fB\s-1LINE\s0\fR or an
 \&\fB\s-1AREA\s0\fR.
-.Sp
+.PP
 The \fBdashes\fR modifier enables dashed line style. Without any further options
 a symmetric dashed line with a segment length of 5 pixels will be drawn. The
 dash pattern can be changed if the \fBdashes=\fR parameter is followed by either
@@ -337,38 +345,48 @@ one value or an even number (1, 2, 4, 6, ...) of positive values. Each value
 provides the length of alternate \fIon_s\fR and \fIoff_s\fR portions of the
 stroke. The \fBdash-offset\fR parameter specifies an \fIoffset\fR into the pattern
 at which the stroke begins.
-.Sp
+.PP
 When you do not specify a color, you cannot specify a legend.  Should
 you want to use \s-1STACK\s0, use the \*(L"LINEx:<value>::STACK\*(R" form.
-.IP "\fB\s-1AREA\s0\fR\fB:\fR\fIvalue\fR[\fB#\fR\fIcolor\fR][\fB:\fR[\fIlegend\fR][\fB:STACK\fR]]" 4
-.IX Item "AREA:value[#color][:[legend][:STACK]]"
+.PP
+\fI\f(BI\s-1AREA\s0\fI\f(BI:\fI\fIvalue\fI[\f(BI#\fI\fIcolor\fI][\f(BI:\fI[\fIlegend\fI][\f(BI:STACK\fI]]\fR
+.IX Subsection "AREA:value[#color][:[legend][:STACK]]"
+.PP
 See \fB\s-1LINE\s0\fR, however the area between the x\-axis and the line will
 be filled.
-.IP "\fB\s-1TICK\s0\fR\fB:\fR\fIvname\fR\fB#\fR\fIrrggbb\fR[\fIaa\fR][\fB:\fR\fIfraction\fR[\fB:\fR\fIlegend\fR]]" 4
-.IX Item "TICK:vname#rrggbb[aa][:fraction[:legend]]"
+.PP
+\fI\f(BI\s-1TICK\s0\fI\f(BI:\fI\fIvname\fI\f(BI#\fI\fIrrggbb\fI[\fIaa\fI][\f(BI:\fI\fIfraction\fI[\f(BI:\fI\fIlegend\fI]]\fR
+.IX Subsection "TICK:vname#rrggbb[aa][:fraction[:legend]]"
+.PP
 Plot a tick mark (a vertical line) for each value of \fIvname\fR that is
 non-zero and not *UNKNOWN*. The \fIfraction\fR argument specifies the length of
 the tick mark as a fraction of the y\-axis; the default value is 0.1 (10% of
 the axis). Note that the color specification is not optional. The \s-1TICK\s0 marks normaly
 start at the lower edge of the graphing area. If the fraction is negative they start
 at the upper border of the graphing area.
-.IP "\fB\s-1SHIFT\s0\fR\fB:\fR\fIvname\fR\fB:\fR\fIoffset\fR" 4
-.IX Item "SHIFT:vname:offset"
+.PP
+\fI\f(BI\s-1SHIFT\s0\fI\f(BI:\fI\fIvname\fI\f(BI:\fI\fIoffset\fI\fR
+.IX Subsection "SHIFT:vname:offset"
+.PP
 Using this command \fBRRDtool\fR will graph the following elements
 with the specified offset.  For instance, you can specify an
 offset of (\ 7*24*60*60\ =\ )\ 604'800\ seconds to \*(L"look back\*(R" one
 week. Make sure to tell the viewer of your graph you did this ...
 As with the other graphing elements, you can specify a number or
 a variable here.
-.IP "\fB\s-1TEXTALIGN\s0\fR\fB:\fR{\fBleft\fR|\fBright\fR|\fBjustified\fR|\fBcenter\fR}" 4
-.IX Item "TEXTALIGN:{left|right|justified|center}"
+.PP
+\fI\f(BI\s-1TEXTALIGN\s0\fI\f(BI:\fI{\f(BIleft\fI|\f(BIright\fI|\f(BIjustified\fI|\f(BIcenter\fI}\fR
+.IX Subsection "TEXTALIGN:{left|right|justified|center}"
+.PP
 Labels are placed below the graph. When they overflow to the left, they wrap
 to the next line. By default, lines are justified left and right. The
 \&\fB\s-1TEXTALIGN\s0\fR function lets you change this default. This is a command and
 not an option, so that you can change the default several times in your
 argument list.
-.IP "\fB\s-1STACK\s0\fR\fB:\fR\fIvname\fR\fB#\fR\fIcolor\fR[\fB:\fR\fIlegend\fR]" 4
-.IX Item "STACK:vname#color[:legend]"
+.PP
+\fI\f(BI\s-1STACK\s0\fI\f(BI:\fI\fIvname\fI\f(BI#\fI\fIcolor\fI[\f(BI:\fI\fIlegend\fI]\fR
+.IX Subsection "STACK:vname#color[:legend]"
+.PP
 \&\fIDeprecated.  Use the \f(BI\s-1STACK\s0\fI modifiers on the other commands.\fR
 .PP
 \&\fBSome notes on stacking\fR
diff --git a/doc/rrdgraph_graph.html b/doc/rrdgraph_graph.html
index 0898515..f3f1a50 100644
--- a/doc/rrdgraph_graph.html
+++ b/doc/rrdgraph_graph.html
@@ -18,8 +18,33 @@
 	<li><a href="#name">NAME</a></li>
 	<li><a href="#synopsis">SYNOPSIS</a></li>
 	<li><a href="#description">DESCRIPTION</a></li>
-	<li><a href="#print">PRINT</a></li>
-	<li><a href="#graph">GRAPH</a></li>
+	<ul>
+
+		<li><a href="#print">PRINT</a></li>
+		<ul>
+
+			<li><a href="#print_vname_format__strftime_"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>format</em>[<strong>:strftime</strong>]</a></li>
+			<li><a href="#print_vname_cf_format"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></li>
+		</ul>
+
+		<li><a href="#graph">GRAPH</a></li>
+		<ul>
+
+			<li><a href="#gprint_vname_format"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>format</em></a></li>
+			<li><a href="#gprint_vname_cf_format"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></li>
+			<li><a href="#comment_text"><strong>COMMENT</strong><strong>:</strong><em>text</em></a></li>
+			<li><a href="#vrule_time_color__legend___dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>VRULE</strong><strong>:</strong><em>time</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></li>
+			<li><a href="#hrule_value_color__legend___dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>HRULE</strong><strong>:</strong><em>value</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></li>
+			<li><a href="#line_width__value__color____legend___stack____dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>LINE</strong>[<em>width</em>]<strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></li>
+			<li><a href="#area_value__color____legend___stack__"><strong>AREA</strong><strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]]</a></li>
+			<li><a href="#tick_vname_rrggbb_aa___fraction__legend__"><strong>TICK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>rrggbb</em>[<em>aa</em>][<strong>:</strong><em>fraction</em>[<strong>:</strong><em>legend</em>]]</a></li>
+			<li><a href="#shift_vname_offset"><strong>SHIFT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>offset</em></a></li>
+			<li><a href="#textalign__left_right_justified_center_"><strong>TEXTALIGN</strong><strong>:</strong>{<strong>left</strong>|<strong>right</strong>|<strong>justified</strong>|<strong>center</strong>}</a></li>
+			<li><a href="#stack_vname_color__legend_"><strong>STACK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>]</a></li>
+		</ul>
+
+	</ul>
+
 	<li><a href="#notes_on_legend_arguments">NOTES on legend arguments</a></li>
 	<ul>
 
@@ -64,12 +89,10 @@ If you don't use any graph elements, no graph is generated.
 Similarly, no report is generated if you don't use print options.</p>
 <p>
 </p>
-<hr />
-<h1><a name="print">PRINT</a></h1>
-<dl>
-<dt><strong><a name="item_print_3avname_3aformat_5b_3astrftime_5d"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>format</em>[<strong>:strftime</strong>]</a></strong></dt>
-
-<dd>
+<h2><a name="print">PRINT</a></h2>
+<p>
+</p>
+<h3><a name="print_vname_format__strftime_"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>format</em>[<strong>:strftime</strong>]</a></h3>
 <p>Depending on the context, either the value component or the time
 component of a <strong>VDEF</strong> is printed using <em>format</em>. It is an error
 to specify a <em>vname</em> generated by a <strong>DEF</strong> or <strong>CDEF</strong>.</p>
@@ -240,40 +263,32 @@ first Monday as the first day of week 01.</p>
 <p>A literal `%' character.</p>
 </dd>
 </dl>
-</dd>
-<dt><strong><a name="item_print_3avname_3acf_3aformat"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="print_vname_cf_format"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></h3>
 <p><em>Deprecated. Use the new form of this command in new scripts.</em>
 The first form of this command is to be used with <strong>CDEF</strong> <em>vname</em>s.</p>
-</dd>
-</dl>
 <p>
 </p>
-<hr />
-<h1><a name="graph">GRAPH</a></h1>
-<dl>
-<dt><strong><a name="item_gprint_3avname_3aformat"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>format</em></a></strong></dt>
-
-<dd>
+<h2><a name="graph">GRAPH</a></h2>
+<p>
+</p>
+<h3><a name="gprint_vname_format"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>format</em></a></h3>
 <p>This is the same as <code>PRINT</code>, but printed inside the graph.</p>
-</dd>
-<dt><strong><a name="item_gprint_3avname_3acf_3aformat"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="gprint_vname_cf_format"><strong>GPRINT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></h3>
 <p><em>Deprecated. Use the new form of this command in new scripts.</em>
 This is the same as <code>PRINT</code>, but printed inside the graph.</p>
-</dd>
-<dt><strong><a name="item_comment_3atext"><strong>COMMENT</strong><strong>:</strong><em>text</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="comment_text"><strong>COMMENT</strong><strong>:</strong><em>text</em></a></h3>
 <p>Text is printed literally in the legend section of the graph. Note that in
 RRDtool 1.2 you have to escape colons in COMMENT text in the same way you
 have to escape them in <strong>*PRINT</strong> commands by writing <strong>'\:'</strong>.</p>
-</dd>
-<dt><strong><a name="item_vrule_3atime_23color_5b_3alegend_5d_5b_3adashes_5b"><strong>VRULE</strong><strong>:</strong><em>time</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="vrule_time_color__legend___dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>VRULE</strong><strong>:</strong><em>time</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></h3>
 <p>Draw a vertical line at <em>time</em>.  Its color is composed from three
 hexadecimal numbers specifying the rgb color components (00 is off, FF is
 maximum) red, green and blue followed by an optional alpha. Optionally, a legend box and string is
@@ -281,17 +296,15 @@ printed in the legend section. <em>time</em> may be a number or a variable
 from a <strong>VDEF</strong>. It is an error to use <em>vname</em>s from <strong>DEF</strong> or <strong>CDEF</strong> here.
 Dashed lines can be drawn using the <strong>dashes</strong> modifier. See <strong>LINE</strong> for more
 details.</p>
-</dd>
-<dt><strong><a name="item_hrule_3avalue_23color_5b_3alegend_5d_5b_3adashes_5"><strong>HRULE</strong><strong>:</strong><em>value</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="hrule_value_color__legend___dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>HRULE</strong><strong>:</strong><em>value</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></h3>
 <p>Draw a horizontal line at <em>value</em>.  HRULE acts much like LINE except that
 will have no effect on the scale of the graph. If a HRULE is outside the
 graphing area it will just not be visible.</p>
-</dd>
-<dt><strong><a name="item_line_5bwidth_5d_3avalue_5b_23color_5d_5b_3a_5blege"><strong>LINE</strong>[<em>width</em>]<strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="line_width__value__color____legend___stack____dashes__on_s__off_s__on_s_off_s________dashoffset_offset__"><strong>LINE</strong>[<em>width</em>]<strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]][<strong>:dashes</strong>[<strong>=</strong><em>on_s</em>[,<em>off_s</em>[,<em>on_s</em>,<em>off_s</em>]...]][<strong>:dash-offset=</strong><em>offset</em>]]</a></h3>
 <p>Draw a line of the specified width onto the graph. <em>width</em> can be a
 floating point number. If the color is not specified, the drawing is done
 'invisibly'. This is useful when stacking something else on top of this
@@ -309,48 +322,41 @@ stroke. The <strong>dash-offset</strong> parameter specifies an <em>offset</em>
 at which the stroke begins.</p>
 <p>When you do not specify a color, you cannot specify a legend.  Should
 you want to use STACK, use the ``LINEx:&lt;value&gt;::STACK'' form.</p>
-</dd>
-<dt><strong><a name="item_area_3avalue_5b_23color_5d_5b_3a_5blegend_5d_5b_3a"><strong>AREA</strong><strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="area_value__color____legend___stack__"><strong>AREA</strong><strong>:</strong><em>value</em>[<strong>#</strong><em>color</em>][<strong>:</strong>[<em>legend</em>][<strong>:STACK</strong>]]</a></h3>
 <p>See <strong>LINE</strong>, however the area between the x-axis and the line will
 be filled.</p>
-</dd>
-<dt><strong><a name="item_tick_3avname_23rrggbb_5baa_5d_5b_3afraction_5b_3al"><strong>TICK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>rrggbb</em>[<em>aa</em>][<strong>:</strong><em>fraction</em>[<strong>:</strong><em>legend</em>]]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="tick_vname_rrggbb_aa___fraction__legend__"><strong>TICK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>rrggbb</em>[<em>aa</em>][<strong>:</strong><em>fraction</em>[<strong>:</strong><em>legend</em>]]</a></h3>
 <p>Plot a tick mark (a vertical line) for each value of <em>vname</em> that is
 non-zero and not *UNKNOWN*. The <em>fraction</em> argument specifies the length of
 the tick mark as a fraction of the y-axis; the default value is 0.1 (10% of
 the axis). Note that the color specification is not optional. The TICK marks normaly
 start at the lower edge of the graphing area. If the fraction is negative they start
 at the upper border of the graphing area.</p>
-</dd>
-<dt><strong><a name="item_shift_3avname_3aoffset"><strong>SHIFT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>offset</em></a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="shift_vname_offset"><strong>SHIFT</strong><strong>:</strong><em>vname</em><strong>:</strong><em>offset</em></a></h3>
 <p>Using this command <strong>RRDtool</strong> will graph the following elements
 with the specified offset.  For instance, you can specify an
 offset of (&nbsp;7*24*60*60&nbsp;=&nbsp;)&nbsp;604'800&nbsp;seconds to ``look back'' one
 week. Make sure to tell the viewer of your graph you did this ...
 As with the other graphing elements, you can specify a number or
 a variable here.</p>
-</dd>
-<dt><strong><a name="item_textalign_3a_7bleft_7cright_7cjustified_7ccenter_7"><strong>TEXTALIGN</strong><strong>:</strong>{<strong>left</strong>|<strong>right</strong>|<strong>justified</strong>|<strong>center</strong>}</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="textalign__left_right_justified_center_"><strong>TEXTALIGN</strong><strong>:</strong>{<strong>left</strong>|<strong>right</strong>|<strong>justified</strong>|<strong>center</strong>}</a></h3>
 <p>Labels are placed below the graph. When they overflow to the left, they wrap
 to the next line. By default, lines are justified left and right. The
 <strong>TEXTALIGN</strong> function lets you change this default. This is a command and
 not an option, so that you can change the default several times in your
 argument list.</p>
-</dd>
-<dt><strong><a name="item_stack_3avname_23color_5b_3alegend_5d"><strong>STACK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>]</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="stack_vname_color__legend_"><strong>STACK</strong><strong>:</strong><em>vname</em><strong>#</strong><em>color</em>[<strong>:</strong><em>legend</em>]</a></h3>
 <p><em>Deprecated.  Use the <strong>STACK</strong> modifiers on the other commands.</em></p>
-</dd>
-</dl>
 <p><strong>Some notes on stacking</strong></p>
 <p>When stacking, an element is not placed above the X-axis but rather
 on top of the previous element.  There must be something to stack
diff --git a/doc/rrdgraph_graph.pod b/doc/rrdgraph_graph.pod
index f40877c..7f2a36b 100644
--- a/doc/rrdgraph_graph.pod
+++ b/doc/rrdgraph_graph.pod
@@ -38,12 +38,9 @@ These instructions allow you to generate your image or report.
 If you don't use any graph elements, no graph is generated.
 Similarly, no report is generated if you don't use print options.
 
-=head1 PRINT
+=head2 PRINT
 
-=over 4
-
-
-=item B<PRINT:>I<vname>B<:>I<format>[B<:strftime>]
+=head3 B<PRINT:>I<vname>B<:>I<format>[B<:strftime>]
 
 Depending on the context, either the value component or the time
 component of a B<VDEF> is printed using I<format>. It is an error
@@ -55,7 +52,7 @@ can be:
 
 For printing values:
 
-=over 4
+=over
 
 =item B<%%>
 
@@ -92,7 +89,7 @@ B<:strftime> to the format. Note that rrdtool uses the strftime function of your
 the conversion specifier may vary. Check the manual page if you are uncertain. The following is a list of
 conversion specifiers usually supported across the board. 
 
-=over 4
+=over
 
 =item B<%a>
 
@@ -195,33 +192,30 @@ A literal `%' character.
 
 =back
 
-=item B<PRINT:>I<vname>B<:>I<CF>B<:>I<format>
+=head3 B<PRINT:>I<vname>B<:>I<CF>B<:>I<format>
 
 I<Deprecated. Use the new form of this command in new scripts.>
 The first form of this command is to be used with B<CDEF> I<vname>s.
 
-=back
-
-=head1 GRAPH
 
-=over 4
+=head2 GRAPH
 
-=item B<GPRINT>B<:>I<vname>B<:>I<format>
+=head3 B<GPRINT>B<:>I<vname>B<:>I<format>
 
 This is the same as C<PRINT>, but printed inside the graph.
 
-=item B<GPRINT>B<:>I<vname>B<:>I<CF>B<:>I<format>
+=head3 B<GPRINT>B<:>I<vname>B<:>I<CF>B<:>I<format>
 
 I<Deprecated. Use the new form of this command in new scripts.>
 This is the same as C<PRINT>, but printed inside the graph.
 
-=item B<COMMENT>B<:>I<text>
+=head3 B<COMMENT>B<:>I<text>
 
 Text is printed literally in the legend section of the graph. Note that in
 RRDtool 1.2 you have to escape colons in COMMENT text in the same way you
 have to escape them in B<*PRINT> commands by writing B<'\:'>.
 
-=item B<VRULE>B<:>I<time>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
+=head3 B<VRULE>B<:>I<time>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
 Draw a vertical line at I<time>.  Its color is composed from three
 hexadecimal numbers specifying the rgb color components (00 is off, FF is
@@ -231,13 +225,13 @@ from a B<VDEF>. It is an error to use I<vname>s from B<DEF> or B<CDEF> here.
 Dashed lines can be drawn using the B<dashes> modifier. See B<LINE> for more
 details.
 
-=item B<HRULE>B<:>I<value>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
+=head3 B<HRULE>B<:>I<value>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
 Draw a horizontal line at I<value>.  HRULE acts much like LINE except that
 will have no effect on the scale of the graph. If a HRULE is outside the
 graphing area it will just not be visible.
 
-=item B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>]][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
+=head3 B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>]][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
 Draw a line of the specified width onto the graph. I<width> can be a
 floating point number. If the color is not specified, the drawing is done
@@ -259,12 +253,12 @@ at which the stroke begins.
 When you do not specify a color, you cannot specify a legend.  Should
 you want to use STACK, use the "LINEx:<value>::STACK" form.
 
-=item B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>]]
+=head3 B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>]]
 
 See B<LINE>, however the area between the x-axis and the line will
 be filled.
 
-=item B<TICK>B<:>I<vname>B<#>I<rrggbb>[I<aa>][B<:>I<fraction>[B<:>I<legend>]]
+=head3 B<TICK>B<:>I<vname>B<#>I<rrggbb>[I<aa>][B<:>I<fraction>[B<:>I<legend>]]
 
 Plot a tick mark (a vertical line) for each value of I<vname> that is
 non-zero and not *UNKNOWN*. The I<fraction> argument specifies the length of
@@ -273,7 +267,7 @@ the axis). Note that the color specification is not optional. The TICK marks nor
 start at the lower edge of the graphing area. If the fraction is negative they start
 at the upper border of the graphing area.
 
-=item B<SHIFT>B<:>I<vname>B<:>I<offset>
+=head3 B<SHIFT>B<:>I<vname>B<:>I<offset>
 
 Using this command B<RRDtool> will graph the following elements
 with the specified offset.  For instance, you can specify an
@@ -282,7 +276,7 @@ week. Make sure to tell the viewer of your graph you did this ...
 As with the other graphing elements, you can specify a number or
 a variable here.
 
-=item B<TEXTALIGN>B<:>{B<left>|B<right>|B<justified>|B<center>}
+=head3 B<TEXTALIGN>B<:>{B<left>|B<right>|B<justified>|B<center>}
 
 Labels are placed below the graph. When they overflow to the left, they wrap
 to the next line. By default, lines are justified left and right. The
@@ -312,7 +306,7 @@ argument list.
 
 =pod
 
-=item B<STACK>B<:>I<vname>B<#>I<color>[B<:>I<legend>]
+=head3 B<STACK>B<:>I<vname>B<#>I<color>[B<:>I<legend>]
 
 I<Deprecated.  Use the B<STACK> modifiers on the other commands.>
 
diff --git a/doc/rrdgraph_graph.txt b/doc/rrdgraph_graph.txt
index 9629825..ae59923 100644
--- a/doc/rrdgraph_graph.txt
+++ b/doc/rrdgraph_graph.txt
@@ -41,198 +41,205 @@ DDEESSCCRRIIPPTTIIOONN
        don't use any graph elements, no graph is generated.  Similarly, no
        report is generated if you don't use print options.
 
-PPRRIINNTT
-       PPRRIINNTT::_v_n_a_m_e::_f_o_r_m_a_t[::ssttrrffttiimmee]
-           Depending on the context, either the value component or the time
-           component of a VVDDEEFF is printed using _f_o_r_m_a_t. It is an error to
-           specify a _v_n_a_m_e generated by a DDEEFF or CCDDEEFF.
+       PPRRIINNTT
 
-           Any text in _f_o_r_m_a_t is printed literally with one exception: The
-           percent character introduces a formatter string. This string can
-           be:
+       _PP_RR_II_NN_TT_::_v_n_a_m_e_::_f_o_r_m_a_t_[_::_ss_tt_rr_ff_tt_ii_mm_ee_]
 
-           For printing values:
+       Depending on the context, either the value component or the time compo-
+       nent of a VVDDEEFF is printed using _f_o_r_m_a_t. It is an error to specify a
+       _v_n_a_m_e generated by a DDEEFF or CCDDEEFF.
 
-           %%%%  just prints a literal '%' character
+       Any text in _f_o_r_m_a_t is printed literally with one exception: The percent
+       character introduces a formatter string. This string can be:
 
-           %%##..##llee
-               prints numbers like 1.2346e+04. The optional integers # denote
-               field width and decimal precision.
+       For printing values:
 
-           %%##..##llff
-               prints numbers like 12345.6789, with optional field width and
-               precision.
+       %%%%  just prints a literal '%' character
 
-           %%ss  place this after %%llee, %%llff or %%llgg. This will be replaced by the
-               appropriate SI magnitude unit and the value will be scaled
-               accordingly (123456 -> 123.456 k).
+       %%##..##llee
+           prints numbers like 1.2346e+04. The optional integers # denote
+           field width and decimal precision.
 
-           %%SS  is similar to %%ss. It does, however, use a previously defined
-               magnitude unit. If there is no such unit yet, it tries to
-               define one (just like %%ss) unless the value is zero, in which
-               case the magnitude unit stays undefined. Thus, formatter
-               strings using %%SS and no %%ss will all use the same magnitude unit
-               except for zero values.
+       %%##..##llff
+           prints numbers like 12345.6789, with optional field width and pre-
+           cision.
 
-           If you PRINT a VDEF value, you can also print the time associated
-           with it by appending the string ::ssttrrffttiimmee to the format. Note that
-           rrdtool uses the strftime function of your OSs clibrary. This means
-           that the conversion specifier may vary. Check the manual page if
-           you are uncertain. The following is a list of conversion specifiers
-           usually supported across the board.
+       %%ss  place this after %%llee, %%llff or %%llgg. This will be replaced by the
+           appropriate SI magnitude unit and the value will be scaled accord-
+           ingly (123456 -> 123.456 k).
 
-           %%aa  The abbreviated weekday name according to the current locale.
+       %%SS  is similar to %%ss. It does, however, use a previously defined magni-
+           tude unit. If there is no such unit yet, it tries to define one
+           (just like %%ss) unless the value is zero, in which case the magni-
+           tude unit stays undefined. Thus, formatter strings using %%SS and no
+           %%ss will all use the same magnitude unit except for zero values.
 
-           %%AA  The full weekday name according to the current locale.
+       If you PRINT a VDEF value, you can also print the time associated with
+       it by appending the string ::ssttrrffttiimmee to the format. Note that rrdtool
+       uses the strftime function of your OSs clibrary. This means that the
+       conversion specifier may vary. Check the manual page if you are uncer-
+       tain. The following is a list of conversion specifiers usually sup-
+       ported across the board.
 
-           %%bb  The abbreviated month name according to the current locale.
+       %%aa  The abbreviated weekday name according to the current locale.
 
-           %%BB  The full month name according to the current locale.
+       %%AA  The full weekday name according to the current locale.
 
-           %%cc  The preferred date and time representation for the current
-               locale.
+       %%bb  The abbreviated month name according to the current locale.
 
-           %%dd  The day of the month as a decimal number (range 01 to 31).
+       %%BB  The full month name according to the current locale.
 
-           %%HH  The hour as a decimal number using a 24-hour clock (range 00 to
-               23).
+       %%cc  The preferred date and time representation for the current locale.
 
-           %%II  The hour as a decimal number using a 12-hour clock (range 01 to
-               12).
+       %%dd  The day of the month as a decimal number (range 01 to 31).
 
-           %%jj  The day of the year as a decimal number (range 001 to 366).
+       %%HH  The hour as a decimal number using a 24-hour clock (range 00 to
+           23).
 
-           %%mm  The month as a decimal number (range 01 to 12).
+       %%II  The hour as a decimal number using a 12-hour clock (range 01 to
+           12).
 
-           %%MM  The minute as a decimal number (range 00 to 59).
+       %%jj  The day of the year as a decimal number (range 001 to 366).
 
-           %%pp  Either `AM' or `PM' according to the given time value, or the
-               corresponding strings for the current locale.  Noon is treated
-               as `pm' and midnight as `am'.  Note that in many locales and
-               `pm' notation is unsupported and in such cases %p will return
-               an empty string.
+       %%mm  The month as a decimal number (range 01 to 12).
 
-           %%SS  The second as a decimal number (range 00 to 61).
+       %%MM  The minute as a decimal number (range 00 to 59).
 
-           %%UU  The  week  number  of  the current year as a decimal number,
-               range 00 to 53, starting with the first Sunday as the first day
-               of week 01. See also %V and %W.
+       %%pp  Either `AM' or `PM' according to the given time value, or the cor-
+           responding strings for the current locale.  Noon is treated as `pm'
+           and midnight as `am'.  Note that in many locales and `pm' notation
+           is unsupported and in such cases %p will return an empty string.
 
-           %%VV  The ISO 8601:1988 week number of the current year as a decimal
-               number, range 01 to  53,  where week  1 is the first week that
-               has at least 4 days in the current year, and with Monday as the
-               first day of the week. See also %U and %W.
+       %%SS  The second as a decimal number (range 00 to 61).
 
-           %%ww  The day of the week as a decimal, range 0 to 6, Sunday being 0.
-               See also %u.
+       %%UU  The  week  number  of  the current year as a decimal number, range
+           00 to 53, starting with the first Sunday as the first day of week
+           01. See also %V and %W.
 
-           %%WW  The week number of the current year as a decimal number, range
-               00 to  53,  starting  with  the first Monday as the first day
-               of week 01.
+       %%VV  The ISO 8601:1988 week number of the current year as a decimal num-
+           ber, range 01 to  53,  where week  1 is the first week that has at
+           least 4 days in the current year, and with Monday as the first day
+           of the week. See also %U and %W.
 
-           %%xx  The preferred date representation for the current locale with-
-               out the time.
+       %%ww  The day of the week as a decimal, range 0 to 6, Sunday being 0.
+           See also %u.
 
-           %%XX  The preferred time representation for the current locale with-
-               out the date.
+       %%WW  The week number of the current year as a decimal number, range 00
+           to  53,  starting  with  the first Monday as the first day of week
+           01.
 
-           %%yy  The year as a decimal number without a century (range 00 to
-               99).
+       %%xx  The preferred date representation for the current locale without
+           the time.
 
-           %%YY  The year as a decimal number including the century.
+       %%XX  The preferred time representation for the current locale without
+           the date.
 
-           %%ZZ  The time zone or name or abbreviation.
+       %%yy  The year as a decimal number without a century (range 00 to 99).
 
-           %%%%  A literal `%' character.
+       %%YY  The year as a decimal number including the century.
 
-       PPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t
-           _D_e_p_r_e_c_a_t_e_d_. _U_s_e _t_h_e _n_e_w _f_o_r_m _o_f _t_h_i_s _c_o_m_m_a_n_d _i_n _n_e_w _s_c_r_i_p_t_s_.  The
-           first form of this command is to be used with CCDDEEFF _v_n_a_m_es.
+       %%ZZ  The time zone or name or abbreviation.
 
-GGRRAAPPHH
-       GGPPRRIINNTT::_v_n_a_m_e::_f_o_r_m_a_t
-           This is the same as "PRINT", but printed inside the graph.
+       %%%%  A literal `%' character.
 
-       GGPPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t
-           _D_e_p_r_e_c_a_t_e_d_. _U_s_e _t_h_e _n_e_w _f_o_r_m _o_f _t_h_i_s _c_o_m_m_a_n_d _i_n _n_e_w _s_c_r_i_p_t_s_.  This
-           is the same as "PRINT", but printed inside the graph.
+       _PP_RR_II_NN_TT_::_v_n_a_m_e_::_C_F_::_f_o_r_m_a_t
 
-       CCOOMMMMEENNTT::_t_e_x_t
-           Text is printed literally in the legend section of the graph. Note
-           that in RRDtool 1.2 you have to escape colons in COMMENT text in
-           the same way you have to escape them in **PPRRIINNTT commands by writing
-           ''\\::''.
+       _D_e_p_r_e_c_a_t_e_d_. _U_s_e _t_h_e _n_e_w _f_o_r_m _o_f _t_h_i_s _c_o_m_m_a_n_d _i_n _n_e_w _s_c_r_i_p_t_s_.  The first
+       form of this command is to be used with CCDDEEFF _v_n_a_m_es.
 
-       VVRRUULLEE::_t_i_m_e##_c_o_l_o_r[::_l_e_g_-
-       _e_n_d][::ddaasshheess[==_o_n___s[,_o_f_f___s[,_o_n___s,_o_f_f___s]...]][::ddaasshh--ooffffsseett==_o_f_f_s_e_t]]
-           Draw a vertical line at _t_i_m_e.  Its color is composed from three
-           hexadecimal numbers specifying the rgb color components (00 is off,
-           FF is maximum) red, green and blue followed by an optional alpha.
-           Optionally, a legend box and string is printed in the legend sec-
-           tion. _t_i_m_e may be a number or a variable from a VVDDEEFF. It is an
-           error to use _v_n_a_m_es from DDEEFF or CCDDEEFF here.  Dashed lines can be
-           drawn using the ddaasshheess modifier. See LLIINNEE for more details.
+       GGRRAAPPHH
 
-       HHRRUULLEE::_v_a_l_u_e##_c_o_l_o_r[::_l_e_g_-
-       _e_n_d][::ddaasshheess[==_o_n___s[,_o_f_f___s[,_o_n___s,_o_f_f___s]...]][::ddaasshh--ooffffsseett==_o_f_f_s_e_t]]
-           Draw a horizontal line at _v_a_l_u_e.  HRULE acts much like LINE except
-           that will have no effect on the scale of the graph. If a HRULE is
-           outside the graphing area it will just not be visible.
+       _GG_PP_RR_II_NN_TT_::_v_n_a_m_e_::_f_o_r_m_a_t
 
-       LLIINNEE[_w_i_d_t_h]::_v_a_l_u_e[##_c_o_l_o_r][::[_l_e_g_-
-       _e_n_d][::SSTTAACCKK]][::ddaasshheess[==_o_n___s[,_o_f_f___s[,_o_n___s,_o_f_f___s]...]][::ddaasshh--ooffffsseett==_o_f_f_-
-       _s_e_t]]
-           Draw a line of the specified width onto the graph. _w_i_d_t_h can be a
-           floating point number. If the color is not specified, the drawing
-           is done 'invisibly'. This is useful when stacking something else on
-           top of this line. Also optional is the legend box and string which
-           will be printed in the legend section if specified. The vvaalluuee can
-           be generated by DDEEFF, VVDDEEFF, and CCDDEEFF.  If the optional SSTTAACCKK modi-
-           fier is used, this line is stacked on top of the previous element
-           which can be a LLIINNEE or an AARREEAA.
-
-           The ddaasshheess modifier enables dashed line style. Without any further
-           options a symmetric dashed line with a segment length of 5 pixels
-           will be drawn. The dash pattern can be changed if the ddaasshheess==
-           parameter is followed by either one value or an even number (1, 2,
-           4, 6, ...) of positive values. Each value provides the length of
-           alternate _o_n___s and _o_f_f___s portions of the stroke. The ddaasshh--ooffffsseett
-           parameter specifies an _o_f_f_s_e_t into the pattern at which the stroke
-           begins.
-
-           When you do not specify a color, you cannot specify a legend.
-           Should you want to use STACK, use the "LINEx:<value>::STACK" form.
+       This is the same as "PRINT", but printed inside the graph.
 
-       AARREEAA::_v_a_l_u_e[##_c_o_l_o_r][::[_l_e_g_e_n_d][::SSTTAACCKK]]
-           See LLIINNEE, however the area between the x-axis and the line will be
-           filled.
+       _GG_PP_RR_II_NN_TT_::_v_n_a_m_e_::_C_F_::_f_o_r_m_a_t
 
-       TTIICCKK::_v_n_a_m_e##_r_r_g_g_b_b[_a_a][::_f_r_a_c_t_i_o_n[::_l_e_g_e_n_d]]
-           Plot a tick mark (a vertical line) for each value of _v_n_a_m_e that is
-           non-zero and not *UNKNOWN*. The _f_r_a_c_t_i_o_n argument specifies the
-           length of the tick mark as a fraction of the y-axis; the default
-           value is 0.1 (10% of the axis). Note that the color specification
-           is not optional. The TICK marks normaly start at the lower edge of
-           the graphing area. If the fraction is negative they start at the
-           upper border of the graphing area.
+       _D_e_p_r_e_c_a_t_e_d_. _U_s_e _t_h_e _n_e_w _f_o_r_m _o_f _t_h_i_s _c_o_m_m_a_n_d _i_n _n_e_w _s_c_r_i_p_t_s_.  This is
+       the same as "PRINT", but printed inside the graph.
 
-       SSHHIIFFTT::_v_n_a_m_e::_o_f_f_s_e_t
-           Using this command RRRRDDttooooll will graph the following elements with
-           the specified offset.  For instance, you can specify an offset of
-           ( 7*24*60*60 = ) 604'800 seconds to "look back" one week. Make sure
-           to tell the viewer of your graph you did this ...  As with the
-           other graphing elements, you can specify a number or a variable
-           here.
+       _CC_OO_MM_MM_EE_NN_TT_::_t_e_x_t
 
-       TTEEXXTTAALLIIGGNN::{lleefftt|rriigghhtt|jjuussttiiffiieedd|cceenntteerr}
-           Labels are placed below the graph. When they overflow to the left,
-           they wrap to the next line. By default, lines are justified left
-           and right. The TTEEXXTTAALLIIGGNN function lets you change this default.
-           This is a command and not an option, so that you can change the
-           default several times in your argument list.
+       Text is printed literally in the legend section of the graph. Note that
+       in RRDtool 1.2 you have to escape colons in COMMENT text in the same
+       way you have to escape them in **PPRRIINNTT commands by writing ''\\::''.
+
+       _VV_RR_UU_LL_EE_::_t_i_m_e_##_c_o_l_o_r_[_::_l_e_g_-
+       _e_n_d_]_[_::_dd_aa_ss_hh_ee_ss_[_==_o_n___s_[_,_o_f_f___s_[_,_o_n___s_,_o_f_f___s_]_._._._]_]_[_::_dd_aa_ss_hh_--_oo_ff_ff_ss_ee_tt_==_o_f_f_s_e_t_]_]
+
+       Draw a vertical line at _t_i_m_e.  Its color is composed from three hex-
+       adecimal numbers specifying the rgb color components (00 is off, FF is
+       maximum) red, green and blue followed by an optional alpha. Optionally,
+       a legend box and string is printed in the legend section. _t_i_m_e may be a
+       number or a variable from a VVDDEEFF. It is an error to use _v_n_a_m_es from DDEEFF
+       or CCDDEEFF here.  Dashed lines can be drawn using the ddaasshheess modifier. See
+       LLIINNEE for more details.
+
+       _HH_RR_UU_LL_EE_::_v_a_l_u_e_##_c_o_l_o_r_[_::_l_e_g_-
+       _e_n_d_]_[_::_dd_aa_ss_hh_ee_ss_[_==_o_n___s_[_,_o_f_f___s_[_,_o_n___s_,_o_f_f___s_]_._._._]_]_[_::_dd_aa_ss_hh_--_oo_ff_ff_ss_ee_tt_==_o_f_f_s_e_t_]_]
+
+       Draw a horizontal line at _v_a_l_u_e.  HRULE acts much like LINE except that
+       will have no effect on the scale of the graph. If a HRULE is outside
+       the graphing area it will just not be visible.
+
+       _LL_II_NN_EE_[_w_i_d_t_h_]_::_v_a_l_u_e_[_##_c_o_l_o_r_]_[_::_[_l_e_g_-
+       _e_n_d_]_[_::_SS_TT_AA_CC_KK_]_]_[_::_dd_aa_ss_hh_ee_ss_[_==_o_n___s_[_,_o_f_f___s_[_,_o_n___s_,_o_f_f___s_]_._._._]_]_[_::_dd_aa_ss_hh_--_oo_ff_ff_ss_ee_tt_==_o_f_f_-
+       _s_e_t_]_]
+
+       Draw a line of the specified width onto the graph. _w_i_d_t_h can be a
+       floating point number. If the color is not specified, the drawing is
+       done 'invisibly'. This is useful when stacking something else on top of
+       this line. Also optional is the legend box and string which will be
+       printed in the legend section if specified. The vvaalluuee can be generated
+       by DDEEFF, VVDDEEFF, and CCDDEEFF.  If the optional SSTTAACCKK modifier is used, this
+       line is stacked on top of the previous element which can be a LLIINNEE or
+       an AARREEAA.
+
+       The ddaasshheess modifier enables dashed line style. Without any further
+       options a symmetric dashed line with a segment length of 5 pixels will
+       be drawn. The dash pattern can be changed if the ddaasshheess== parameter is
+       followed by either one value or an even number (1, 2, 4, 6, ...) of
+       positive values. Each value provides the length of alternate _o_n___s and
+       _o_f_f___s portions of the stroke. The ddaasshh--ooffffsseett parameter specifies an
+       _o_f_f_s_e_t into the pattern at which the stroke begins.
+
+       When you do not specify a color, you cannot specify a legend.  Should
+       you want to use STACK, use the "LINEx:<value>::STACK" form.
+
+       _AA_RR_EE_AA_::_v_a_l_u_e_[_##_c_o_l_o_r_]_[_::_[_l_e_g_e_n_d_]_[_::_SS_TT_AA_CC_KK_]_]
+
+       See LLIINNEE, however the area between the x-axis and the line will be
+       filled.
+
+       _TT_II_CC_KK_::_v_n_a_m_e_##_r_r_g_g_b_b_[_a_a_]_[_::_f_r_a_c_t_i_o_n_[_::_l_e_g_e_n_d_]_]
+
+       Plot a tick mark (a vertical line) for each value of _v_n_a_m_e that is non-
+       zero and not *UNKNOWN*. The _f_r_a_c_t_i_o_n argument specifies the length of
+       the tick mark as a fraction of the y-axis; the default value is 0.1
+       (10% of the axis). Note that the color specification is not optional.
+       The TICK marks normaly start at the lower edge of the graphing area. If
+       the fraction is negative they start at the upper border of the graphing
+       area.
+
+       _SS_HH_II_FF_TT_::_v_n_a_m_e_::_o_f_f_s_e_t
+
+       Using this command RRRRDDttooooll will graph the following elements with the
+       specified offset.  For instance, you can specify an offset of
+       ( 7*24*60*60 = ) 604'800 seconds to "look back" one week. Make sure to
+       tell the viewer of your graph you did this ...  As with the other
+       graphing elements, you can specify a number or a variable here.
+
+       _TT_EE_XX_TT_AA_LL_II_GG_NN_::_{_ll_ee_ff_tt_|_rr_ii_gg_hh_tt_|_jj_uu_ss_tt_ii_ff_ii_ee_dd_|_cc_ee_nn_tt_ee_rr_}
+
+       Labels are placed below the graph. When they overflow to the left, they
+       wrap to the next line. By default, lines are justified left and right.
+       The TTEEXXTTAALLIIGGNN function lets you change this default. This is a command
+       and not an option, so that you can change the default several times in
+       your argument list.
+
+       _SS_TT_AA_CC_KK_::_v_n_a_m_e_##_c_o_l_o_r_[_::_l_e_g_e_n_d_]
 
-       SSTTAACCKK::_v_n_a_m_e##_c_o_l_o_r[::_l_e_g_e_n_d]
-           _D_e_p_r_e_c_a_t_e_d_.  _U_s_e _t_h_e _SS_TT_AA_CC_KK _m_o_d_i_f_i_e_r_s _o_n _t_h_e _o_t_h_e_r _c_o_m_m_a_n_d_s_.
+       _D_e_p_r_e_c_a_t_e_d_.  _U_s_e _t_h_e _SS_TT_AA_CC_KK _m_o_d_i_f_i_e_r_s _o_n _t_h_e _o_t_h_e_r _c_o_m_m_a_n_d_s_.
 
        SSoommee nnootteess oonn ssttaacckkiinngg
 
@@ -254,9 +261,9 @@ NNOOTTEESS oonn lleeggeenndd aarrgguummeennttss
 
        A colon ':' in a _l_e_g_e_n_d argument will mark the end of the legend. To
        enter a ':' as part of a legend, the colon must be escaped with a back-
-       slash '\:'.  Beware that many environments process backslashes them-
-       selves, so it may be necessary to write two backslashes in order to one
-       being passed onto rrd_graph.
+       slash '\:'.  Beware that many environments process backslashes
+       themselves, so it may be necessary to write two backslashes in order to
+       one being passed onto rrd_graph.
 
        SSttrriinngg FFoorrmmaattttiinngg
 
@@ -416,4 +423,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                 RRDGRAPH_GRAPH(1)
+1.3.0                             2008-06-11                 RRDGRAPH_GRAPH(1)
diff --git a/doc/rrdgraph_rpn.1 b/doc/rrdgraph_rpn.1
index 47ee711..9feb50c 100644
--- a/doc/rrdgraph_rpn.1
+++ b/doc/rrdgraph_rpn.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDGRAPH_RPN 1"
-.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdgraph_rpn \- About RPN Math in rrdtool graph
 .SH "SYNOPSIS"
diff --git a/doc/rrdgraph_rpn.txt b/doc/rrdgraph_rpn.txt
index bc7fbc6..fd43ce7 100644
--- a/doc/rrdgraph_rpn.txt
+++ b/doc/rrdgraph_rpn.txt
@@ -306,4 +306,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                   RRDGRAPH_RPN(1)
+1.3.0                             2008-03-15                   RRDGRAPH_RPN(1)
diff --git a/doc/rrdinfo.1 b/doc/rrdinfo.1
index 2e98e5c..4890044 100644
--- a/doc/rrdinfo.1
+++ b/doc/rrdinfo.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDINFO 1"
-.TH RRDINFO 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDINFO 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdinfo \- extract header information from an RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdinfo.txt b/doc/rrdinfo.txt
index 341ae29..71da96e 100644
--- a/doc/rrdinfo.txt
+++ b/doc/rrdinfo.txt
@@ -55,4 +55,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                        RRDINFO(1)
+1.3.0                             2008-03-15                        RRDINFO(1)
diff --git a/doc/rrdlast.1 b/doc/rrdlast.1
index a79bef2..a2a1ecb 100644
--- a/doc/rrdlast.1
+++ b/doc/rrdlast.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDLAST 1"
-.TH RRDLAST 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDLAST 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdlast \- Return the date of the last data sample in an RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdlast.txt b/doc/rrdlast.txt
index f1ea1c3..ed09808 100644
--- a/doc/rrdlast.txt
+++ b/doc/rrdlast.txt
@@ -20,4 +20,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                        RRDLAST(1)
+1.3.0                             2008-03-15                        RRDLAST(1)
diff --git a/doc/rrdlastupdate.1 b/doc/rrdlastupdate.1
index 48e958e..a23dd4e 100644
--- a/doc/rrdlastupdate.1
+++ b/doc/rrdlastupdate.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDLASTUPDATE 1"
-.TH RRDLASTUPDATE 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDLASTUPDATE 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdlastupdate \- Return the most recent update to an RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdlastupdate.txt b/doc/rrdlastupdate.txt
index 0ee68d9..54d0d72 100644
--- a/doc/rrdlastupdate.txt
+++ b/doc/rrdlastupdate.txt
@@ -20,4 +20,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                  RRDLASTUPDATE(1)
+1.3.0                             2008-03-15                  RRDLASTUPDATE(1)
diff --git a/doc/rrdresize.1 b/doc/rrdresize.1
index b9f5186..6fbc1ec 100644
--- a/doc/rrdresize.1
+++ b/doc/rrdresize.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDRESIZE 1"
-.TH RRDRESIZE 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDRESIZE 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdresize \- alters the size of an RRA and creates a new .rrd file
 .SH "SYNOPSIS"
diff --git a/doc/rrdresize.txt b/doc/rrdresize.txt
index 2cdb013..836793e 100644
--- a/doc/rrdresize.txt
+++ b/doc/rrdresize.txt
@@ -41,4 +41,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                      RRDRESIZE(1)
+1.3.0                             2008-03-15                      RRDRESIZE(1)
diff --git a/doc/rrdrestore.1 b/doc/rrdrestore.1
index 7dc5e9d..341bede 100644
--- a/doc/rrdrestore.1
+++ b/doc/rrdrestore.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDRESTORE 1"
-.TH RRDRESTORE 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDRESTORE 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdrestore \- Restore the contents of an RRD from its XML dump format
 .SH "SYNOPSIS"
diff --git a/doc/rrdrestore.txt b/doc/rrdrestore.txt
index 12e2a54..d4e0423 100644
--- a/doc/rrdrestore.txt
+++ b/doc/rrdrestore.txt
@@ -30,4 +30,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                     RRDRESTORE(1)
+1.3.0                             2008-03-15                     RRDRESTORE(1)
diff --git a/doc/rrdthreads.1 b/doc/rrdthreads.1
index 48c4571..19cc7dc 100644
--- a/doc/rrdthreads.1
+++ b/doc/rrdthreads.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDTHREADS 1"
-.TH RRDTHREADS 1 "2008-06-08" "1.3rc9" "rrdtool"
+.TH RRDTHREADS 1 "2008-06-08" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdthreads \- Provisions for linking the RRD library to use in multi\-threaded programs
 .SH "SYNOPSIS"
diff --git a/doc/rrdthreads.txt b/doc/rrdthreads.txt
index 4af68da..a17a68a 100644
--- a/doc/rrdthreads.txt
+++ b/doc/rrdthreads.txt
@@ -100,4 +100,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-06-08                     RRDTHREADS(1)
+1.3.0                             2008-06-08                     RRDTHREADS(1)
diff --git a/doc/rrdtool.1 b/doc/rrdtool.1
index d4c7769..ada7ee3 100644
--- a/doc/rrdtool.1
+++ b/doc/rrdtool.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDTOOL 1"
-.TH RRDTOOL 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDTOOL 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdtool \- Round Robin Database Tool
 .SH "SYNOPSIS"
diff --git a/doc/rrdtool.txt b/doc/rrdtool.txt
index fba608a..a1ea939 100644
--- a/doc/rrdtool.txt
+++ b/doc/rrdtool.txt
@@ -273,4 +273,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                        RRDTOOL(1)
+1.3.0                             2008-03-15                        RRDTOOL(1)
diff --git a/doc/rrdtune.1 b/doc/rrdtune.1
index 748eac0..b2192cc 100644
--- a/doc/rrdtune.1
+++ b/doc/rrdtune.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDTUNE 1"
-.TH RRDTUNE 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDTUNE 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdtune \- Modify some basic properties of a Round Robin Database
 .SH "SYNOPSIS"
diff --git a/doc/rrdtune.txt b/doc/rrdtune.txt
index 455bb59..a617ab4 100644
--- a/doc/rrdtune.txt
+++ b/doc/rrdtune.txt
@@ -159,4 +159,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                        RRDTUNE(1)
+1.3.0                             2008-03-15                        RRDTUNE(1)
diff --git a/doc/rrdtutorial.1 b/doc/rrdtutorial.1
index 14ef029..0d43909 100644
--- a/doc/rrdtutorial.1
+++ b/doc/rrdtutorial.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDTUTORIAL 1"
-.TH RRDTUTORIAL 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdtutorial \- Alex van den Bogaerdt's RRDtool tutorial
 .SH "DESCRIPTION"
diff --git a/doc/rrdtutorial.txt b/doc/rrdtutorial.txt
index a868af6..25822f8 100644
--- a/doc/rrdtutorial.txt
+++ b/doc/rrdtutorial.txt
@@ -1149,4 +1149,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                    RRDTUTORIAL(1)
+1.3.0                             2008-03-15                    RRDTUTORIAL(1)
diff --git a/doc/rrdupdate.1 b/doc/rrdupdate.1
index 31fbf05..9fe2f8a 100644
--- a/doc/rrdupdate.1
+++ b/doc/rrdupdate.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDUPDATE 1"
-.TH RRDUPDATE 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDUPDATE 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdupdate \- Store a new set of values into the RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdupdate.txt b/doc/rrdupdate.txt
index 19b6f09..99ac405 100644
--- a/doc/rrdupdate.txt
+++ b/doc/rrdupdate.txt
@@ -91,4 +91,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                      RRDUPDATE(1)
+1.3.0                             2008-03-15                      RRDUPDATE(1)
diff --git a/doc/rrdxport.1 b/doc/rrdxport.1
index bf5cf90..56cb6f1 100644
--- a/doc/rrdxport.1
+++ b/doc/rrdxport.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RRDXPORT 1"
-.TH RRDXPORT 1 "2008-03-15" "1.3rc9" "rrdtool"
+.TH RRDXPORT 1 "2008-03-15" "1.3.0" "rrdtool"
 .SH "NAME"
 rrdxport \- Export data in XML format based on data from one or several RRD
 .SH "SYNOPSIS"
diff --git a/doc/rrdxport.txt b/doc/rrdxport.txt
index cb327dd..f72a093 100644
--- a/doc/rrdxport.txt
+++ b/doc/rrdxport.txt
@@ -125,4 +125,4 @@ AAUUTTHHOORR
 
 
 
-1.3rc9                            2008-03-15                       RRDXPORT(1)
+1.3.0                             2008-03-15                       RRDXPORT(1)
diff --git a/rrdtool.spec b/rrdtool.spec
index f979e5d..280ea60 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -2,26 +2,31 @@
 %define with_php %{?_without_php: 0} %{?!_without_php: 1}
 %define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
 %define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
-%define php_rrd_svn 839
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%define svnrev r1190
+%define pre rc9
+#define pretag 1.2.99908020600
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3rc9
-Release: 0.1%{?dist}
-License: GPL
+Version: 1.3.0
+Release: 0.20%{?pre:.%{pre}}%{?dist}
+License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
 #Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
-Source0: http://oss.oetiker.ch/rrdtool/pub/beta/rrdtool-trunk-svn-snap.tar.gz
-Source1: php4-svn%{php_rrd_svn}.tar.gz
-Patch0: rrdtool-1.2.13-php.patch
+Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{pre}.tar.gz
+Source1: php4-%{svnrev}.tar.gz
+Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
-BuildRequires: libpng-devel, zlib-devel, cairo-devel
-BuildRequires: perl-ExtUtils-MakeMaker
-%if "%{?fedora}" >= "7"
-BuildRequires: perl-devel
+BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0
+BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17
+BuildRequires: libtool, groff
+BuildRequires: gettext, libxml2-devel
+%if 0%{?fedora} >= 7
+BuildRequires: perl-ExtUtils-MakeMaker perl-devel
 %endif
 
 %description
@@ -93,8 +98,15 @@ Group: Development/Languages
 BuildRequires: php-devel >= 4.0
 Requires: php >= 4.0
 Requires: %{name} = %{version}-%{release}
+%if 0%{?php_zend_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+%else
+Requires: php-api = %{php_apiver}
+%endif
 Obsoletes: php-%{name} < %{version}-%{release}
 Provides: php-%{name} = %{version}-%{release}
+Provides: php-pecl(rrdtool)
 
 %description php
 The %{name}-php package includes a dynamic shared object (DSO) that adds
@@ -130,13 +142,9 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
 %endif
 
 %prep
-#setup -q
-%setup -q -n %{name}-%{version}
-%setup -q -T -D -a 1
-# Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
+%setup -q -n %{name}-%{version}%{pre} %{?with_php: -a 1}
 %if %{with_php}
-%patch0 -p0 -b .php
-%{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
+%patch1 -p1
 %endif
 
 # Fix to find correct python dir on lib64
@@ -144,16 +152,20 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
     configure
 
 # Most edits shouldn't be necessary when using --libdir, but
-# w/o, some introduce hardcoded rpaths where they shouldn't,
+# w/o, some introduce hardcoded rpaths where they shouldn't
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
     configure Makefile.in php4/configure php4/ltconfig*
 
+# Perl 5.10 seems to not like long version strings, hack around it
+%{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
+    bindings/perl-shared/RRDs.pm bindings/perl-piped/RRDp.pm
+
+#
+# fix config files for php4 bindings
+# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
+cp -p /usr/lib/rpm/config.{guess,sub} php4/
+
 %build
-intltoolize --automake -c -f
-aclocal
-autoheader
-autoconf
-automake -a -c -f
 %configure \
     --with-perl-options='INSTALLDIRS="vendor"' \
 %if %{with_tcl}
@@ -184,7 +196,8 @@ pushd bindings/perl-piped/
 %{__perl} -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
 popd
 
-%{__make} %{?_smp_mflags}
+#{__make} %{?_smp_mflags}
+make
 
 # Build the php module, the tmp install is required
 %if %{with_php}
@@ -194,7 +207,8 @@ pushd php4/
 %configure \
     --with-rrdtool="%{rrdtmp}%{_prefix}" \
     --disable-static
-%{__make} %{?_smp_mflags}
+#{__make} %{?_smp_mflags}
+make
 popd
 %{__rm} -rf %{rrdtmp}
 %endif
@@ -226,6 +240,9 @@ __EOF__
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
 
+# Dunno why this is getting installed here...
+%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl
+
 # We only want .txt and .html files for the main documentation
 %{__mkdir_p} doc2/html doc2/txt
 %{__cp} -a doc/*.txt doc2/txt/
@@ -242,7 +259,7 @@ __EOF__
 find examples/ -type f -exec chmod 0644 {} \;
 
 # Clean up the buildroot
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/{txt,html}/ \
+%{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-* \
 	$RPM_BUILD_ROOT%{perl_vendorarch}/ntmake.pl \
 	$RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \
         $RPM_BUILD_ROOT%{_datadir}/%{name}/examples \
@@ -270,7 +287,7 @@ find examples/ -type f -exec chmod 0644 {} \;
 
 %files doc
 %defattr(-,root,root,-)
-%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
+%doc CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
 %doc examples doc2/html doc2/txt
 
 %files perl
@@ -285,6 +302,7 @@ find examples/ -type f -exec chmod 0644 {} \;
 %defattr(-,root,root,-)
 %doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
 %{python_sitearch}/rrdtoolmodule.so
+%{python_sitearch}/py_rrdtool-*.egg-info
 %endif
 
 %if %{with_php}
@@ -311,8 +329,84 @@ find examples/ -type f -exec chmod 0644 {} \;
 %endif
 
 %changelog
-* Fri Jun 15 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999050724000-0.1
-- Update for rrdtool pre-1.3 snapshot
+* Sun Jun 08 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.20.rc9
+- Update to rrdtool 1.3 rc9
+- Minor spec tweaks to permit building on older EL
+
+* Wed Jun 04 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.19.rc7
+- Update to rrdtool 1.3 rc7
+
+* Tue May 27 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.18.rc6
+- Update to rrdtool 1.3 rc6
+
+* Wed May 21 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.17.rc4
+- Bump version and rebuild
+
+* Wed May 21 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.16.rc4
+- Fix php bindings compile on x86_64
+
+* Mon May 19 2008 Chris Ricker <kaboom@oobleck.net> 1.3-0.15.rc4
+- Update to rrdtool 1.3 rc4
+
+* Tue May 13 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.15.rc1
+- Update to rrdtool 1.3 rc1
+- Fix versioning in changelog entries, had an extra 0 in there...
+- Drop cairo and python patches, they're in 1.3 rc1
+- Add Requires: gettext and libxml2-devel for new translations
+
+* Wed Apr 30 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.14.beta4
+- Drop some conditional flags, they're not working at the moment...
+
+* Wed Apr 30 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.13.beta4
+- Fix problem with cairo_save/cairo_restore (#444827)
+
+* Wed Apr 23 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.12.beta4
+- Fix python bindings rrdtool info implementation (#435468)
+
+* Tue Apr 08 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.11.beta4
+- Work around apparent version string length issue w/perl 5.10 (#441359)
+
+* Sat Apr 05 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.10.beta4
+- Fix use of rrd_update in php bindings (#437558)
+
+* Mon Mar  3 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.3-0.9.beta4
+- rebuild for new perl (again)
+
+* Wed Feb 13 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.8.beta4
+- Update to rrdtool 1.3 beta4
+
+* Tue Feb 05 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.3-0.7.beta3
+- rebuild for new perl (and fix license tag)
+
+* Mon Feb 04 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.6.beta3
+- Plug memory leak (#430879)
+
+* Mon Jan 07 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.5.beta3
+- Fix right-aligned text alignment and scaling (Resolves: #427609)
+
+* Wed Jan 02 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.4.beta3
+- Add newly built python egg to %%files
+
+* Wed Jan 02 2008 Jarod Wilson <jwilson@redhat.com> 1.3-0.3.beta3
+- Update to rrdtool 1.3 beta3
+- Return properly from errors in RRDp.pm (Resolves: #427040)
+- Requires: dejavu-lgc-fonts (Resolves: #426935)
+
+* Thu Dec 06 2007 Jarod Wilson <jwilson@redhat.com> 1.3-0.2.beta2
+- Update to rrdtool 1.3 beta2
+
+* Wed Aug 08 2007 Jarod Wilson <jwilson@redhat.com> 1.3-0.1.beta1
+- Update to rrdtool 1.3 beta1
+
+* Tue Jul 10 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999-0.3.r1144
+- Update to latest rrdtool pre-1.3 svn snapshot (svn r1144)
+- Add php abi check (Resolves: #247339)
+
+* Fri Jun 15 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999-0.2.r1127
+- Fix up BuildRequires
+
+* Fri Jun 15 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999-0.1.r1127
+- Update to rrdtool pre-1.3 svn snapshot (svn r1127)
 
 * Mon May 21 2007 Jarod Wilson <jwilson@redhat.com> 1.2.23-5
 - BR: ruby so %%ruby_sitearch gets set
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f19be5..c567679 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
 librrd_th_la_LDFLAGS         += -export-symbols librrd.sym
 librrd_th_la_LIBADD          = $(ALL_LIBS)
 
-include_HEADERS	= rrd.h
+include_HEADERS	= rrd.h rrd_format.h
 
 bin_PROGRAMS	= rrdtool rrdupdate
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 9824829..ab5b5f6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -412,7 +412,7 @@ librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
 librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@ \
 	-export-symbols librrd.sym
 librrd_th_la_LIBADD = $(ALL_LIBS)
-include_HEADERS = rrd.h
+include_HEADERS = rrd.h rrd_format.h
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD = librrd.la
 rrdupdate_SOURCES = rrdupdate.c
diff --git a/src/librrd.sym b/src/librrd.sym
index 7e3e8da..a1822c9 100644
--- a/src/librrd.sym
+++ b/src/librrd.sym
@@ -1,12 +1,16 @@
 rrd_clear_error
+rrd_close
 rrd_create
 rrd_create_r
+rrd_dontneed
 rrd_dump
 rrd_dump_r
 rrd_fetch
 rrd_fetch_r
 rrd_first
 rrd_first_r
+rrd_flush
+rrd_free
 rrd_free_context
 rrd_freemem
 rrd_get_context
@@ -17,23 +21,30 @@ rrd_info
 rrd_info_free
 rrd_info_print
 rrd_info_push
+rrd_init
 rrd_last
 rrd_last_r
 rrd_lastupdate
+rrd_lock
 rrd_new_context
+rrd_open
 rrd_parsetime
 rrd_proc_start_end
+rrd_read
 rrd_resize
 rrd_restore
+rrd_seek
 rrd_set_error
 rrd_set_to_DINF
 rrd_set_to_DNAN
 rrd_strerror
 rrd_strversion
+rrd_tell
 rrd_test_error
 rrd_tune
 rrd_update
 rrd_update_r
 rrd_update_v
 rrd_version
+rrd_write
 rrd_xport
diff --git a/src/pngsize.c b/src/pngsize.c
index 1a7b437..023c829 100644
--- a/src/pngsize.c
+++ b/src/pngsize.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * pngsize.c  determine the size of a PNG image
  *****************************************************************************/
@@ -31,9 +31,9 @@ int PngSize(
 #ifdef PNG_SETJMP_SUPPORTED
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->PNG_jmpbuf)
 #else
-#ifdef jmpbuf  
-#undef jmpbuf  
-#endif  
+#ifdef jmpbuf
+#undef jmpbuf
+#endif
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
 #endif
 #endif
diff --git a/src/rrd.h b/src/rrd.h
index 7fdef65..2eac032 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrdlib.h   Public header file for librrd
  *****************************************************************************
- * $Id: rrd.h 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd.h 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.9  2005/02/13 16:13:33  oetiker
  * let rrd_graph return the actual value range it picked ...
@@ -128,7 +128,7 @@ extern    "C" {
     rrd_info_type_t,
     rrd_infoval_t);
     void      rrd_info_print(
-    rrd_info_t *data);
+    rrd_info_t * data);
     void      rrd_info_free(
     rrd_info_t *);
     int       rrd_update(
@@ -199,6 +199,9 @@ extern    "C" {
     char ***,
     rrd_value_t **);
 
+    void      rrd_freemem(
+    void *mem);
+
 /* thread-safe (hopefully) */
     int       rrd_create_r(
     const char *filename,
@@ -249,7 +252,7 @@ extern    "C" {
 
     char     *rrd_parsetime(
     const char *spec,
-    rrd_time_value_t *ptv);
+    rrd_time_value_t * ptv);
 /* END rrd_parsetime.h */
 
     typedef struct rrd_context {
@@ -289,13 +292,67 @@ extern    "C" {
     rrd_context_t *rrd_new_context(
     void);
     void      rrd_free_context(
-    rrd_context_t *buf);
+    rrd_context_t * buf);
 
 /* void   rrd_set_error_r  (rrd_context_t *, char *, ...); */
 /* void   rrd_clear_error_r(rrd_context_t *); */
 /* int    rrd_test_error_r (rrd_context_t *); */
 /* char  *rrd_get_error_r  (rrd_context_t *); */
 
+/*
+ * The following functions are _internal_ functions needed to read the raw RRD
+ * files. Since they are _internal_ they may change with the file format and
+ * will be replaced with a more general interface in RRDTool 1.4. Don't use
+ * these functions unless you have good reasons to do so. If you do use these
+ * functions you will have to adapt your code for RRDTool 1.4!
+ *
+ * To enable the deprecated functions define `RRD_EXPORT_DEPRECATED' before
+ * including <rrd_test.h>. You have been warned! If you come back to the
+ * RRDTool mailing list and whine about your broken application, you will get
+ * hit with something smelly!
+ */
+#if defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED)
+
+# if defined(_RRD_TOOL_H)
+#  include "rrd_format.h"
+# else
+#  include <rrd_format.h>
+# endif
+
+#if defined(__GNUC__) && defined (RRD_EXPORT_DEPRECATED)
+# define RRD_DEPRECATED __attribute__((deprecated))
+#else
+# define RRD_DEPRECATED /**/
+#endif
+
+    void        rrd_free     (rrd_t *rrd)
+      RRD_DEPRECATED;
+    void        rrd_init     (rrd_t *rrd)
+      RRD_DEPRECATED;
+
+    rrd_file_t *rrd_open   (const char *const file_name, rrd_t *rrd,
+        unsigned rdwr)
+      RRD_DEPRECATED;
+
+    void        rrd_dontneed (rrd_file_t *rrd_file, rrd_t *rrd)
+      RRD_DEPRECATED;
+    int         rrd_close    (rrd_file_t *rrd_file)
+      RRD_DEPRECATED;
+    ssize_t     rrd_read     (rrd_file_t *rrd_file, void *buf, size_t count)
+      RRD_DEPRECATED;
+    ssize_t     rrd_write    (rrd_file_t *rrd_file,
+        const void *buf, size_t count)
+      RRD_DEPRECATED;
+    void        rrd_flush    (rrd_file_t *rrd_file)
+      RRD_DEPRECATED;
+    off_t       rrd_seek     (rrd_file_t *rrd_file, off_t off, int whence)
+      RRD_DEPRECATED;
+    off_t       rrd_tell     (rrd_file_t *rrd_file)
+      RRD_DEPRECATED;
+    int         rrd_lock     (rrd_file_t *file)
+      RRD_DEPRECATED;
+#endif /* defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED) */
+
 #endif                  /* _RRDLIB_H */
 
 #ifdef  __cplusplus
diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 85b0aee..d4e5723 100644
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_cgi.c  RRD Web Page Generator
  *****************************************************************************/
diff --git a/src/rrd_create.c b/src/rrd_create.c
index bb8d45d..2cc8557 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_create.c  creates new rrds
  *****************************************************************************/
@@ -232,6 +232,7 @@ int rrd_create_r(
             char     *argvcopy;
             char     *tokptr;
             size_t    old_size = sizeof(rra_def_t) * (rrd.stat_head->rra_cnt);
+            int       row_cnt;
 
             if ((rrd.rra_def = rrd_realloc(rrd.rra_def,
                                            old_size + sizeof(rra_def_t))) ==
@@ -312,8 +313,10 @@ int rrd_create_r(
                     case CF_SEASONAL:
                     case CF_DEVPREDICT:
                     case CF_FAILURES:
-                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt =
-                            atoi(token);
+                        row_cnt = atoi(token);
+                        if (row_cnt <= 0)
+                            rrd_set_error("Invalid row count: %i", row_cnt);
+                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
                         break;
                     default:
                         rrd.rra_def[rrd.stat_head->rra_cnt].
@@ -416,8 +419,10 @@ int rrd_create_r(
                             ("Unexpected extra argument for consolidation function DEVPREDICT");
                         break;
                     default:
-                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt =
-                            atoi(token);
+                        row_cnt = atoi(token);
+                        if (row_cnt <= 0)
+                            rrd_set_error("Invalid row count: %i", row_cnt);
+                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
                         break;
                     }
                     break;
@@ -675,8 +680,12 @@ int rrd_create_fn(
     int       unkn_cnt;
     rrd_file_t *rrd_file_dn;
     rrd_t     rrd_dn;
+    unsigned flags = O_WRONLY | O_CREAT | O_TRUNC;
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+    flags |= O_BINARY;
+#endif
 
-    if ((rrd_file = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
+    if ((rrd_file = open(file_name, flags, 0666)) < 0) {
         rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
         free(rrd->stat_head);
         free(rrd->live_head);
diff --git a/src/rrd_diff.c b/src/rrd_diff.c
index a56207a..ac16a7d 100644
--- a/src/rrd_diff.c
+++ b/src/rrd_diff.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This code is stolen from rateup (mrtg-2.x) by Dave Rand
  *****************************************************************************
  * diff calculate the difference between two very long integers available as
  *      strings
  *****************************************************************************
- * $Id: rrd_diff.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_diff.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.4  2003/03/10 00:30:34  oetiker
  * handle cases with two negative numbers
diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 61b48de..b73e977 100644
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_dump  Display a RRD
  *****************************************************************************
- * $Id: rrd_dump.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_dump.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.7  2004/05/25 20:53:21  oetiker
  * prevent small leak when resources are exhausted -- Mike Slifcak
diff --git a/src/rrd_error.c b/src/rrd_error.c
index 2498e98..1206284 100644
--- a/src/rrd_error.c
+++ b/src/rrd_error.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_error.c   Common Header File
  *****************************************************************************
- * $Id: rrd_error.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_error.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.4  2003/02/22 21:57:03  oetiker
  * a patch to avoid a memory leak and a Makefile.am patch to
@@ -78,7 +78,7 @@ char     *rrd_get_error(
    context. Using these functions would require to change each and
    every function containing any of the non _r versions... */
 void rrd_set_error_r(
-    rrd_context_t *rrd_ctx,
+    rrd_context_t * rrd_ctx,
     char *fmt,
     ...)
 {
@@ -96,19 +96,19 @@ void rrd_set_error_r(
 }
 
 int rrd_test_error_r(
-    rrd_context_t *rrd_ctx)
+    rrd_context_t * rrd_ctx)
 {
     return rrd_ctx->rrd_error[0] != '\0';
 }
 
 void rrd_clear_error_r(
-    rrd_context_t *rrd_ctx)
+    rrd_context_t * rrd_ctx)
 {
     rrd_ctx->rrd_error[0] = '\0';
 }
 
 char     *rrd_get_error_r(
-    rrd_context_t *rrd_ctx)
+    rrd_context_t * rrd_ctx)
 {
     return rrd_ctx->rrd_error;
 }
@@ -119,8 +119,7 @@ char     *rrd_get_error_r(
 rrd_context_t *rrd_new_context(
     void)
 {
-    rrd_context_t *rrd_ctx =
-        (rrd_context_t *) malloc(sizeof(rrd_context_t));
+    rrd_context_t *rrd_ctx = (rrd_context_t *) malloc(sizeof(rrd_context_t));
 
     if (!rrd_ctx) {
         return NULL;
@@ -132,7 +131,7 @@ rrd_context_t *rrd_new_context(
 }
 
 void rrd_free_context(
-    rrd_context_t *rrd_ctx)
+    rrd_context_t * rrd_ctx)
 {
     if (rrd_ctx) {
         free(rrd_ctx);
@@ -141,7 +140,7 @@ void rrd_free_context(
 
 #if 0
 void rrd_globalize_error(
-    rrd_context_t *rrd_ctx)
+    rrd_context_t * rrd_ctx)
 {
     if (rrd_ctx) {
         rrd_set_error(rrd_ctx->rrd_error);
diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 2e2eac4..1e6c1ef 100644
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_fetch.c  read date from an rrd to use for further processing
  *****************************************************************************
- * $Id: rrd_fetch.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_fetch.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.8  2004/05/18 18:53:03  oetiker
  * big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_first.c b/src/rrd_first.c
index f80983d..bdba6c0 100644
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_first Return
  *****************************************************************************
diff --git a/src/rrd_format.c b/src/rrd_format.c
index 2f8c329..2fd90cb 100644
--- a/src/rrd_format.c
+++ b/src/rrd_format.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_format.c  RRD Database Format helper functions
  *****************************************************************************
- * $Id: rrd_format.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_format.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.5  2004/05/18 18:53:03  oetiker
  * big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_format.h b/src/rrd_format.h
index b8f0790..75441ac 100644
--- a/src/rrd_format.h
+++ b/src/rrd_format.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_format.h  RRD Database Format header
  *****************************************************************************/
@@ -7,6 +7,18 @@
 #ifndef _RRD_FORMAT_H
 #define _RRD_FORMAT_H
 
+/* 
+ * _RRD_TOOL_H
+ *   We're building RRDTool itself.
+ *
+ * RRD_EXPORT_DEPRECATED
+ *   User is requesting internal function which need this struct. They have
+ *   been told that this will change and have agreed to adapt their programs.
+ */
+#if !defined(_RRD_TOOL_H) && !defined(RRD_EXPORT_DEPRECATED)
+# error "Do not include rrd_format.h directly. Include rrd.h instead!"
+#endif
+
 #include "rrd.h"
 
 /*****************************************************************************
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 5315c1d..d61d015 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_gfx.c  graphics wrapper for rrdtool
   **************************************************************************/
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index f0b8e55..300fdbe 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -3600,7 +3600,7 @@ rrd_info_t *rrd_graph_v(
     char **argv)
 {
     image_desc_t im;
-    rrd_info_t  *grinfo;
+    rrd_info_t *grinfo;
 
     rrd_graph_init(&im);
     /* a dummy surface so that we can measure text sizes for placements */
@@ -3746,26 +3746,6 @@ void rrd_graph_init(
     cairo_font_options_set_antialias(im->font_options, CAIRO_ANTIALIAS_GRAY);
     for (i = 0; i < DIM(graph_col); i++)
         im->graph_col[i] = graph_col[i];
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-    {
-        char     *windir;
-        char      rrd_win_default_font[1000];
-
-        windir = getenv("windir");
-        /* %windir% is something like D:\windows or C:\winnt */
-        if (windir != NULL) {
-            strncpy(rrd_win_default_font, windir, 500);
-            rrd_win_default_font[500] = '\0';
-            strcat(rrd_win_default_font, "\\fonts\\");
-            strcat(rrd_win_default_font, RRD_DEFAULT_FONT);
-            for (i = 0; i < DIM(text_prop); i++) {
-                strncpy(text_prop[i].font,
-                        rrd_win_default_font, sizeof(text_prop[i].font) - 1);
-                text_prop[i].font[sizeof(text_prop[i].font) - 1] = '\0';
-            }
-        }
-    }
-#endif
     {
         char     *deffont;
 
diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 1b45284..2b1c05b 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -244,8 +244,8 @@ typedef struct image_desc_t {
     cairo_font_options_t *font_options; /* cairo font options */
     cairo_antialias_t graph_antialias;  /* antialiasing for the graph */
 
-    rrd_info_t *grinfo;   /* root pointer to extra graph info */
-    rrd_info_t *grinfo_current;   /* pointing to current entry */
+    rrd_info_t *grinfo; /* root pointer to extra graph info */
+    rrd_info_t *grinfo_current; /* pointing to current entry */
 } image_desc_t;
 
 /* Prototypes */
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 1a02247..7cefc82 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_graph_helper.c  commandline parser functions 
  *                     this code initially written by Alex van den Bogaerdt
diff --git a/src/rrd_hw.c b/src/rrd_hw.c
index 62f64c6..f04d9f7 100644
--- a/src/rrd_hw.c
+++ b/src/rrd_hw.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_hw.c : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
  *****************************************************************************
diff --git a/src/rrd_hw.h b/src/rrd_hw.h
index d30e109..eac7616 100644
--- a/src/rrd_hw.h
+++ b/src/rrd_hw.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_hw.h : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
  *****************************************************************************/
diff --git a/src/rrd_hw_math.c b/src/rrd_hw_math.c
index 2b2c00f..7ce9dc2 100644
--- a/src/rrd_hw_math.c
+++ b/src/rrd_hw_math.c
@@ -2,6 +2,7 @@
  * rrd_hw_math.c  Math functions for Holt-Winters computations
  *****************************************************************************/
 
+#include "rrd_tool.h"
 #include "rrd_hw_math.h"
 #include "rrd_config.h"
 
diff --git a/src/rrd_hw_update.c b/src/rrd_hw_update.c
index 89d0c8e..80da40a 100644
--- a/src/rrd_hw_update.c
+++ b/src/rrd_hw_update.c
@@ -2,6 +2,7 @@
  * rrd_hw_update.c  Functions for updating a Holt-Winters RRA
  ****************************************************************************/
 
+#include "rrd_tool.h"
 #include "rrd_format.h"
 #include "rrd_config.h"
 #include "rrd_hw_math.h"
diff --git a/src/rrd_i18n.h b/src/rrd_i18n.h
index 9dc3e7e..83da369 100644
--- a/src/rrd_i18n.h
+++ b/src/rrd_i18n.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Takao Fujiwara, 2008
+ * RRDtool 1.3.0  Copyright by Takao Fujiwara, 2008
  *****************************************************************************
  * rrd_i18n.h   Common Header File
  *****************************************************************************/
diff --git a/src/rrd_info.c b/src/rrd_info.c
index 257219a..f2a81f0 100644
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_info  Get Information about the configuration of an RRD
  *****************************************************************************/
@@ -39,11 +39,8 @@ char     *sprintf_alloc(
 /* the function formerly known as push was renamed to info_push and later
  * rrd_info_push because it is now used outside the scope of this file */
 rrd_info_t
-         *rrd_info_push(
-    rrd_info_t *info,
-    char *key,
-    rrd_info_type_t type,
-    rrd_infoval_t value)
+    * rrd_info_push(rrd_info_t * info,
+                    char *key, rrd_info_type_t type, rrd_infoval_t value)
 {
     rrd_info_t *next;
 
@@ -101,7 +98,7 @@ rrd_info_t *rrd_info_r(
 {
     unsigned int i, ii = 0;
     rrd_t     rrd;
-    rrd_info_t   *data = NULL, *cd;
+    rrd_info_t *data = NULL, *cd;
     rrd_infoval_t info;
     rrd_file_t *rrd_file;
     enum cf_en current_cf;
@@ -128,8 +125,8 @@ rrd_info_t *rrd_info_r(
 
         info.u_str = rrd.ds_def[i].dst;
         cd = rrd_info_push(cd, sprintf_alloc("ds[%s].type",
-                       rrd.ds_def[i].ds_nam),
-                       RD_I_STR, info);
+                                             rrd.ds_def[i].ds_nam),
+                           RD_I_STR, info);
 
         current_ds = dst_conv(rrd.ds_def[i].dst);
         switch (current_ds) {
@@ -141,105 +138,114 @@ rrd_info_t *rrd_info_r(
                             rrd.ds_def, &buffer);
             info.u_str = buffer;
             cd = rrd_info_push(cd,
-                           sprintf_alloc("ds[%s].cdef", rrd.ds_def[i].ds_nam),
-                           RD_I_STR, info);
+                               sprintf_alloc("ds[%s].cdef",
+                                             rrd.ds_def[i].ds_nam), RD_I_STR,
+                               info);
             free(buffer);
         }
             break;
         default:
             info.u_cnt = rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt;
             cd = rrd_info_push(cd,
-                           sprintf_alloc("ds[%s].minimal_heartbeat",
-                                         rrd.ds_def[i].ds_nam), RD_I_CNT,
-                           info);
+                               sprintf_alloc("ds[%s].minimal_heartbeat",
+                                             rrd.ds_def[i].ds_nam), RD_I_CNT,
+                               info);
 
             info.u_val = rrd.ds_def[i].par[DS_min_val].u_val;
             cd = rrd_info_push(cd,
-                           sprintf_alloc("ds[%s].min", rrd.ds_def[i].ds_nam),
-                           RD_I_VAL, info);
+                               sprintf_alloc("ds[%s].min",
+                                             rrd.ds_def[i].ds_nam), RD_I_VAL,
+                               info);
 
             info.u_val = rrd.ds_def[i].par[DS_max_val].u_val;
             cd = rrd_info_push(cd,
-                           sprintf_alloc("ds[%s].max", rrd.ds_def[i].ds_nam),
-                           RD_I_VAL, info);
+                               sprintf_alloc("ds[%s].max",
+                                             rrd.ds_def[i].ds_nam), RD_I_VAL,
+                               info);
             break;
         }
 
         info.u_str = rrd.pdp_prep[i].last_ds;
         cd = rrd_info_push(cd,
-                       sprintf_alloc("ds[%s].last_ds", rrd.ds_def[i].ds_nam),
-                       RD_I_STR, info);
+                           sprintf_alloc("ds[%s].last_ds",
+                                         rrd.ds_def[i].ds_nam), RD_I_STR,
+                           info);
 
         info.u_val = rrd.pdp_prep[i].scratch[PDP_val].u_val;
         cd = rrd_info_push(cd,
-                       sprintf_alloc("ds[%s].value", rrd.ds_def[i].ds_nam),
-                       RD_I_VAL, info);
+                           sprintf_alloc("ds[%s].value",
+                                         rrd.ds_def[i].ds_nam), RD_I_VAL,
+                           info);
 
         info.u_cnt = rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt;
         cd = rrd_info_push(cd,
-                       sprintf_alloc("ds[%s].unknown_sec",
-                                     rrd.ds_def[i].ds_nam), RD_I_CNT, info);
+                           sprintf_alloc("ds[%s].unknown_sec",
+                                         rrd.ds_def[i].ds_nam), RD_I_CNT,
+                           info);
     }
 
     for (i = 0; i < rrd.stat_head->rra_cnt; i++) {
         info.u_str = rrd.rra_def[i].cf_nam;
-        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cf", i), RD_I_STR, info);
+        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cf", i), RD_I_STR,
+                           info);
         current_cf = cf_conv(rrd.rra_def[i].cf_nam);
 
         info.u_cnt = rrd.rra_def[i].row_cnt;
-        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].rows", i), RD_I_CNT, info);
+        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].rows", i), RD_I_CNT,
+                           info);
 
         info.u_cnt = rrd.rra_ptr[i].cur_row;
         cd = rrd_info_push(cd, sprintf_alloc("rra[%d].cur_row", i), RD_I_CNT,
-                       info);
+                           info);
 
         info.u_cnt = rrd.rra_def[i].pdp_cnt;
-        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].pdp_per_row", i), RD_I_CNT,
-                       info);
+        cd = rrd_info_push(cd, sprintf_alloc("rra[%d].pdp_per_row", i),
+                           RD_I_CNT, info);
 
         switch (current_cf) {
         case CF_HWPREDICT:
         case CF_MHWPREDICT:
             info.u_val = rrd.rra_def[i].par[RRA_hw_alpha].u_val;
-            cd = rrd_info_push(cd, sprintf_alloc("rra[%d].alpha", i), RD_I_VAL,
-                           info);
+            cd = rrd_info_push(cd, sprintf_alloc("rra[%d].alpha", i),
+                               RD_I_VAL, info);
             info.u_val = rrd.rra_def[i].par[RRA_hw_beta].u_val;
             cd = rrd_info_push(cd, sprintf_alloc("rra[%d].beta", i), RD_I_VAL,
-                           info);
+                               info);
             break;
         case CF_SEASONAL:
         case CF_DEVSEASONAL:
             info.u_val = rrd.rra_def[i].par[RRA_seasonal_gamma].u_val;
-            cd = rrd_info_push(cd, sprintf_alloc("rra[%d].gamma", i), RD_I_VAL,
-                           info);
+            cd = rrd_info_push(cd, sprintf_alloc("rra[%d].gamma", i),
+                               RD_I_VAL, info);
             if (atoi(rrd.stat_head->version) >= 4) {
                 info.u_val =
                     rrd.rra_def[i].par[RRA_seasonal_smoothing_window].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].smoothing_window", i),
-                               RD_I_VAL, info);
+                                   sprintf_alloc("rra[%d].smoothing_window",
+                                                 i), RD_I_VAL, info);
             }
             break;
         case CF_FAILURES:
             info.u_val = rrd.rra_def[i].par[RRA_delta_pos].u_val;
             cd = rrd_info_push(cd, sprintf_alloc("rra[%d].delta_pos", i),
-                           RD_I_VAL, info);
+                               RD_I_VAL, info);
             info.u_val = rrd.rra_def[i].par[RRA_delta_neg].u_val;
             cd = rrd_info_push(cd, sprintf_alloc("rra[%d].delta_neg", i),
-                           RD_I_VAL, info);
+                               RD_I_VAL, info);
             info.u_cnt = rrd.rra_def[i].par[RRA_failure_threshold].u_cnt;
-            cd = rrd_info_push(cd, sprintf_alloc("rra[%d].failure_threshold", i),
-                           RD_I_CNT, info);
+            cd = rrd_info_push(cd,
+                               sprintf_alloc("rra[%d].failure_threshold", i),
+                               RD_I_CNT, info);
             info.u_cnt = rrd.rra_def[i].par[RRA_window_len].u_cnt;
             cd = rrd_info_push(cd, sprintf_alloc("rra[%d].window_length", i),
-                           RD_I_CNT, info);
+                               RD_I_CNT, info);
             break;
         case CF_DEVPREDICT:
             break;
         default:
             info.u_val = rrd.rra_def[i].par[RRA_cdp_xff_val].u_val;
             cd = rrd_info_push(cd, sprintf_alloc("rra[%d].xff", i), RD_I_VAL,
-                           info);
+                               info);
             break;
         }
 
@@ -251,36 +257,40 @@ rrd_info_t *rrd_info_r(
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_hw_intercept].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].intercept",
-                                             i, ii), RD_I_VAL, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].intercept", i, ii),
+                                   RD_I_VAL, info);
                 info.u_val =
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_hw_slope].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].slope", i,
-                                             ii), RD_I_VAL, info);
+                                   sprintf_alloc("rra[%d].cdp_prep[%d].slope",
+                                                 i, ii), RD_I_VAL, info);
                 info.u_cnt =
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_null_count].u_cnt;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].NaN_count",
-                                             i, ii), RD_I_CNT, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].NaN_count", i, ii),
+                                   RD_I_CNT, info);
                 break;
             case CF_SEASONAL:
                 info.u_val =
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_hw_seasonal].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].seasonal",
-                                             i, ii), RD_I_VAL, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].seasonal", i, ii),
+                                   RD_I_VAL, info);
                 break;
             case CF_DEVSEASONAL:
                 info.u_val =
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_seasonal_deviation].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].deviation",
-                                             i, ii), RD_I_VAL, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].deviation", i, ii),
+                                   RD_I_VAL, info);
                 break;
             case CF_DEVPREDICT:
                 break;
@@ -298,8 +308,9 @@ rrd_info_t *rrd_info_r(
                 history[j] = '\0';
                 info.u_str = history;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].history",
-                                             i, ii), RD_I_STR, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].history", i, ii),
+                                   RD_I_STR, info);
             }
                 break;
             default:
@@ -307,15 +318,15 @@ rrd_info_t *rrd_info_r(
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_val].u_val;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc("rra[%d].cdp_prep[%d].value", i,
-                                             ii), RD_I_VAL, info);
+                                   sprintf_alloc("rra[%d].cdp_prep[%d].value",
+                                                 i, ii), RD_I_VAL, info);
                 info.u_cnt =
                     rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
                                  ii].scratch[CDP_unkn_pdp_cnt].u_cnt;
                 cd = rrd_info_push(cd,
-                               sprintf_alloc
-                               ("rra[%d].cdp_prep[%d].unknown_datapoints", i,
-                                ii), RD_I_CNT, info);
+                                   sprintf_alloc
+                                   ("rra[%d].cdp_prep[%d].unknown_datapoints",
+                                    i, ii), RD_I_CNT, info);
                 break;
             }
         }
@@ -329,7 +340,7 @@ rrd_info_t *rrd_info_r(
 
 
 void rrd_info_print(
-    rrd_info_t *data)
+    rrd_info_t * data)
 {
     while (data) {
         printf("%s = ", data->key);
@@ -360,7 +371,7 @@ void rrd_info_print(
 }
 
 void rrd_info_free(
-    rrd_info_t *data)
+    rrd_info_t * data)
 {
     rrd_info_t *save;
 
diff --git a/src/rrd_is_thread_safe.h b/src/rrd_is_thread_safe.h
index 80a794b..493140a 100644
--- a/src/rrd_is_thread_safe.h
+++ b/src/rrd_is_thread_safe.h
@@ -1,12 +1,12 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
  *****************************************************************************
  * rrd_is_thread_safe.c   Poisons some nasty function calls using GNU cpp
  *****************************************************************************
- * $Id: rrd_is_thread_safe.h 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_is_thread_safe.h 1432 2008-06-10 23:12:55Z oetiker $
  *************************************************************************** */
 
 #ifndef _RRD_IS_THREAD_SAFE_H
diff --git a/src/rrd_last.c b/src/rrd_last.c
index 097b19c..cc7e445 100644
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_last.c
  *****************************************************************************
diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
index 8501f54..06f0341 100644
--- a/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_lastupdate  Get the last datum entered for each DS
  *****************************************************************************/
diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c
index d0797ab..58c02cb 100644
--- a/src/rrd_not_thread_safe.c
+++ b/src/rrd_not_thread_safe.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
@@ -7,7 +7,7 @@
  * rrd_not_thread_safe.c   Contains routines used when thread safety is not
  *                         an issue
  *****************************************************************************
- * $Id: rrd_not_thread_safe.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_not_thread_safe.c 1432 2008-06-10 23:12:55Z oetiker $
  *************************************************************************** */
 #include "rrd.h"
 #include "rrd_tool.h"
diff --git a/src/rrd_open.c b/src/rrd_open.c
index d57c2ef..7126e15 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
- * $Id: rrd_open.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_open.c 1432 2008-06-10 23:12:55Z oetiker $
  *****************************************************************************/
 
 #include "rrd_tool.h"
@@ -34,7 +34,7 @@
 #endif
 
 /* get the address of the start of this page */
-#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE 
+#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE
 #ifndef PAGE_START
 #define PAGE_START(addr) ((addr)&(~(_page_size-1)))
 #endif
@@ -117,6 +117,10 @@ rrd_file_t *rrd_open(
 #endif
     }
 
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+    flags |= O_BINARY;
+#endif
+
     if ((rrd_file->fd = open(file_name, flags, mode)) < 0) {
         rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno));
         goto out_free;
@@ -371,7 +375,7 @@ void rrd_dontneed(
 #if defined DEBUG && DEBUG > 1
     mincore_print(rrd_file, "after");
 #endif
-#endif /* without madvise and posix_fadvise ist does not make much sense todo anything */
+#endif                          /* without madvise and posix_fadvise ist does not make much sense todo anything */
 }
 
 
@@ -563,4 +567,3 @@ void rrd_freemem(
 {
     free(mem);
 }
-
diff --git a/src/rrd_parsetime.c b/src/rrd_parsetime.c
index c1aef0b..7fa3559 100644
--- a/src/rrd_parsetime.c
+++ b/src/rrd_parsetime.c
@@ -483,7 +483,7 @@ static char *expect2(
  *              It also applies those m-guessing heuristics.
  */
 static char *plus_minus(
-    rrd_time_value_t *ptv,
+    rrd_time_value_t * ptv,
     int doop)
 {
     static int op = PLUS;
@@ -569,7 +569,7 @@ static char *plus_minus(
  * tod() computes the time of day (TIME-OF-DAY-SPEC)
  */
 static char *tod(
-    rrd_time_value_t *ptv)
+    rrd_time_value_t * ptv)
 {
     int       hour, minute = 0;
     int       tlen;
@@ -646,7 +646,7 @@ static char *tod(
  * assign_date() assigns a date, adjusting year as appropriate
  */
 static char *assign_date(
-    rrd_time_value_t *ptv,
+    rrd_time_value_t * ptv,
     long mday,
     long mon,
     long year)
@@ -679,7 +679,7 @@ static char *assign_date(
  * day() picks apart DAY-SPEC-[12]
  */
 static char *day(
-    rrd_time_value_t *ptv)
+    rrd_time_value_t * ptv)
 {
     /* using time_t seems to help portability with 64bit oses */
     time_t    mday = 0, wday, mon, year = ptv->tm.tm_year;
@@ -833,7 +833,7 @@ static char *day(
  */
 char     *rrd_parsetime(
     const char *tspec,
-    rrd_time_value_t *ptv)
+    rrd_time_value_t * ptv)
 {
     time_t    now = time(NULL);
     int       hr = 0;
@@ -990,8 +990,8 @@ char     *rrd_parsetime(
 
 
 int rrd_proc_start_end(
-    rrd_time_value_t *start_tv,
-    rrd_time_value_t *end_tv,
+    rrd_time_value_t * start_tv,
+    rrd_time_value_t * end_tv,
     time_t *start,
     time_t *end)
 {
diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index ddacd13..8fc1fc7 100644
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_resize.c Alters size of an RRA
  *****************************************************************************
diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index f08bba3..ed46287 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2008 Florian octo Forster
  * Distributed under the GPL
  *****************************************************************************
  * rrd_restore.c   Contains logic to parse XML input and create an RRD file
  *****************************************************************************
- * $Id: rrd_restore.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_restore.c 1432 2008-06-10 23:12:55Z oetiker $
  *************************************************************************** */
 
 /*
diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index c794c22..1192483 100644
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_rpncalc.c  RPN calculator functions
  ****************************************************************************/
diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
index 1f2fb8a..06ef0ff 100644
--- a/src/rrd_rpncalc.h
+++ b/src/rrd_rpncalc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_rpncalc.h  RPN calculator functions
  ****************************************************************************/
diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c
index 742bb49..c7f8d1e 100644
--- a/src/rrd_thread_safe.c
+++ b/src/rrd_thread_safe.c
@@ -1,12 +1,12 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
  *****************************************************************************
  * rrd_thread_safe.c   Contains routines used when thread safety is required
  *****************************************************************************
- * $Id: rrd_thread_safe.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_thread_safe.c 1432 2008-06-10 23:12:55Z oetiker $
  *************************************************************************** */
 
 #include <pthread.h>
diff --git a/src/rrd_thread_safe_nt.c b/src/rrd_thread_safe_nt.c
index 80b8bae..1442f7b 100644
--- a/src/rrd_thread_safe_nt.c
+++ b/src/rrd_thread_safe_nt.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
@@ -7,7 +7,7 @@
  * rrd_thread_safe.c   Contains routines used when thread safety is required
  *                     for win32
  *****************************************************************************
- * $Id: rrd_thread_safe_nt.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_thread_safe_nt.c 1432 2008-06-10 23:12:55Z oetiker $
  *************************************************************************** */
 
 #include <windows.h>
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 670e3c3..8efd492 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -804,7 +804,7 @@ int HandleInputLine(
         }
 
     } else if (strcmp("graphv", argv[1]) == 0) {
-        rrd_info_t *grinfo = NULL;    /* 1 to distinguish it from the NULL that rrd_graph sends in */
+        rrd_info_t *grinfo = NULL;  /* 1 to distinguish it from the NULL that rrd_graph sends in */
 
         grinfo = rrd_graph_v(argc - 1, &argv[1]);
         if (grinfo) {
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index a8a01fa..0be66e4 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_tool.h   Common Header File
  *****************************************************************************/
@@ -87,41 +87,6 @@ extern    "C" {
     char ***ds_namv,
     rrd_value_t **data);
 
-    void      rrd_free(
-    rrd_t *rrd);
-    void      rrd_freemem(
-    void *mem);
-    void      rrd_init(
-    rrd_t *rrd);
-
-    rrd_file_t *rrd_open(
-    const char *const file_name,
-    rrd_t *rrd,
-    unsigned rdwr);
-    void      rrd_dontneed(
-    rrd_file_t *rrd_file,
-    rrd_t *rrd);
-    int       rrd_close(
-    rrd_file_t *rrd_file);
-    ssize_t   rrd_read(
-    rrd_file_t *rrd_file,
-    void *buf,
-    size_t count);
-    ssize_t   rrd_write(
-    rrd_file_t *rrd_file,
-    const void *buf,
-    size_t count);
-    void      rrd_flush(
-    rrd_file_t *rrd_file);
-    off_t     rrd_seek(
-    rrd_file_t *rrd_file,
-    off_t off,
-    int whence);
-    off_t     rrd_tell(
-    rrd_file_t *rrd_file);
-    int       rrd_lock(
-    rrd_file_t *file);
-
 #define RRD_READONLY    (1<<0)
 #define RRD_READWRITE   (1<<1)
 #define RRD_CREAT       (1<<2)
diff --git a/src/rrd_tune.c b/src/rrd_tune.c
index ceebdc7..159c467 100644
--- a/src/rrd_tune.c
+++ b/src/rrd_tune.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * change header parameters of an rrd
  *****************************************************************************
- * $Id: rrd_tune.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_tune.c 1432 2008-06-10 23:12:55Z oetiker $
  * $Log$
  * Revision 1.6  2004/05/26 22:11:12  oetiker
  * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
diff --git a/src/rrd_update.c b/src/rrd_update.c
index 7f4c9c0..f5b8050 100644
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1,10 +1,10 @@
 
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_update.c  RRD Update Function
  *****************************************************************************
- * $Id: rrd_update.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrd_update.c 1432 2008-06-10 23:12:55Z oetiker $
  *****************************************************************************/
 
 #include "rrd_tool.h"
@@ -104,7 +104,7 @@ static int process_arg(
     char **updvals,
     long *tmpl_idx,
     unsigned long tmpl_cnt,
-    rrd_info_t **pcdp_summary,
+    rrd_info_t ** pcdp_summary,
     int version,
     unsigned long *skip_update,
     int *schedule_smooth);
@@ -258,7 +258,7 @@ static int write_to_rras(
     unsigned long *rra_current,
     time_t current_time,
     unsigned long *skip_update,
-    rrd_info_t **pcdp_summary);
+    rrd_info_t ** pcdp_summary);
 
 static int write_RRA_row(
     rrd_file_t *rrd_file,
@@ -266,7 +266,7 @@ static int write_RRA_row(
     unsigned long rra_idx,
     unsigned long *rra_current,
     unsigned short CDP_scratch_idx,
-    rrd_info_t **pcdp_summary,
+    rrd_info_t ** pcdp_summary,
     time_t rra_time);
 
 static int smooth_all_rras(
@@ -322,7 +322,7 @@ rrd_info_t *rrd_update_v(
     char **argv)
 {
     char     *tmplt = NULL;
-    rrd_info_t   *result = NULL;
+    rrd_info_t *result = NULL;
     rrd_infoval_t rc;
     struct option long_options[] = {
         {"template", required_argument, 0, 't'},
@@ -428,7 +428,7 @@ int _rrd_update(
     const char *tmplt,
     int argc,
     const char **argv,
-    rrd_info_t *pcdp_summary)
+    rrd_info_t * pcdp_summary)
 {
 
     int       arg_i = 2;
@@ -750,7 +750,7 @@ static int process_arg(
     char **updvals,
     long *tmpl_idx,
     unsigned long tmpl_cnt,
-    rrd_info_t **pcdp_summary,
+    rrd_info_t ** pcdp_summary,
     int version,
     unsigned long *skip_update,
     int *schedule_smooth)
@@ -1855,7 +1855,7 @@ static int write_to_rras(
     unsigned long *rra_current,
     time_t current_time,
     unsigned long *skip_update,
-    rrd_info_t **pcdp_summary)
+    rrd_info_t ** pcdp_summary)
 {
     unsigned long rra_idx;
     unsigned long rra_start;
@@ -1963,7 +1963,7 @@ static int write_RRA_row(
     unsigned long rra_idx,
     unsigned long *rra_current,
     unsigned short CDP_scratch_idx,
-    rrd_info_t **pcdp_summary,
+    rrd_info_t ** pcdp_summary,
     time_t rra_time)
 {
     unsigned long ds_idx, cdp_idx;
@@ -1981,14 +1981,12 @@ static int write_RRA_row(
             iv.u_val = rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val;
             /* append info to the return hash */
             *pcdp_summary = rrd_info_push(*pcdp_summary,
-                                      sprintf_alloc("[%d]RRA[%s][%lu]DS[%s]",
-                                                    rra_time,
-                                                    rrd->rra_def[rra_idx].
-                                                    cf_nam,
-                                                    rrd->rra_def[rra_idx].
-                                                    pdp_cnt,
-                                                    rrd->ds_def[ds_idx].
-                                                    ds_nam), RD_I_VAL, iv);
+                                          sprintf_alloc
+                                          ("[%d]RRA[%s][%lu]DS[%s]", rra_time,
+                                           rrd->rra_def[rra_idx].cf_nam,
+                                           rrd->rra_def[rra_idx].pdp_cnt,
+                                           rrd->ds_def[ds_idx].ds_nam),
+                                          RD_I_VAL, iv);
         }
         if (rrd_write(rrd_file,
                       &(rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].
diff --git a/src/rrd_version.c b/src/rrd_version.c
index d2972ab..32ccbeb 100644
--- a/src/rrd_version.c
+++ b/src/rrd_version.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_version Return
  *****************************************************************************
diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index 0a51798..0faf13d 100644
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_xport.c  export RRD data 
  ****************************************************************************/
diff --git a/src/rrd_xport.h b/src/rrd_xport.h
index 65ca5ff..8918d79 100644
--- a/src/rrd_xport.h
+++ b/src/rrd_xport.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_xport.h  contains XML related constants
  ****************************************************************************/
diff --git a/src/rrdupdate.c b/src/rrdupdate.c
index 0115496..d2841cd 100644
--- a/src/rrdupdate.c
+++ b/src/rrdupdate.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrdupdate.c  Main program for the (standalone) rrdupdate utility
  *****************************************************************************
- * $Id: rrdupdate.c 1413 2008-06-08 17:08:47Z oetiker $
+ * $Id: rrdupdate.c 1432 2008-06-10 23:12:55Z oetiker $
  *****************************************************************************/
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
diff --git a/win32/config.h b/win32/config.h
index 9d2603e..d3bf6e6 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -49,10 +49,7 @@
 /* Vertical label angle: 90.0 (default) or 270.0 */
 #define RRDGRAPH_YLEGEND_ANGLE 90.0
 
-#define RRD_DEFAULT_FONT "arial.ttf"
-/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */
-
-/* #define WITH_PIECHART 1 */
+#define RRD_DEFAULT_FONT "Courier"
 
 /* #define DEBUG 1 */
 
-- 
2.30.2