Skip to content

Commit

Permalink
docs: Fix small style issues.
Browse files Browse the repository at this point in the history
Signed-off-by: Sumana Harihareswara <[email protected]>
  • Loading branch information
brainwane committed Dec 13, 2020
1 parent c7591bf commit 250a270
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 7 additions & 7 deletions docs/html/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ all users) configuration:
else :file:`$HOME/.config/pip/pip.conf`.
* On Windows the configuration file is :file:`%APPDATA%\\pip\\pip.ini`.

There are also a legacy per-user configuration file which is also respected,
these are located at:
There is also a legacy per-user configuration file which is also respected.
To find its location:

* On Unix and macOS the configuration file is: :file:`$HOME/.pip/pip.conf`
* On Windows the configuration file is: :file:`%HOME%\\pip\\pip.ini`
Expand Down Expand Up @@ -1084,7 +1084,7 @@ You can then install from the archive like this::
$ python -m pip install --force-reinstall --ignore-installed --upgrade --no-index --no-deps $tempdir/*

Note that compiled packages are typically OS- and architecture-specific, so
these archives are not necessarily portable across macOShines.
these archives are not necessarily portable across machines.

Hash-checking mode can be used along with this method to ensure that future
archives are built with identical packages.
Expand Down Expand Up @@ -1331,7 +1331,7 @@ Backtracking is not a bug, or an unexpected behaviour. It is part of the
way pip's dependency resolution process works.

During a pip install (e.g. ``pip install tea``), pip needs to work out
the package's dependencies (e.g. ``spoon``, ``hot-water``, ``cup`` etc), the
the package's dependencies (e.g. ``spoon``, ``hot-water``, ``cup`` etc.), the
versions of each of these packages it needs to install. For each package
pip needs to decide which version is a good candidate to install.

Expand Down Expand Up @@ -1466,9 +1466,9 @@ here are a number of ways.

In most cases, pip will complete the backtracking process successfully.
It is possible this could take a very long time to complete - this may
not be the preferred option.
not be your preferred option.

However there is a possibility pip will not be able to find a set of
However, there is a possibility pip will not be able to find a set of
compatible versions.

If you'd prefer not to wait, you can interrupt pip (ctrl and c) and use
Expand Down Expand Up @@ -1523,7 +1523,7 @@ suitable constraints file.
4. Be more strict on package dependencies during development
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

For package maintainers during the development, give pip some help by
For package maintainers during software development, give pip some help by
creating constraint files for the dependency tree. This will reduce the
number of versions it will try.

Expand Down
1 change: 1 addition & 0 deletions news/9269.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update documentation to reflect that pip still uses legacy resolver by default in Python 2 environments.

0 comments on commit 250a270

Please sign in to comment.