diff --git a/pep-0008.txt b/pep-0008.txt --- a/pep-0008.txt +++ b/pep-0008.txt @@ -19,9 +19,10 @@ companion informational PEP describing style guidelines for the C code in the C implementation of Python [1]_. -This document was adapted from Guido's original Python Style Guide -essay [2]_, with some additions from Barry's style guide [3]_. Where -there's conflict, Guido's style rules for the purposes of this PEP. +This document and PEP 257 (Docstring Conventions) were adapted from +Guido's original Python Style Guide essay, with some additions from +Barry's style guide [2]_. +Where there's conflict, Guido's style rules for the purposes of this PEP. This PEP may still be incomplete (in fact, it may never be finished ). @@ -496,7 +497,7 @@ - ``UPPERCASE`` - ``UPPER_CASE_WITH_UNDERSCORES`` - ``CapitalizedWords`` (or CapWords, or CamelCase -- so named because - of the bumpy look of its letters [4]_). This is also sometimes known + of the bumpy look of its letters [3]_). This is also sometimes known as StudlyCaps. Note: When using abbreviations in CapWords, capitalize all the @@ -963,12 +964,10 @@ .. [1] PEP 7, Style Guide for C Code, van Rossum -.. [2] http://www.python.org/doc/essays/styleguide.html - -.. [3] Barry's GNU Mailman style guide +.. [2] Barry's GNU Mailman style guide http://barry.warsaw.us/software/STYLEGUIDE.txt -.. [4] http://www.wikipedia.com/wiki/CamelCase +.. [3] http://www.wikipedia.com/wiki/CamelCase Copyright