Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3ae73f4

Browse files
authored
Merge pull requestrealpython#962 from apjanke/standard-american-english
Standardize on American English for the Guide
2 parents9d975b5 +705e90e commit3ae73f4

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

‎docs/dev/env.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ pyenv
252252
of the Python interpreter to be installed at the same time. This solves the
253253
problem of having different projects requiring different versions of Python.
254254
For example, it becomes very easy to install Python 2.7 for compatibility in
255-
one project,whilst still using Python 3.4 as the default interpreter.
255+
one project,while still using Python 3.4 as the default interpreter.
256256
pyenv isn't just limited to the CPython versions – it will also install PyPy,
257257
Anaconda, miniconda, stackless, Jython, and IronPython interpreters.
258258

‎docs/intro/learning.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Python Koans
151151
~~~~~~~~~~~~
152152

153153
Python Koans is a port of Edgecase's Ruby Koans. It uses a test-driven
154-
approach, q.v. TEST DRIVEN DESIGN SECTION to provide an interactive tutorial
154+
approach to provide an interactive tutorial
155155
teaching basic Python concepts. By fixing assertion statements that fail in a
156156
test script, this provides sequential steps to learning Python.
157157

@@ -179,7 +179,7 @@ no previous programming experience.
179179
Learn to Program in Python with Codeacademy
180180
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
181181

182-
A Codeacademy course for the absolute Python beginner. This free and interactive course provides and teaches the basics (and beyond) of Python programmingwhilst testing the user's knowledge in between progress.
182+
A Codeacademy course for the absolute Python beginner. This free and interactive course provides and teaches the basics (and beyond) of Python programmingwhile testing the user's knowledge in between progress.
183183
This course also features a built-in interpreter for receiving instant feedback on your learning.
184184

185185
`Learn to Program in Python with Codeacademy<http://www.codecademy.com/en/tracks/python>`_

‎docs/notes/styleguide.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ Wrap text lines at 78 characters. Where necessary, lines may exceed 78
8484
characters, especially if wrapping would make the source text more difficult
8585
to read.
8686

87+
Use Standard American English, not British English.
88+
8789
Use of the `serial comma<https://en.wikipedia.org/wiki/Serial_comma>`_
8890
(also known as the Oxford comma) is 100% non-optional. Any attempt to
8991
submit content with a missing serial comma will result in permanent banishment
@@ -209,4 +211,3 @@ documents or large incomplete sections.
209211
.. todo::
210212
Learn the Ultimate Answer to the Ultimate Question
211213
of Life, The Universe, and Everything
212-

‎docs/writing/documentation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ comment block is a programmer's note. The docstring describes the
182182
183183
Unlike block comments, docstrings are built into the Python language itself.
184184
This means you can use all of Python's powerful introspection capabilities to
185-
access docstrings at runtime, compared with comments which areoptimised out.
185+
access docstrings at runtime, compared with comments which areoptimized out.
186186
Docstrings are accessible from both the `__doc__` dunder attribute for almost
187187
every Python object, as well as with the built in `help()` function.
188188

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp