Skip to content

Commit cc74940

Browse files
authored
Merge pull request #7754 from pradyunsg/docs/consistent-formatting
Consistent formatting across pip's documentation
2 parents 06fd2a0 + 0f513dd commit cc74940

36 files changed

+232
-162
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
* Pip version:
1+
* pip version:
22
* Python version:
33
* Operating system:

NEWS.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ Improved Documentation
15381538
convince some servers who double compress the downloaded file to stop doing
15391539
so. (#1688)
15401540
- Stop breaking when given pip commands in uppercase (#1559, #1725)
1541-
- Pip no longer adds duplicate logging consumers, so it won't create duplicate
1541+
- pip no longer adds duplicate logging consumers, so it won't create duplicate
15421542
output when being called multiple times. (#1618, #1723)
15431543
- `pip wheel` now returns an error code if any wheels fail to build. (#1769)
15441544
- `pip wheel` wasn't building wheels for dependencies of editable requirements.
@@ -1661,7 +1661,7 @@ Improved Documentation
16611661
- pip will now install Mac OSX platform wheels from PyPI. (:pull:`1278`)
16621662
- pip now generates the appropriate platform-specific console scripts when
16631663
installing wheels. (#1251)
1664-
- Pip now confirms a wheel is supported when installing directly from a path or
1664+
- pip now confirms a wheel is supported when installing directly from a path or
16651665
url. (#1315)
16661666
- ``--ignore-installed`` now behaves again as designed, after it was
16671667
unintentionally broke in v0.8.3 when fixing #14. (#1097, #1352)
@@ -1870,7 +1870,7 @@ Improved Documentation
18701870
Dan Callahan for report and patch. (#182)
18711871
- Understand version tags without minor version ("py3") in sdist filenames.
18721872
Thanks Stuart Andrews for report and Olivier Girardot for patch. (#310)
1873-
- Pip now supports optionally installing setuptools "extras" dependencies; e.g.
1873+
- pip now supports optionally installing setuptools "extras" dependencies; e.g.
18741874
"pip install Paste[openid]". Thanks Matt Maker and Olivier Girardot. (#7)
18751875
- freeze no longer borks on requirements files with --index-url or --find-links.
18761876
Thanks Herbert Pfennig. (#391)
@@ -1995,7 +1995,7 @@ Improved Documentation
19951995

19961996
- Track which ``build/`` directories pip creates, never remove directories
19971997
it doesn't create. From Hugo Lopes Tavares.
1998-
- Pip now accepts file:// index URLs. Thanks Dave Abrahams.
1998+
- pip now accepts file:// index URLs. Thanks Dave Abrahams.
19991999
- Various cleanup to make test-running more consistent and less fragile.
20002000
Thanks Dave Abrahams.
20012001
- Real Windows support (with passing tests). Thanks Dave Abrahams.

docs/html/cookbook.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:orphan:
22

3-
============
3+
========
44
Cookbook
5-
============
5+
========
66

77
This content is now covered in the :doc:`User Guide <user_guide>`

docs/html/development/architecture/anatomy.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. note::
2+
23
This section of the documentation is currently being written. pip
34
developers welcome your help to complete this documentation. If you're
45
interested in helping out, please let us know in the `tracking issue`_.
@@ -76,7 +77,7 @@ Within ``src/``:
7677
* ``__init__.py``
7778
* ``__main__.py``
7879
* ``__pycache__/`` *[not discussing contents right now]*
79-
* ``_internal/`` *[where all the pip code lives that’s written by pip maintainers -- underscore means private. Pip is not a library -- it’s a command line tool! A very important distinction! People who want to install stuff with pip should not use the internals -- they should use the CLI. There’s a note on this in the docs.]*
80+
* ``_internal/`` *[where all the pip code lives that’s written by pip maintainers -- underscore means private. pip is not a library -- it’s a command line tool! A very important distinction! People who want to install stuff with pip should not use the internals -- they should use the CLI. There’s a note on this in the docs.]*
8081

8182
* ``__init__.py``
8283
* ``build_env.py`` [not discussing now]

docs/html/development/architecture/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ Architecture of pip's internals
33
===============================
44

55
.. note::
6+
67
This section of the documentation is currently being written. pip
78
developers welcome your help to complete this documentation. If you're
89
interested in helping out, please let us know in the `tracking issue`_.
910

1011
.. note::
12+
1113
Direct use of pip's internals is *not supported*, and these internals
1214
can change at any time. For more details, see :ref:`Using pip from
1315
your program`.

docs/html/development/architecture/overview.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. note::
2+
23
This section of the documentation is currently being written. pip
34
developers welcome your help to complete this documentation. If you're
45
interested in helping out, please let us know in the `tracking issue`_.
@@ -9,7 +10,7 @@
910
Broad functionality overview
1011
****************************
1112

12-
Pip is a package installer.
13+
pip is a package installer.
1314

1415
pip does a lot more than installation; it also has a cache, and it has
1516
configuration, and it has a CLI, which has its own quirks. But mainly:
@@ -52,7 +53,7 @@ In sequence, what does pip do?:
5253

5354
4. Install the actual items to be installed.
5455

55-
Why? Pip installs from places other than PyPI! But also, we’ve never had
56+
Why? pip installs from places other than PyPI! But also, we’ve never had
5657
guarantees of PyPI’s JSON API before now, so no one has been getting
5758
metadata from PyPI separate from downloading the package itself.
5859

@@ -117,7 +118,7 @@ When pip looks at the package index, the place where it looks has
117118
basically a link. The link’s text is the name of the file
118119

119120
This is the `PyPI Simple API`_ (PyPI has several APIs, some are being
120-
deprecated). Pip looks at Simple API, documented initially at :pep:`503` --
121+
deprecated). pip looks at Simple API, documented initially at :pep:`503` --
121122
packaging.python.org has PyPA specifications with more details for
122123
Simple Repository API
123124

docs/html/development/architecture/upgrade-options.rst

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
=============================================
12
Options that control the installation process
2-
---------------------------------------------
3+
=============================================
34

45
When installing packages, pip chooses a distribution file, and installs it in
56
the user's environment. There are many choices involved in deciding which file
67
to install, and these are controlled by a variety of options.
78

9+
810
Controlling what gets installed
9-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11+
===============================
1012

1113
These options directly affect how the resolver uses the list of available
1214
distribution files to decide which one to install. So these modify the
@@ -51,8 +53,9 @@ current version in place. This occurs even if ``--upgrade`` is not set.
5153
Act as if the currently installed version isn't there - so don't care about
5254
``--upgrade``, and don't uninstall before (re-)installing.
5355

56+
5457
Controlling what gets considered
55-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58+
================================
5659

5760
These options affect the list of distribution files that the resolver will
5861
consider as candidates for installation. As such, they affect the data that
@@ -89,8 +92,9 @@ Index options
8992

9093
``--find-links``
9194

95+
9296
Controlling dependency data
93-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
97+
===========================
9498

9599
These options control what dependency data the resolver sees for any given
96100
package (or, in the case of ``--python-version``, the environment information
@@ -102,8 +106,9 @@ the resolver uses to *check* the dependency).
102106

103107
``--ignore-requires-python``
104108

109+
105110
Special cases
106-
~~~~~~~~~~~~~
111+
=============
107112

108113
These need further investigation. They affect the install process, but not
109114
necessarily resolution or what gets installed.

docs/html/development/ci.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
.. note::
2+
23
This section of the documentation is currently being written. pip
34
developers welcome your help to complete this documentation. If you're
45
interested in helping out, please let us know in the `tracking issue`_.
56

67
.. _`tracking issue`: https://github.com/pypa/pip/issues/7279
78

8-
**********************
9+
======================
910
Continuous Integration
10-
**********************
11+
======================
1112

1213
Supported interpreters
1314
======================
@@ -56,6 +57,7 @@ specified it's ok to require the latest CPython interpreter.
5657
So only unit tests and integration tests would need to be run with the different
5758
interpreters.
5859

60+
5961
Services
6062
========
6163

docs/html/development/configuration.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
:orphan:
22

3+
=============
34
Configuration
45
=============
56

docs/html/development/contributing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Examples include re-flowing text in comments or documentation, or addition or
3434
removal of blank lines or whitespace within lines. Such changes can be made
3535
separately, as a "formatting cleanup" PR, if needed.
3636

37+
3738
Automated Testing
3839
=================
3940

0 commit comments

Comments
 (0)