Copied branches/2.0 to trunk/software

2 files changed, 43 insertions, 12 deletions

diff --git a/doc/smokeping_extend.pod b/doc/smokeping_extend.pod
index eef0bf6..0a0eb41 100644
--- a/doc/smokeping_extend.pod
+++ b/doc/smokeping_extend.pod
@@ -46,7 +46,7 @@ manpage. The supported section names are
 C<name>, C<overview>, C<description>, C<authors>, C<notes>, C<bugs>, and
 C<see_also>. If you don't need a particular section, just leave it out.
 
-The special sections C<synopsys> and C<variables> are automatically
+The special sections C<synopsis> and C<variables> are automatically
 generated from the description of your variables. See below.
 
 Note that if you use 'here documents' ('<<') that have POD markup inside,
@@ -94,13 +94,13 @@ convenience method called C<_makevars> that does this, and the common idiom is
  }
 
 The variables are declared in a syntax that comes from the module used
-for parsing the configuration file, C<ISG::ParseConfig>. Each variable
+for parsing the configuration file, C<Config::Grammar>. Each variable
 should be a hash that uses the "special variable keys" documented in
-L<ISG::ParseConfig>. See C<Smokeping::probes::skel> and the other
+L<Config::Grammar>. See C<Smokeping::probes::skel> and the other
 probes for examples. 
 
 For reference, here are the keys the hash should have. Much of this
-is taken straight from the C<ISG::ParseConfig> manual.
+is taken straight from the C<Config::Grammar> manual.
 
 =over
 
@@ -114,7 +114,7 @@ Description of the variable.
 
 =item _example
 
-An example value. This will be used in the SYNOPSYS section in the
+An example value. This will be used in the SYNOPSIS section in the
 probe manual.
 
 =back
@@ -150,11 +150,11 @@ the returned string as content.
 
 The C<probevars> and C<targetvars> methods should return hash references
 that contain the variable names as keys and the hashes described above
-as values. In addition the C<ISG::ParseConfig> special section key
+as values. In addition the C<Config::Grammar> special section key
 C<_mandatory> is supported and should contain a reference to a list of
 mandatory variables. The C<_makevars> method is available of this special
 key and merges the mandatory lists in its arguments. Note that no other
-C<ISG::ParseConfig> special section keys are supported.
+C<Config::Grammar> special section keys are supported.
 
 =head1 INITIALIZATION
 
@@ -185,7 +185,7 @@ That's it, you're done!
 =head1 EXAMPLE CONFIGURATIONS
 
 If you would like to provide a documented example configuration for your
-probe (in addition to the automatically generated SYNOPSYS section in
+probe (in addition to the automatically generated SYNOPSIS section in
 the probe manual), you can do so by adding it to the L<Smokeping::Examples|Smokeping::Examples>
 module.  Look for the 'examples' subroutine and add your example there.
 
diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index bd3b93a..df5013b 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -23,7 +23,7 @@ An official list of changes with each release can be found in the CHANGES
 file in the Smokeping distribution. This document tries to complement
 that with upgrading instructions etc.
 
-=head1 1.38 to 2.0
+=head1 1.40 to 2.0
 
 The biggest change with the 2.0 release is that the configuration file
 is now parsed much more strictly. This should result in (hopefully
@@ -32,6 +32,13 @@ trial-and-error variety than it used to be. It also automates the
 generation of the configuration documentation from the source code,
 so the docs are now more accurate.
 
+A smaller change worth mentioning is the inclusion of the tSmoke script
+(contributed by Dan McGinn-Combs) for sending summary emails on daily
+and weekly system status. Note that it needs the new 'tmail' variable
+to be defined in the config file.
+
+=head2 CONFIGURATION
+
 The configuration syntax has stayed mostly the same, except for the
 issues below.
 
@@ -105,13 +112,24 @@ and measuring and visualizing the variation between them.
 
 Smokeping now checks at startup that the parameters of any existing RRD files
 match those specified in the configuration file. If there is a discrepancy,
-it will give an error message and refuse to start. 
+it will try to fix the situation and refuse to start if it can't.
 
-This situation is most likely to happen if you have modified the C<step>
-or C<pings> variables in your configuration file. You'll then have to
+This situation is most likely to happen if you have modified the
+C<pings> variable in your configuration file. You'll then have to
 delete the old RRD file or somehow convert it to use the new parameters.
 The C<rrdtune> command might be helpful here.
 
+=item Configurable location for DYNAMIC-related files
+
+There is now a new configuration variable, C<dyndir>, that can be used
+to specify the location of the DYNAMIC-related files (.adr and .snmp).
+These files used to be kept under C<datadir> along with the RRD files,
+but since they need to be writable by the web server, it may be useful
+to separate these.
+
+If C<dyndir> is not specified, Smokeping will use the C<datadir> value
+as the default. This should ensure that no existing setups will break.
+
 =back
 
 In addition to this, some probes have had minor incompatible changes to
@@ -148,6 +166,8 @@ quotes are not needed anymore around the User-Agent string (the C<agent>
 parameter).  Smokeping will complain if it notices quotes around the
 string.
 
+Any extra arguments for C<curl> can now be specified in the C<extraargs> variable.
+
 =item L<EchoPingHttp|Smokeping::probes::EchoPingHttp>
 
 The default timeout of this probe has been raised to 10 seconds.
@@ -197,6 +217,17 @@ in the C<host> variable, like it is with all the other probes.
 
 =back
 
+=head1 1.38 to 1.40
+
+=over
+
+=item The new navigation feature
+
+The big visible difference between 1.38 and 1.40 is the new browser navigation
+feature: when clicking on the graphs in detail view you can select
+different time ranges for the graph. The creation of this
+feature has been sponsored by BeverlyCorp.com.
+
 =head1 1.34 to 1.37
 
 =over