Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/intro/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ both popular and exotic.
pydoc
-----

:program:`pydoc` is a utlity that is installed when you install Python.
:program:`pydoc` is a utility that is installed when you install Python.
It allows you to quickly retrieve and search for documentation from your
shell. For example, if you needed a quick refresher on the
:mod:`time` module, pulling up documentation would be as simple as
Expand Down
4 changes: 2 additions & 2 deletions docs/scenarios/admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ system. `Puppet Forge <https://forge.puppetlabs.com/>`_ is a repository for
modules written by the community for Open Source and Enterprise Puppet.

Puppet Agents are installed on nodes whose state needs to be monitored or
changed. A desginated server known as the Puppet Master is responsible for
orchastrating the agent nodes.
changed. A designated server known as the Puppet Master is responsible for
orchestrating the agent nodes.

Agent nodes send basic facts about the system such as to the operating system,
kernel, architecture, ip address, hostname etc. to the Puppet Master.
Expand Down
2 changes: 1 addition & 1 deletion docs/scenarios/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and the mailing list https://groups.google.com/forum/#!forum/project-camelot

Cocoa
-----
.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
.. note:: The Cocoa framework is only available on OSX. Don't pick this if you're writing a cross-platform application!

GTk
---
Expand Down
2 changes: 1 addition & 1 deletion docs/shipping/freezing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc
- `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_


OS X
OSX
----


Expand Down
2 changes: 1 addition & 1 deletion docs/shipping/packaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The downside of distributing code like this is that it relies on the
recipient understanding how to install the required version of Python,
and being able and willing to use tools such as pip to install your code's
other dependencies. This is fine when distributing to other developers, but
makes this method unsuitable for distributing applications to end-uers.
makes this method unsuitable for distributing applications to end-users.

The `Python Packaging Guide <https://python-packaging-user-guide.readthedocs.org/en/latest/>`_
provides an extensive guide on creating and maintaining Python packages.
Expand Down
6 changes: 3 additions & 3 deletions docs/starting/pip-virtualenv.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Further Configuration of Pip and Virtualenv
Requiring an active virtual environment for ``pip``
---------------------------------------------------

By now it should be clear that using virtual envirtonments is a great way to
By now it should be clear that using virtual environments is a great way to
keep your development environment clean and keeping different projects'
requirements separate.

Expand Down Expand Up @@ -71,7 +71,7 @@ add the following lines to this new file:


You will of course need to install some packages globally (usually ones that
you use across different projects consistenly) and this can be accomplished by
you use across different projects consistently) and this can be accomplished by
adding the following to your :file:`~/.bashrc` file:

.. code-block:: console
Expand All @@ -94,7 +94,7 @@ that you use. For example, you may be using the ``requests`` library in a lot
of different projects.

It is surely unnecessary to re-download the same packages/libraries each time
you start working on a new project (and in a new virtual environmen as a result).
you start working on a new project (and in a new virtual environment as a result).
Fortunately, you can configure pip in such a way that it tries to reuse already
installed packages.

Expand Down
2 changes: 1 addition & 1 deletion docs/writing/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ comment block is a programmer's note. The docstring describes the
"""Returns the square root of self times self."""
...

.. seealso:: Further reading on docstrings: :pep:`257`
.. see also:: Further reading on docstrings: :pep:`257`


Other Tools
Expand Down
2 changes: 1 addition & 1 deletion docs/writing/style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Code Style
If you ask Python programmers what they like most in Python, they will
often say its high readability. Indeed, a high level of readability
is at the heart of the design of the Python language, following the
recognised fact that code is read much more often than it is written.
recognized fact that code is read much more often than it is written.

One reason for Python code to be easily read and understood is its relatively
complete set of Code Style guidelines and "Pythonic" idioms.
Expand Down