McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Fix typos (#4275)

This commit is contained in:
Jakub Wilk 2017-02-10 22:33:50 +01:00 committed by Xavier Fernandez
parent 6ec5597930
commit 4c950500de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -35,7 +35,7 @@
* Fix a crash on non ASCII characters from `lsb_release` (:issue:`4062`).
* Fix an SyntaxError in an an used module of a vendored dependency
* Fix an SyntaxError in an unused module of a vendored dependency
(:issue:`4059`).
* Fix UNC paths on Windows (:issue:`4064`).

2
docs/user_guide.rst
View File

@ -60,7 +60,7 @@ In practice, there are 4 common uses of Requirements files:
2. Requirements files are used to force pip to properly resolve dependencies.
As it is now, pip `doesn't have true dependency resolution
<https://github.com/pypa/pip/issues/988>`_, but instead simply uses the first
specification it finds for a project. E.g if `pkg1` requires `pkg3>=1.0` and
specification it finds for a project. E.g. if `pkg1` requires `pkg3>=1.0` and
`pkg2` requires `pkg3>=1.0,<=2.0`, and if `pkg1` is resolved first, pip will
only use `pkg3>=1.0`, and could easily end up installing a version of `pkg3`
that conflicts with the needs of `pkg2`. To solve this problem, you can