diff options
author | Gustav Simonsson <[email protected]> | 2012-03-16 10:34:25 +0100 |
---|---|---|
committer | Gustav Simonsson <[email protected]> | 2012-03-16 10:34:25 +0100 |
commit | af311d00bb0cb284d8dd94f760733687d6596868 (patch) | |
tree | aa59816aa4466559c36a6207a4808d629e0d05d9 | |
parent | dbc73d9b5421437f6fac029c06013996de478521 (diff) | |
parent | 67c16b43c5d33c2e4b4dfd226b4508d091336373 (diff) | |
download | otp-af311d00bb0cb284d8dd94f760733687d6596868.tar.gz otp-af311d00bb0cb284d8dd94f760733687d6596868.tar.bz2 otp-af311d00bb0cb284d8dd94f760733687d6596868.zip |
Merge branch 'rj/fix-misc-doc-typos' into maint
* rj/fix-misc-doc-typos:
Fix a code snippet and two typos in the doc
-rw-r--r-- | lib/stdlib/doc/src/ets.xml | 2 | ||||
-rw-r--r-- | lib/stdlib/doc/src/lists.xml | 2 | ||||
-rw-r--r-- | system/doc/tutorial/c_portdriver.xmlsrc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index efd9514db6..0486090e92 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -671,7 +671,7 @@ ets:is_compiled_ms(Broken).</code> <c>duplicate_bag</c>, the function returns a list of arbitrary length.</p> <p>Note that the time order of object insertions is preserved; - The first object inserted with the given key will be first + the first object inserted with the given key will be first in the resulting list, and so on.</p> <p>Insert and look-up times in tables of type <c>set</c>, <c>bag</c> and <c>duplicate_bag</c> are constant, regardless diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 7042c84437..96a0942710 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -663,7 +663,7 @@ splitwith(Pred, List) -> <desc> <p>Returns the sub-list of <c><anno>List1</anno></c> starting at position 1 and with (max) <c><anno>Len</anno></c> elements. It is not an error for - <c><anno>Len</anno></c> to exceed the length of the list -- in that case + <c><anno>Len</anno></c> to exceed the length of the list, in that case the whole list is returned.</p> </desc> </func> diff --git a/system/doc/tutorial/c_portdriver.xmlsrc b/system/doc/tutorial/c_portdriver.xmlsrc index f875fa80d2..e6887a25d1 100644 --- a/system/doc/tutorial/c_portdriver.xmlsrc +++ b/system/doc/tutorial/c_portdriver.xmlsrc @@ -68,8 +68,8 @@ start(SharedLib) -> case erl_ddll:load_driver(".", SharedLib) of ok -> ok; -\011{error, already_loaded} -> ok; -\011_ -> exit({error, could_not_load_driver}) + {error, already_loaded} -> ok; + _ -> exit({error, could_not_load_driver}) end, spawn(?MODULE, init, [SharedLib]). @@ -102,7 +102,7 @@ loop(Port) -> {call, Caller, Msg} -> Port ! {self(), {command, encode(Msg)}}, receive -\011 {Port, {data, Data}} -> + {Port, {data, Data}} -> Caller ! {complex, decode(Data)} end, loop(Port) |