diff options
| author | Marcus Arendt <[email protected]> | 2014-12-02 09:38:53 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-12-02 09:38:53 +0100 |
| commit | 6d460b92cae778427916a7f6c22b2f59f4b411d8 (patch) | |
| tree | c6eba698938d0bb927003ab4df20fb54b8c40f53 | |
| parent | 826b9ae8b655f18fc2a74f2c9147fb4163a78770 (diff) | |
| parent | ee17dd99f2a56499b13dc4c84578105ea1f14ff6 (diff) | |
| download | otp-6d460b92cae778427916a7f6c22b2f59f4b411d8.tar.gz otp-6d460b92cae778427916a7f6c22b2f59f4b411d8.tar.bz2 otp-6d460b92cae778427916a7f6c22b2f59f4b411d8.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/stdlib/doc/src/dict.xml | 2 | ||||
| -rw-r--r-- | lib/tools/doc/src/eprof.xml | 2 | ||||
| -rw-r--r-- | lib/tools/doc/src/fprof.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index 942fd1f45e..0771682a25 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -121,7 +121,7 @@ <c><anno>Dict</anno></c> together with an extra argument <c>Acc</c> (short for accumulator). <c><anno>Fun</anno></c> must return a new accumulator which is passed to the next call. <c><anno>Acc0</anno></c> is - returned if the list is empty. The evaluation order is + returned if the dict is empty. The evaluation order is undefined.</p> </desc> </func> diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml index 3ebacf5546..73fd563fbd 100644 --- a/lib/tools/doc/src/eprof.xml +++ b/lib/tools/doc/src/eprof.xml @@ -35,7 +35,7 @@ used. The profiling is done using the Erlang trace BIFs. Tracing of local function calls for a specified set of processes is enabled when profiling is begun, and disabled when profiling is stopped.</p> - <p>When using Eprof expect a slowdown in program execution.</p> + <p>When using Eprof, expect a slowdown in program execution.</p> </description> <funcs> <func> diff --git a/lib/tools/doc/src/fprof.xml b/lib/tools/doc/src/fprof.xml index ef8b82c9fa..f83c049fcd 100644 --- a/lib/tools/doc/src/fprof.xml +++ b/lib/tools/doc/src/fprof.xml @@ -789,7 +789,7 @@ create_file_slow(FD, M, N) -> function was first unsuspended and then garbage collected. Otherwise the printout would show <c>garbage_collect</c> being called from <c>suspend</c> but not - not which function that might have caused the garbage + which function that might have caused the garbage collection. </p> <p>Let us now get back to the test code:</p> |