summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 19:02:43 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 19:02:43 +0000
commit0df86c0b0a47f566d6f5abada2af64d91dcb34fe (patch)
treee9f83dd32b9bab88c9ba32d88bc0184ed9a2c9df /man
parentcb37e4013ef0ce9b3492c2f86e8fd8bf6a2db007 (diff)
merge revision(s) 53299: [Backport #11870]
* cont.c, doc, man: fix common misspelling. [ruby-core:72466] [Bug #11870] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'man')
-rw-r--r--man/ruby.14
1 files changed, 2 insertions, 2 deletions
diff --git a/man/ruby.1 b/man/ruby.1
index c35f130557..52ff99adb3 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -484,14 +484,14 @@ as below.
.Pp
.Sh GC ENVIRONMENT
The Ruby garbage collector (GC) tracks objects in fixed-sized slots,
-but each object may have auxillary memory allocations handled by the
+but each object may have auxiliary memory allocations handled by the
malloc family of C standard library calls (
.Xr malloc 3 ,
.Xr calloc 3 ,
and
.Xr realloc 3 ) .
In this documentatation, the "heap" refers to the Ruby object heap
-of fixed-sized slots, while "malloc" refers to auxillary
+of fixed-sized slots, while "malloc" refers to auxiliary
allocations commonly referred to as the "process heap".
Thus there are at least two possible ways to trigger GC:
.Bl -hang -offset indent