diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2022-09-19 13:00:41 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2022-09-19 13:00:41 +0200 |
| commit | 642438375e685403b4cd60b0c0e25b80dd5a813d (patch) | |
| tree | 30731fd5cf99b96c545303c604ffd1f9a577fbe7 /docs | |
| parent | 5d46b358d31ff7f0a67b104ad4cffffa032b3b35 (diff) | |
| parent | 471b19d2aa799cd73bded23379e864dd35bec2b6 (diff) | |
| download | psutil-642438375e685403b4cd60b0c0e25b80dd5a813d.tar.gz | |
resolve conflicts
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/DEVGUIDE.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/DEVGUIDE.rst b/docs/DEVGUIDE.rst index d4e6778f..384f8b25 100644 --- a/docs/DEVGUIDE.rst +++ b/docs/DEVGUIDE.rst @@ -32,7 +32,7 @@ Once you have a compiler installed: make uninstall make help -- if you're working on a new feature and you whish to compile & test it "on the +- if you're working on a new feature and you wish to compile & test it "on the fly" from a test script, this is a quick & dirty way to do it: .. code-block:: bash diff --git a/docs/index.rst b/docs/index.rst index c30f7d6a..aa0fd932 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1604,7 +1604,7 @@ Process class Return a named tuple with variable fields depending on the platform representing memory information about the process. - The "portable" fields available on all plaforms are `rss` and `vms`. + The "portable" fields available on all platforms are `rss` and `vms`. All numbers are expressed in bytes. +---------+---------+-------+---------+-----+------------------------------+ @@ -2550,7 +2550,7 @@ FAQs ==== * Q: Why do I get :class:`AccessDenied` for certain processes? -* A: This may happen when you query processess owned by another user, +* A: This may happen when you query processes owned by another user, especially on macOS (see `issue #883`_) and Windows. Unfortunately there's not much you can do about this except running the Python process with higher privileges. |