diff --git a/docs/reference/pip_install.rst b/docs/reference/pip_install.rst index 44b27ad55..21e086f37 100644 --- a/docs/reference/pip_install.rst +++ b/docs/reference/pip_install.rst @@ -229,7 +229,7 @@ Some examples: SomeProject[foo, bar] SomeProject~=1.4.2 -Since version 6.0, pip also supports specifers containing `environment markers +Since version 6.0, pip also supports specifiers containing `environment markers `_ like so: :: @@ -586,7 +586,7 @@ cache flushes. Compilation of C code adds further nondeterminism, as many compilers include random-seeded values in their output. However, wheels fetched from index servers are the same every time. They land in pip's HTTP cache, not its wheel cache, and are used normally in hash-checking mode. The only downside -of having the the wheel cache disabled is thus extra build time for sdists, and +of having the wheel cache disabled is thus extra build time for sdists, and this can be solved by making sure pre-built wheels are available from the index server. diff --git a/docs/user_guide.rst b/docs/user_guide.rst index aa4a80bff..0cb28055f 100644 --- a/docs/user_guide.rst +++ b/docs/user_guide.rst @@ -86,7 +86,7 @@ In practice, there are 4 common uses of Requirements files: 4. Requirements files are used to override a dependency with a local patch that lives in version control. For example, suppose a dependency, `SomeDependency` from PyPI has a bug, and you can't wait for an upstream fix. - You could clone/copy the src, make the fix, and place it in vcs with the tag + You could clone/copy the src, make the fix, and place it in VCS with the tag `sometag`. You'd reference it in your requirements file with a line like so: :: @@ -483,7 +483,7 @@ E.g. supposing: * `SomePackage-2.0` and `AnotherPackage-2.0` are the latest versions available on PyPI. Running ``pip install --upgrade SomePackage`` would upgrade `SomePackage` *and* -`AnotherPackage` despite `AnotherPackage` already being satisifed. +`AnotherPackage` despite `AnotherPackage` already being satisfied. pip doesn't currently have an option to do an "only if needed" recursive upgrade, but you can achieve it using these 2 steps::