Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 843-845)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 84-87)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-30

2 files changed, 13 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 80ddad0085d..18cd4b72bc6 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-03  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Basic Graphics): Mention the graphing of error
+        forms.
+        (Graphics Options): Mention how `g s' handles error forms.
+
 2007-08-01  Alan Mackenzie  <acm@muc.de>
 
         * cc-mode.texi (Mailing Lists and Bug Reports): Correct "-no-site-file"
diff --git a/man/calc.texi b/man/calc.texi
index 3085e2e8dd8..9e50629a3b2 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -28417,7 +28417,10 @@ variables.
 
 The ``x'' and ``y'' values for the data points (as pulled from the vectors,
 calculated from the formulas, or interpolated from the intervals) should
-be real numbers (integers, fractions, or floats).  If either the ``x''
+be real numbers (integers, fractions, or floats).  One exception to this
+is that the ``y'' entry can consist of a vector of numbers combined with
+error forms, in which case the points will be plotted with the
+appropriate error bars.  Other than this, if either the ``x''
 value or the ``y'' value of a given data point is not a real number, that
 data point will be omitted from the graph.  The points on either side
 of the invalid point will @emph{not} be connected by a line.
@@ -28815,7 +28818,9 @@ available for any device.
 The @kbd{g S} (@code{calc-graph-point-style}) command similarly turns
 the symbols at the data points on or off, or sets the point style.
 If you turn both lines and points off, the data points will show as
-tiny dots.
+tiny dots.  If the ``y'' values being plotted contain error forms and 
+the connecting lines are turned off, then this command will also turn 
+the error bars on or off.
 
 @cindex @code{LineStyles} variable
 @cindex @code{PointStyles} variable