aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-03-30 10:19:51 +0000
committerErlang/OTP <[email protected]>2010-03-30 10:19:51 +0000
commit38960dcc0746fcea4895dfac588b618c4cb18a69 (patch)
tree8c739eaf4a2886c0f6ae75266993e26f11aea017
parentcd8a8bc9f6390f93dfa7c9278733ee3603ebbbf5 (diff)
parent3d181930637a6d9a9e2cf48354b7a173e45f2de2 (diff)
downloadotp-38960dcc0746fcea4895dfac588b618c4cb18a69.tar.gz
otp-38960dcc0746fcea4895dfac588b618c4cb18a69.tar.bz2
otp-38960dcc0746fcea4895dfac588b618c4cb18a69.zip
Merge branch 'mh/doc-inet-getopts' into dev
* mh/doc-inet-getopts: Doc fix: inet:getopts/2 returns {ok, OptionValues}, not just OptionValues
-rw-r--r--lib/kernel/doc/src/inet.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index f502b30c8d..2ae230152c 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1997</year><year>2009</year>
+ <year>1997</year><year>2010</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -13,12 +13,12 @@
compliance with the License. You should have received a copy of the
Erlang Public License along with this software. If not, it can be
retrieved online at http://www.erlang.org/.
-
+
Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
the License for the specific language governing rights and limitations
under the License.
-
+
</legalnotice>
<title>inet</title>
@@ -221,7 +221,7 @@ fe80::204:acff:fe17:bf38
</desc>
</func>
<func>
- <name>getopts(Socket, Options) -> OptionValues | {error, posix()}</name>
+ <name>getopts(Socket, Options) -> {ok, OptionValues} | {error, posix()}</name>
<fsummary>Get one or more options for a socket</fsummary>
<type>
<v>Socket = term()</v>