diff options
| author | Tzu-ping Chung <uranusjr@gmail.com> | 2022-11-25 09:38:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 09:38:56 +0800 |
| commit | 8d34a1111d7da062e774385990e72c6bb890b299 (patch) | |
| tree | 75027c9dfb4a7d9f2db3db2b17a1bdbedb37e883 /docs | |
| parent | 81d6053ee3ce5c4a8b0572cb80c542ab9f7e461e (diff) | |
| parent | 1ab22ee302ea059dcf7ad01e1a1a0165ab27348c (diff) | |
| download | pip-8d34a1111d7da062e774385990e72c6bb890b299.tar.gz | |
Merge branch 'main' into feature/base-prefix-config
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/cli/pip_download.rst | 6 | ||||
| -rw-r--r-- | docs/html/development/release-process.rst | 2 | ||||
| -rw-r--r-- | docs/html/reference/installation-report.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst index f1fe1769e..d247c51cc 100644 --- a/docs/html/cli/pip_download.rst +++ b/docs/html/cli/pip_download.rst @@ -81,7 +81,7 @@ Examples #. Download a package and all of its dependencies with OSX specific interpreter constraints. This forces OSX 10.10 or lower compatibility. Since OSX deps are forward compatible, - this will also match ``macosx-10_9_x86_64``, ``macosx-10_8_x86_64``, ``macosx-10_8_intel``, + this will also match ``macosx_10_9_x86_64``, ``macosx_10_8_x86_64``, ``macosx_10_8_intel``, etc. It will also match deps with platform ``any``. Also force the interpreter version to ``27`` (or more generic, i.e. ``2``) and implementation to ``cp`` (or more generic, i.e. ``py``). @@ -92,7 +92,7 @@ Examples python -m pip download \ --only-binary=:all: \ - --platform macosx-10_10_x86_64 \ + --platform macosx_10_10_x86_64 \ --python-version 27 \ --implementation cp \ SomePackage @@ -103,7 +103,7 @@ Examples py -m pip download ^ --only-binary=:all: ^ - --platform macosx-10_10_x86_64 ^ + --platform macosx_10_10_x86_64 ^ --python-version 27 ^ --implementation cp ^ SomePackage diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst index a9ae8465e..b71e2820b 100644 --- a/docs/html/development/release-process.rst +++ b/docs/html/development/release-process.rst @@ -31,7 +31,7 @@ to need extra work before being released, the release manager always has the option to back out the partial change prior to a release. The PR can then be reworked and resubmitted for the next release. -Vendoring updates will be picked up fron the ``main`` branch, as for any other +Vendoring updates will be picked up from the ``main`` branch, as for any other update. Ideally, vendoring updates should be merged between releases, just like any other change. If there are outstanding updates to vendored packages, the release manager *may* at their discretion choose to do a vendoring update diff --git a/docs/html/reference/installation-report.md b/docs/html/reference/installation-report.md index fff37242d..de67528cf 100644 --- a/docs/html/reference/installation-report.md +++ b/docs/html/reference/installation-report.md @@ -71,7 +71,7 @@ package with the following properties: ``` - `requested`: `true` if the requirement was explicitly provided by the user, either - directely via a command line argument or indirectly via a requirements file. `false` + directly via a command line argument or indirectly via a requirements file. `false` if the requirement was installed as a dependency of another requirement. - `requested_extras`: extras requested by the user. This field is only present when the |