diff options
| author | Henrik Nord <[email protected]> | 2011-12-06 16:26:15 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-12-06 16:26:40 +0100 |
| commit | 3996fd94136ceb850fd93c732daeab919ffdcb88 (patch) | |
| tree | 0feab389e9375f321bdd6676c45a3532ed39ac06 /erts/doc/src/erts_alloc.xml | |
| parent | 5f1bee4f92dd991364606f968ca2ec647ba8b33d (diff) | |
| parent | f3052a3a1a78c5cb5135c5c96c64ae4a39433745 (diff) | |
| download | otp-3996fd94136ceb850fd93c732daeab919ffdcb88.tar.gz otp-3996fd94136ceb850fd93c732daeab919ffdcb88.tar.bz2 otp-3996fd94136ceb850fd93c732daeab919ffdcb88.zip | |
Merge branch 'ta/docs'
* ta/docs:
Fix misspelling of chosen
Fix typos in erl(1)
Fix misspelling of 'turn off'
Fix typo in reltool(3)
Fix typo in gen_sctp(3)
Fix typo in mod_responsecontrol.erl
Fix typo in erts_alloc(3)
Fix typos in ssl_cipher.erl
Fix typos in expressions.xml
file: correct make_link/2 and make_symlink/2 docs
Fix typo in test_server(3)
Fix typos in io_protocol.xml
Fix typo in erlang(3)
Fix typos in tar_SUITE
Fix typos in erts/preloaded/src
OTP-9787
Diffstat (limited to 'erts/doc/src/erts_alloc.xml')
| -rw-r--r-- | erts/doc/src/erts_alloc.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml index 8378e7c676..ec5e7d9b74 100644 --- a/erts/doc/src/erts_alloc.xml +++ b/erts/doc/src/erts_alloc.xml @@ -212,8 +212,8 @@ <p>Apart from the ordinary allocators described above a number of pre-allocators are used for some specific data types. These pre-allocators pre-allocate a fixed amount of memory for certain data - types when the run-time system starts. As long as there are available - pre-allocated memory, it will be used. When no pre-allocated memory is + types when the run-time system starts. As long as pre-allocated memory + is available, it will be used. When no pre-allocated memory is available, memory will be allocated in ordinary allocators. These pre-allocators are typically much faster than the ordinary allocators, but can only satisfy a limited amount of requests.</p> |