diff options
| author | Erlang/OTP <[email protected]> | 2010-02-12 12:09:50 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-12 12:09:50 +0000 |
| commit | 9518eafc5ee2edd67e97c56e36807beba8f766ed (patch) | |
| tree | e09992d61e53811b7f9363bdf1be8931ed819f15 | |
| parent | 96ceb366d9f600e645516f24396c976fb738182a (diff) | |
| parent | 3cb8a8707d89ce77251061f8a5fe31528ba322e8 (diff) | |
| download | otp-9518eafc5ee2edd67e97c56e36807beba8f766ed.tar.gz otp-9518eafc5ee2edd67e97c56e36807beba8f766ed.tar.bz2 otp-9518eafc5ee2edd67e97c56e36807beba8f766ed.zip | |
Merge branch 'bd/doc-fixes' into ccase/r13b04_dev
* bd/doc-fixes:
Fix minor documentation errors
| -rw-r--r-- | erts/doc/src/erl.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlang.xml | 2 | ||||
| -rw-r--r-- | lib/mnesia/doc/src/mnesia.xml | 6 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/re.xml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 73d15c33d7..7a2ab375d1 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -252,7 +252,7 @@ run as a distributed node. Hidden nodes always establish hidden connections to all other nodes except for nodes in the same global group. Hidden connections are not published on - neither of the connected nodes, i.e. neither of the connected + either of the connected nodes, i.e. neither of the connected nodes are part of the result from <c><![CDATA[nodes/0]]></c> on the other node. See also hidden global groups, <seealso marker="kernel:global_group">global_group(3)</seealso>.</p> diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 8e2c02e0ce..d4fd8c8c9f 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -4462,7 +4462,7 @@ true</pre> </desc> </func> <func> - <name>spawn_link(Node, Fun) -></name> + <name>spawn_link(Node, Fun) -> pid()</name> <fsummary>Create and link to a new process with a fun as entry point on a specified node</fsummary> <type> <v>Node = node()</v> diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml index 07f9fce8c7..d76471d922 100644 --- a/lib/mnesia/doc/src/mnesia.xml +++ b/lib/mnesia/doc/src/mnesia.xml @@ -360,6 +360,9 @@ If a new item is inserted with the same key as </p> <list type="bulleted"> <item> + <p>mnesia:lock/2 (read_lock_table/1, write_lock_table/1)</p> + </item> + <item> <p>mnesia:write/3 (write/1, s_write/1)</p> </item> <item> @@ -396,9 +399,6 @@ If a new item is inserted with the same key as <p>mnesia:index_read/3</p> </item> <item> - <p>mnesia:lock/2 (read_lock_table/1, write_lock_table/1)</p> - </item> - <item> <p>mnesia:table_info/2</p> </item> </list> diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index e9a32a59d4..4d2a0e0995 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -592,7 +592,7 @@ This option makes it possible to include comments inside complicated patterns. N <v>NLSpec = cr | crlf | lf | anycrlf | any </v> <v>SplitList = [ RetData ] | [ GroupedRetData ]</v> <v>GroupedRetData = [ RetData ]</v> - <v>RetData = iodata() charlist() | binary() | list()</v> + <v>RetData = iodata() | charlist() | binary() | list()</v> </type> <desc> <p>This function splits the input into parts by finding tokens |