8000 Merged revisions 69846 via svnmerge from · python/cpython@934896d · GitHub
[go: up one dir, main page]
Skip to content

Commit 934896d

Browse files
mdickinsonmdickinson
committed
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines Issue #5341: Fix a variety of spelling errors. ........
1 parent 91cf882 commit 934896d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+83
-83
lines changed

‎Demo/tkinter/matt/menu-all-types-of-entries.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ def makeCascadeMenu():
110110
Cascade_button.menu.choices = Menu(Cascade_button.menu)
111111

112112
# ...and this is a menu that cascades from that.
113-
Cascade_button.menu.choices.wierdones = Menu(Cascade_button.menu.choices)
113+
Cascade_button.menu.choices.weirdones = Menu(Cascade_button.menu.choices)
114114

115115
# then you define the menus from the deepest level on up.
116-
Cascade_button.menu.choices.wierdones.add_command(label='avacado')
117-
Cascade_button.menu.choices.wierdones.add_command(label='belgian endive')
118-
Cascade_button.menu.choices.wierdones.add_command(label='beefaroni')
116+
Cascade_button.menu.choices.weirdones.add_command(label='avacado')
117+
Cascade_button.menu.choices.weirdones.add_command(label='belgian endive')
118+
Cascade_button.menu.choices.weirdones.add_command(label='beefaroni')
119119

120120
# definition of the menu one level up...
121121
Cascade_button.menu.choices.add_command(label='Chocolate')
@@ -125,8 +125,8 @@ def makeCascadeMenu():
125125
Cascade_button.menu.choices.add_command(label='Rocky Road')
126126
Cascade_button.menu.choices.add_command(label='BubbleGum')
127127
Cascade_button.menu.choices.add_cascade(
128-
label='Wierd Flavors',
129-
menu=Cascade_button.menu.choices.wierdones)
128+
label='Weird Flavors',
129+
menu=Cascade_button.menu.choices.weirdones)
130130

131131
# and finally, the definition for the top level
132132
Cascade_button.menu.add_cascade(label='more choices',

‎Demo/tkinter/matt/menu-simple.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def makeFileMenu():
4848
File_button.menu = Menu(File_button)
4949

5050
# add an item. The first param is a menu entry type,
51-
# must be one of: "cascade", "checkbutton", "command", "radiobutton", "seperator"
51+
# must be one of: "cascade", "checkbutton", "command", "radiobutton", "separator"
5252
# see menu-demo-2.py for examples of use
5353
File_button.menu.add_command(label='New...', underline=0,
5454
command=new_file)

‎Doc/howto/webservers.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ MVC stands for three components:
426426
user. Typically this component is represented by the templates.
427427
* The *controller*. This is the layer between the user and the model. The
428428
controller reacts on user actions (like opening some specific URL) and tells
429-
the model to modify the data if neccessary.
429+
the model to modify the data if necessary.
430430

431431
While one might think that MVC is a complex design pattern, in fact it is not.
432432
It is used in Python because it has turned out to be useful for creating clean,
@@ -435,9 +435,9 @@ maintainable web sites.
435435
.. note::
436436

437437
While not all Python frameworks explicitly support MVC, it is often trivial
438-
to create a web site which uses the MVC pattern by seperating the data logic
438+
to create a web site which uses the MVC pattern by separating the data logic
439439
(the model) from the user interaction logic (the controller) and the
440-
templates (the view). That's why it is important not to write unneccessary
440+
templates (the view). That's why it is important not to write unnecessary
441441
Python code in the templates -- it is against MVC and creates more chaos.
442442

443443
.. seealso::
@@ -607,7 +607,7 @@ Some notable frameworks
607607
-----------------------
608608

609609
There is an incredible number of frameworks, so there is no way to describe them
610-
all. It is not even neccessary, as most of these frameworks are nothing special
610+
all. It is not even necessary, as most of these frameworks are nothing special
611611
and everything that can be done with these can also be done with one of the
612612
popular ones.
613613

@@ -679,7 +679,7 @@ project called `Grok <http://grok.zope.org/>`_ which makes it possible for
679679
Another framework that's already been mentioned is `Pylons`_. Pylons is much
680680
like TurboGears with ab even stronger emphasis on flexibility, which is bought
681681
at the cost of being more difficult to use. Nearly every component can be
682-
exchanged, which makes it neccessary to use the documentation of every single
682+
exchanged, which makes it necessary to use the documentation of every single
683683
component, because there are so many Pylons combinations possible that can
684684
satisfy every requirement. Pylons builds upon `Paste
685685
<http://pythonpaste.org/>`_, an extensive set of tools which are handy for WSGI.

‎Doc/library/io.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ builtin :func:`open` function is defined in this module.
1313

1414
At the top of the I/O hierarchy is the abstract base class :class:`IOBase`. It
1515
defines the basic interface to a stream. Note, however, that there is no
16-
seperation between reading and writing to streams; implementations are allowed
16+
separation between reading and writing to streams; implementations are allowed
1717
to throw an :exc:`IOError` if they do not support a given operation.
1818

1919
Extending :class:`IOBase` is :class:`RawIOBase` which deals simply with the
@@ -611,7 +611,7 @@ Text I/O
611611
is enabled. With this enabled, on input, the lines endings ``'\n'``,
612612
``'\r'``, or ``'\r\n'`` are translated to ``'\n'`` before being returned to
613613
the caller. Conversely, on output, ``'\n'`` is translated to the system
614-
default line seperator, :data:`os.linesep`. If *newline* is any other of its
614+
default line separator, :data:`os.linesep`. If *newline* is any other of its
615615
legal values, that newline becomes the newline when the file is read and it
616616
is returned untranslated. On output, ``'\n'`` is converted to the *newline*.
617617

‎Doc/library/pty.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The :mod:`pty` module defines operations for handling the pseudo-terminal
1313
concept: starting another process and being able to write to and read from its
1414
controlling terminal programmatically.
1515

16-
Because pseudo-terminal handling is highly platform dependant, there is code to
16+
Because pseudo-terminal handling is highly platform dependent, there is code to
1717
do it only for SGI and Linux. (The Linux code is supposed to work on other
1818
platforms, but hasn't been tested yet.)
1919

‎Doc/library/subprocess.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ This module also defines four shortcut functions:
174174
To capture standard error in the result, use stderr=subprocess.STDOUT.
175175

176176
>>> subprocess.check_output(
177-
["/bin/sh", "-c", "ls non_existant_file ; exit 0"],
177+
["/bin/sh", "-c", "ls non_existent_file ; exit 0"],
178178
stderr=subprocess.STDOUT)
179-
'ls: non_existant_file: No such file or directory\n'
179+
'ls: non_existent_file: No such file or directory\n'
180180

181181
.. versionadded:: 3.1
182182

‎Doc/tutorial/classes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ arguments)``. This is occasionally useful to clients as well. (Note that this
522522
only works if the base class is defined or imported directly in the global
523523
scope.)
524524

525-
Python has two builtin functions that work with inheritance:
525+
Python has two built-in functions that work with inheritance:
526526

527527
* Use :func:`isinstance` to check an object's type: ``isinstance(obj, int)``
528528
will be ``True`` only if ``obj.__class__`` is :class:`int` or some class

‎Doc/tutorial/datastructures.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ A more verbose version of this snippet shows the flow explicitly::
254254
print(row[i], end="")
255255
print()
256256

257-
In real world, you should prefer builtin functions to complex flow statements.
257+
In real world, you should prefer built-in functions to complex flow statements.
258258
The :func:`zip` function would do a great job for this use case::
259259

260260
>>> list(zip(*mat))

‎Doc/tutorial/floatingpoint.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ display ::
6565
>>> 0.1
6666
0.1000000000000000055511151231257827021181583404541015625
6767

68-
instead! The Python prompt uses the builtin :func:`repr` function to obtain a
68+
instead! The Python prompt uses the built-in :func:`repr` function to obtain a
6969
string version of everything it displays. For floats, ``repr(float)`` rounds
7070
the true decimal value to 17 significant digits, giving ::
7171

@@ -81,7 +81,7 @@ thing in all languages that support your hardware's floating-point arithmetic
8181
(although some languages may not *display* the difference by default, or in all
8282
output modes).
8383

84-
Python's builtin :func:`str` function produces only 12 significant digits, and
84+
Python's built-in :func:`str` function produces only 12 significant digits, and
8585
you may wish to use that instead. It's unusual for ``eval(str(x))`` to
8686
reproduce *x*, but the output may be more pleasant to look at::
8787

‎Doc/tutorial/inputoutput.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ notation.::
190190
This is particularly useful in combination with the new built-in :func:`vars`
191191
function, which returns a dictionary containing all local variables.
192192

193-
For a complete overview of string formating with :meth:`str.format`, see
193+
For a complete overview of string formatting with :meth:`str.format`, see
194194
:ref:`formatstrings`.
195195

196196

0 commit comments

Comments
 (0)
0