summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-03-28 23:39:45 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-03-28 23:39:45 (GMT)
commit9c5e98ff291f7877100d05d744134a8b6f37294e (patch)
tree2643dda3534bef1cf5c33d867bcfedb2b448f9f1
parent9effd1f5fb814fcdb6e8072e2afbf841bdb19d61 (diff)
parent4ab532bbfeb6dd6c9804996e19b665b22de65d56 (diff)
downloadcpython-9c5e98ff291f7877100d05d744134a8b6f37294e.zip
cpython-9c5e98ff291f7877100d05d744134a8b6f37294e.tar.gz
cpython-9c5e98ff291f7877100d05d744134a8b6f37294e.tar.bz2
merge
-rw-r--r--Doc/howto/logging-cookbook.rst2
-rw-r--r--Doc/tutorial/interpreter.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 833ad15..82c8f51 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -416,7 +416,7 @@ module. Here is a basic working example::
Simple TCP socket-based logging receiver suitable for testing.
"""
- allow_reuse_address = 1
+ allow_reuse_address = True
def __init__(self, host='localhost',
port=logging.handlers.DEFAULT_TCP_LOGGING_PORT,
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index 6625010..4df7368 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -106,7 +106,7 @@ before printing the first prompt::
Continuation lines are needed when entering a multi-line construct. As an
example, take a look at this :keyword:`if` statement::
- >>> the_world_is_flat = 1
+ >>> the_world_is_flat = True
>>> if the_world_is_flat:
... print("Be careful not to fall off!")
...