diff options
| author | Zandra Hird <[email protected]> | 2015-03-18 13:11:13 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-18 13:11:13 +0100 |
| commit | 6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c (patch) | |
| tree | 0bb89aca2a1a253176c3568870ff7d1cf4dbc294 | |
| parent | 2993e322c6d458e63376fbdbb97fac847fde50e4 (diff) | |
| parent | f342f277ff0573d06be083d50e6e5fa2d57263a9 (diff) | |
| download | otp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.tar.gz otp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.tar.bz2 otp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.zip | |
Merge branch 'wmalik/minor-fixes' into maint
* wmalik/minor-fixes:
Fix proc_lib doc
Remove commented out code
Fix make_hash description
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 | ||||
| -rw-r--r-- | lib/kernel/src/erl_distribution.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/proc_lib.xml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index c505c44905..f810fca9a4 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -707,7 +707,7 @@ erts_bld_atom_2uint_3tup_list(Uint **hpp, Uint *szp, Sint length, ** If N < 0, Y = FUNNY_NUMBER4 else Y = FUNNY_NUMBER3. ** The hash value is Y*h(J) mod 2^32 where h(J) is calculated like ** h(0) = <initial hash> -** h(i) = h(i-i)*X + B(i-1) +** h(i) = h(i-1)*X + B(i-1) ** The above should hold regardless of internal representation. ** Pids are hashed like small numbers but with differrent constants, as are ** ports. diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl index 25ad34357a..3c4429129e 100644 --- a/lib/kernel/src/erl_distribution.erl +++ b/lib/kernel/src/erl_distribution.erl @@ -22,7 +22,6 @@ -export([start_link/0,start_link/1,init/1,start/1,stop/0]). -%-define(DBG,io:format("~p:~p~n",[?MODULE,?LINE])). -define(DBG,erlang:display([?MODULE,?LINE])). start_link() -> diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 5bf5744622..b0bad9d27b 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -173,7 +173,7 @@ <name name="init_ack" arity="2"/> <fsummary>Used by a process when it has started.</fsummary> <desc> - <p>This function must used by a process that has been started by + <p>This function must be used by a process that has been started by a <seealso marker="#start/3">start[_link]/3,4,5</seealso> function. It tells <c><anno>Parent</anno></c> that the process has initialized itself, has started, or has failed to initialize |