From: Sascha Wildner <saw@online.de>
Date: Tue, 12 Apr 2011 12:04:17 +0000 (+0200)
Subject: Rename the memoryallocators(9) manual page to memory(9).
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/ae03fd515b66d7eeb7d671a3b0eedb2924693ec9

Rename the memoryallocators(9) manual page to memory(9).

Analogous to memory(3) for userland.

While here, do some minor cleanup on it and link back to it from the
individual allocator manual pages.
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index a426e810d6..f4cf9479c1 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1573,6 +1573,8 @@ TO_REMOVE+=/usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/cat3/STAILQ_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/bin/gasp
+TO_REMOVE+=/usr/share/man/cat/cat9/memoryallocators.9.gz
+TO_REMOVE+=/usr/share/man/cat/man9/memoryallocators.9.gz
 
 # XXX Remove when pfsync(4) has been fixed
 TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 89a2f35226..050b3626aa 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -112,7 +112,7 @@ MAN=	accept_filter.9 \
 	make_dev.9 \
 	mbuf.9 \
 	MD5.9 \
-	memoryallocators.9 \
+	memory.9 \
 	microseq.9 \
 	microtime.9 \
 	microuptime.9 \
diff --git a/share/man/man9/kmalloc.9 b/share/man/man9/kmalloc.9
index 57ddc16b41..0c7dda3f44 100644
--- a/share/man/man9/kmalloc.9
+++ b/share/man/man9/kmalloc.9
@@ -249,4 +249,5 @@ message.
 .Sh SEE ALSO
 .Xr vmstat 8 ,
 .Xr contigmalloc 9 ,
+.Xr memory 9 ,
 .Xr vnode 9
diff --git a/share/man/man9/memoryallocators.9 b/share/man/man9/memory.9
similarity index 98%
rename from share/man/man9/memoryallocators.9
rename to share/man/man9/memory.9
index 7722ca685b..110605d9b5 100644
--- a/share/man/man9/memoryallocators.9
+++ b/share/man/man9/memory.9
@@ -27,10 +27,10 @@
 .\" $FreeBSD: src/share/man/man9/zone.9,v 1.9.2.4 2002/05/02 20:01:29 asmodai Exp $
 .\"
 .Dd March 23, 2011
-.Dt MEMORYALLOCATORS 9
+.Dt MEMORY 9
 .Os
 .Sh NAME
-.Nm memoryallocators
+.Nm memory
 .Nd introduction to kernel memory allocators
 .Sh DESCRIPTION
 The
@@ -78,7 +78,7 @@ restricted to use before the VM is initialized and to core VM structures.
 The zone allocator may block.
 .Pp
 For more information see
-.Xr zalloc 9 .
+.Xr zone 9 .
 .Sh HISTORY
 The kmalloc and Zone allocators were inherited from
 .Fx .
diff --git a/share/man/man9/mpipe.9 b/share/man/man9/mpipe.9
index 1a14f2e5a5..d1351d24ce 100644
--- a/share/man/man9/mpipe.9
+++ b/share/man/man9/mpipe.9
@@ -131,7 +131,7 @@ This function may block.
 The MPIPE implementation is in
 .Pa /sys/kern/kern_mpipe.c .
 .Sh SEE ALSO
-.Xr kmalloc 9
+.Xr memory 9
 .Sh HISTORY
 MPIPE first appeared in
 .Dx 1.0 .
diff --git a/share/man/man9/objcache.9 b/share/man/man9/objcache.9
index 340399968c..637795b589 100644
--- a/share/man/man9/objcache.9
+++ b/share/man/man9/objcache.9
@@ -389,6 +389,7 @@ foo_uninit(void)
 }
 .Ed
 .Sh SEE ALSO
+.Xr memory 9
 .Rs
 .%A "Jeff Bonwick"
 .%T "The Slab Allocator: An Object-Caching Kernel Memory Allocator"
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index c126b11dd0..7ecdc02fcd 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -212,7 +212,7 @@ function returns a pointer to an item, or
 if the zone ran out of unused items and the allocator was unable to
 enlarge it.
 .Sh SEE ALSO
-.Xr kmalloc 9
+.Xr memory 9
 .Sh HISTORY
 The zone allocator first appeared in
 .Fx 3.0 .