changeset: 77419:29fb36928433
parent: 77416:26e2ee402a0b
parent: 77418:4d755a711823
user: Sandro Tosi <sandro.tosi@gmail.com>
date: Wed Jun 13 23:59:21 2012 +0200
files: Doc/library/socket.rst
description:
Issue #15060: merge with 3.2
diff -r 26e2ee402a0b -r 29fb36928433 Doc/library/socket.rst
--- a/Doc/library/socket.rst	Tue Jun 12 23:04:11 2012 +0200
+++ b/Doc/library/socket.rst	Wed Jun 13 23:59:21 2012 +0200
@@ -61,7 +61,7 @@
 - A pair ``(host, port)`` is used for the :const:`AF_INET` address family,
 where *host* is a string representing either a hostname in Internet domain
 notation like ``'daring.cwi.nl'`` or an IPv4 address like ``'100.50.200.5'``,
- and *port* is an integral port number.
+ and *port* is an integer port number.
 
 - For :const:`AF_INET6` address family, a four-tuple ``(host, port, flowinfo,
 scopeid)`` is used, where *flowinfo* and *scopeid* represent the ``sin6_flowinfo``
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/29fb36928433">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/29fb36928433" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>