aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-12-04 12:16:52 +0100
committerHenrik Nord <[email protected]>2012-12-04 12:16:55 +0100
commit33334fe5f0527ffd02f578601546717773fd55c9 (patch)
tree8a6fcd735b8ffbaa6a09b1a8e90300d11c14a0f9
parent7970cc9f8dd44fe236d38867835d874ac53ceb9c (diff)
parent2efdc7b6867e53760e870cdcb4821f42cf96d417 (diff)
downloadotp-33334fe5f0527ffd02f578601546717773fd55c9.tar.gz
otp-33334fe5f0527ffd02f578601546717773fd55c9.tar.bz2
otp-33334fe5f0527ffd02f578601546717773fd55c9.zip
Merge branch 'ta/docsmaster'
* ta/docsmaster: Fix various doc typos for R16 Fix various typos in HOWTO/ for R16 Fix various comment typos for R16 OTP-10611
-rw-r--r--HOWTO/BENCHMARKS.md4
-rw-r--r--erts/emulator/beam/code_ix.h4
-rw-r--r--lib/tools/doc/src/xref.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/HOWTO/BENCHMARKS.md b/HOWTO/BENCHMARKS.md
index b3df4638ea..28a590dfd2 100644
--- a/HOWTO/BENCHMARKS.md
+++ b/HOWTO/BENCHMARKS.md
@@ -18,13 +18,13 @@ benchmarks you have to [install the tests][]. To get a listing of all
benchmarks you have available call `ts:benchmarks()`.
To run all benchmarks call `ts:bench()`. This will run all benchmarks using
-the emulator which is in you `$PATH` (Note that this does not have to be the
+the emulator which is in your `$PATH` (Note that this does not have to be the
same as from which the benchmarks were built from). All the results of the
benchmarks are put in a folder in `$TESTROOT/test_server/` called
`YYYY_MO_DDTHH_MI_SS`.
Each benchmark is run multiple times and the data for all runs is collected in
-the files within the benchmark folder. All benchmarks are written so that a
+the files within the benchmark folder. All benchmarks are written so that
higher values are better.
Writing benchmarks
diff --git a/erts/emulator/beam/code_ix.h b/erts/emulator/beam/code_ix.h
index bc10e956f5..e2bd0da112 100644
--- a/erts/emulator/beam/code_ix.h
+++ b/erts/emulator/beam/code_ix.h
@@ -18,7 +18,7 @@
*/
/* Description:
- * This is the interface that facilitate changing the beam code
+ * This is the interface that facilitates changing the beam code
* (load,upgrade,delete) while allowing executing Erlang processes to
* access the code without any locks or other expensive memory barriers.
*
@@ -35,7 +35,7 @@
* The third code index is not explicitly used. It can be thought of as
* the "previous active" or the "next staging" index. It is needed to make
* sure that we do not reuse a code index for staging until we are sure
- * that no executing BIFs are still referring it.
+ * that no executing BIFs are still referencing it.
* We could get by with only two (0 and 1), but that would require that we
* must wait for all schedulers to re-schedule before each code change
* operation can start staging.
diff --git a/lib/tools/doc/src/xref.xml b/lib/tools/doc/src/xref.xml
index 17de66bb22..9706ae6746 100644
--- a/lib/tools/doc/src/xref.xml
+++ b/lib/tools/doc/src/xref.xml
@@ -1453,7 +1453,7 @@ Evaluates a predefined analysis.
Note however that the code path will be traversed once for
each used <seealso marker="#library_module">library module</seealso> while setting up module data.
On the other hand, if there are only a few modules that are
- used by not analyzed, using <c>code_path</c> may be faster
+ used but not analyzed, using <c>code_path</c> may be faster
than setting the library path to <c>code:get_path()</c>.
</p>
<p>If the library path is set to <c>code_path</c>, the set of