Skip to content

Commit df7a97f

Browse files
committed
docs: Fix small style issues.
Signed-off-by: Sumana Harihareswara <[email protected]>
1 parent c7591bf commit df7a97f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

docs/html/user_guide.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,8 @@ all users) configuration:
512512
else :file:`$HOME/.config/pip/pip.conf`.
513513
* On Windows the configuration file is :file:`%APPDATA%\\pip\\pip.ini`.
514514

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

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

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

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

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

@@ -1466,9 +1466,9 @@ here are a number of ways.
14661466

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

1471-
However there is a possibility pip will not be able to find a set of
1471+
However, there is a possibility pip will not be able to find a set of
14721472
compatible versions.
14731473

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

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

news/9269.doc.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update documentation to reflect that pip still uses legacy resolver by default in Python 2 environments.

0 commit comments

Comments
 (0)