# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1455832717 18000
# Node ID 325e04c63f8c3b43fa90fe9a788f4fcc017b5862
# Parent  8376de2eaf003d7fc5c914a1d9631581885523d6# Parent  aaf59727f8095c086d115408b9fa858d83aa530c
maint: Merge default to stable.

diff -r 8376de2eaf00 -r 325e04c63f8c README
--- a/README	Thu Feb 18 16:42:42 2016 -0500
+++ b/README	Thu Feb 18 16:58:37 2016 -0500
@@ -35,7 +35,7 @@
 Octave requires approximately 1.4 GB of disk storage to unpack and
 compile from source (significantly less, 400 MB, if you don't compile
 with debugging symbols).  Once installed, Octave requires
-approximately 350MB of disk space (again, considerably less, 70 MB,
+approximately 350 MB of disk space (again, considerably less, 70 MB,
 if you don't build shared libraries or the binaries and libraries do
 not include debugging symbols).
 
diff -r 8376de2eaf00 -r 325e04c63f8c doc/doxyhtml/README
diff -r 8376de2eaf00 -r 325e04c63f8c doc/interpreter/install.txi
--- a/doc/interpreter/install.txi	Thu Feb 18 16:42:42 2016 -0500
+++ b/doc/interpreter/install.txi	Thu Feb 18 16:58:37 2016 -0500
@@ -604,12 +604,12 @@
 
 @example
 @group
-double:         16GB
-single:          8GB
-uint64, int64:  16GB
-uint32, int32:   8GB
-uint16, int16:   4GB
-uint8, int8:     2GB
+double:         16 GB
+single:          8 GB
+uint64, int64:  16 GB
+uint32, int32:   8 GB
+uint16, int16:   4 GB
+uint8, int8:     2 GB
 @end group
 @end example
 
diff -r 8376de2eaf00 -r 325e04c63f8c scripts/miscellaneous/fact.m
--- a/scripts/miscellaneous/fact.m	Thu Feb 18 16:42:42 2016 -0500
+++ b/scripts/miscellaneous/fact.m	Thu Feb 18 16:58:37 2016 -0500
@@ -46,7 +46,7 @@
       "Richard Stallman's DNA is in binary.";
       "Richard Stallman's nervous system is completely wireless.";
       "Richard Stallman's brain accepts UNIX commands.";
-      "If Richard Stallman has 1GB of RAM, and if you have 1GB of RAM, Richard Stallman has more RAM than you.";
+      "If Richard Stallman has 1 GB of RAM, and if you have 1 GB of RAM, Richard Stallman has more RAM than you.";
       "Richard Stallman eats ethernet cables. That's why they invented wireless.";
       "Richard Stallman has a katana. 'Nuff said.";
       "Richard Stallman wrote a program that divides by zero.";