some cleanup for "machine memory";

2 files changed, 24 insertions, 18 deletions

diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index c3ce6cf6b98..fff28ac9188 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.19 2013/10/23 05:05:19 mlarkin Exp $
+.\"	$OpenBSD: boot.8,v 1.20 2013/10/25 13:08:03 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: October 23 2013 $
+.Dd $Mdocdate: October 25 2013 $
 .Dt BOOT 8 amd64
 .Os
 .Sh NAME
@@ -211,24 +211,27 @@ Otherwise the arguments specify how to modify the
 memory configuration.
 They take the form of:
 .Pp
-.Dl =<size>[KkMmGg]
-.Dl [+-]<size>@<address>
+.D1 =size[KMG]
+.D1 [+-]size@address
 .Pp
 Meaning to add(+), exempt(-) or limit(=) the amount of memory specified by
-.Ar <size>
+.Ar size
 at the location specified by
-.Ar <address> .
+.Ar address .
 Both size and base address can be specified as octal,
 decimal, or hexadecimal numbers, as accepted by the
 .Xr strtoul 3
 routine.
+Memory size may be suffixed by K or k, for kilobytes;
+M or m, for megabytes;
+and G or g, for gigabytes.
 .Pp
 The limit(=) option simply ignores any memory above the given
 memory limit.
 This is useful for testing kernels in an artificially
 constrained memory situation.
 For example, the following limits the kernel to using only
-memory below 64M:
+memory below 64MB:
 .Bd -unfilled -offset indent
 machine mem =64M
 .Ed
@@ -236,7 +239,7 @@ machine mem =64M
 Memory segments are not required to be adjacent to each other;
 the only requirement is that there is real physical memory under
 the range added.
-The following example adds 32M of memory right after the first 16M:
+The following example adds 32MB of memory right after the first 16MB:
 .Bd -unfilled -offset indent
 machine mem +0x2000000@0x1000000
 .Ed
@@ -245,7 +248,7 @@ Another useful command is to withdraw a range
 of memory from OS usage (it may have been wrongfully reported as
 useful by the BIOS).
 This example
-effectively excludes the 15\(en16M range from the map of useful memory:
+effectively excludes the 15\(en16MB range from the map of useful memory:
 .Bd -unfilled -offset indent
 machine mem -0x100000@0xf00000
 .Ed
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index 89d7bfec6b2..636d3fb9522 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.56 2013/10/23 05:05:19 mlarkin Exp $
+.\"	$OpenBSD: boot.8,v 1.57 2013/10/25 13:08:03 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: October 23 2013 $
+.Dd $Mdocdate: October 25 2013 $
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -211,24 +211,27 @@ Otherwise the arguments specify how to modify the
 memory configuration.
 They take the form of:
 .Pp
-.Dl =<size>[KkMmGg]
-.Dl [+-]<size>@<address>
+.D1 =size[KMG]
+.D1 [+-]size@address
 .Pp
 Meaning to add(+), exempt(-) or limit(=) the amount of memory specified by
-.Ar <size>
+.Ar size
 at the location specified by
-.Ar <address> .
+.Ar address .
 Both size and base address can be specified as octal,
 decimal, or hexadecimal numbers, as accepted by the
 .Xr strtoul 3
 routine.
+Memory size may be suffixed by K or k, for kilobytes;
+M or m, for megabytes;
+and G or g, for gigabytes.
 .Pp
 The limit(=) option simply ignores any memory above the given
 memory limit.
 This is useful for testing kernels in an artificially
 constrained memory situation.
 For example, the following limits the kernel to using only
-memory below 64M:
+memory below 64MB:
 .Bd -unfilled -offset indent
 machine mem =64M
 .Ed
@@ -236,7 +239,7 @@ machine mem =64M
 Memory segments are not required to be adjacent to each other;
 the only requirement is that there is real physical memory under
 the range added.
-The following example adds 32M of memory right after the first 16M:
+The following example adds 32MB of memory right after the first 16MB:
 .Bd -unfilled -offset indent
 machine mem +0x2000000@0x1000000
 .Ed
@@ -245,7 +248,7 @@ Another useful command is to withdraw a range
 of memory from OS usage (it may have been wrongfully reported as
 useful by the BIOS).
 This example
-effectively excludes the 15\(en16M range from the map of useful memory:
+effectively excludes the 15\(en16MB range from the map of useful memory:
 .Bd -unfilled -offset indent
 machine mem -0x100000@0xf00000
 .Ed