# HG changeset patch
# User Rik <rik@octave.org>
# Date 1407286307 25200
# Node ID 0b657f4e7780bfeffc65895c5dad7fe73aa37e8b
# Parent  724fc0a9eeb1c8f67190ee98fd78b3a4b04830b5# Parent  082063dc2165c71bb25457c7cb7db81fdb068595
maint: Merge stable to gui-release.

diff -r 724fc0a9eeb1 -r 0b657f4e7780 doc/interpreter/package.txi
--- a/doc/interpreter/package.txi	Mon Aug 04 15:05:15 2014 -0400
+++ b/doc/interpreter/package.txi	Tue Aug 05 17:51:47 2014 -0700
@@ -271,7 +271,7 @@
 loaded.
 @end table
 
-Besides the above mentioned files, a package can also contain on or
+Besides the above mentioned files, a package can also contain one or
 more of the following directories:
 
 @table @code
@@ -359,7 +359,7 @@
 
 @item Version
 Version of the package.  A package version must be 3 numbers separated
-by a dot.
+by dots.
 
 @item Date
 Date of last update.
diff -r 724fc0a9eeb1 -r 0b657f4e7780 scripts/miscellaneous/ls.m
--- a/scripts/miscellaneous/ls.m	Mon Aug 04 15:05:15 2014 -0400
+++ b/scripts/miscellaneous/ls.m	Tue Aug 05 17:51:47 2014 -0700
@@ -68,7 +68,7 @@
         args{end}(end) = "";
       endif
     else
-      args = regexprep (args, '([^\w.*? -])', '\\$1');
+      args = regexprep (args, '([^\w.*?-])', '\\$1');
     endif
     args = sprintf ("%s ", args{:});
   else
diff -r 724fc0a9eeb1 -r 0b657f4e7780 scripts/special-matrix/toeplitz.m
--- a/scripts/special-matrix/toeplitz.m	Mon Aug 04 15:05:15 2014 -0400
+++ b/scripts/special-matrix/toeplitz.m	Tue Aug 05 17:51:47 2014 -0700
@@ -74,7 +74,7 @@
     if (! (isvector (c) && isvector (r))) 
       error ("toeplitz: C and R must be vectors");
     elseif (r(1) != c(1))
-      warning ("toeplitz: column wins anti-diagonal conflict");
+      warning ("toeplitz: column wins diagonal conflict");
     endif
 
     nr = length (c);