summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-25 16:22:26 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-25 16:22:26 (GMT)
commitaa1ef2d735772b7a4c4b4164998da2883208ea48 (patch)
treed4ff53d5106caaf124a3b62109c5de7265e49299 /Doc
parent0f67a99fc982ebad6b489a319c2ac521d64ea11e (diff)
parent51b7aedaddb357340fa219d89f263269562d1f62 (diff)
downloadcpython-aa1ef2d735772b7a4c4b4164998da2883208ea48.zip
cpython-aa1ef2d735772b7a4c4b4164998da2883208ea48.tar.gz
cpython-aa1ef2d735772b7a4c4b4164998da2883208ea48.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/documenting/style.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/documenting/style.rst b/Doc/documenting/style.rst
index 1fdc139..71a52f2 100644
--- a/Doc/documenting/style.rst
+++ b/Doc/documenting/style.rst
@@ -136,7 +136,7 @@ Good example (establishing confident knowledge in the effective use of the langu
Economy of Expression
---------------------
-More documentation is not necessarily better documentation. Error on the side
+More documentation is not necessarily better documentation. Err on the side
of being succinct.
It is an unfortunate fact that making documentation longer can be an impediment
@@ -198,7 +198,7 @@ Audience
The tone of the tutorial (and all the docs) needs to be respectful of the
reader's intelligence. Don't presume that the readers are stupid. Lay out the
relevant information, show motivating use cases, provide glossary links, and do
-our best to connect-the-dots, but don't talk down to them or waste their time.
+your best to connect-the-dots, but don't talk down to them or waste their time.
The tutorial is meant for newcomers, many of whom will be using the tutorial to
evaluate the language as a whole. The experience needs to be positive and not