diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-09-15 11:54:36 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-09-15 11:54:36 +0200 |
| commit | 5206cff82bc2ff68331f2ccaf8960d9b06c24956 (patch) | |
| tree | 6a6c10c1ffdd6ad9e8f447e80e903660434c002d | |
| parent | 73940d9a25612db89b2f72268e614d95bfac2b89 (diff) | |
| parent | 3aac9483767e38995f6e5bd973e822ab0598f27a (diff) | |
| download | psutil-5206cff82bc2ff68331f2ccaf8960d9b06c24956.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | docs/index.rst | 8 | ||||
| -rw-r--r-- | scripts/internal/print_timeline.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/index.rst b/docs/index.rst index 3b9a166f..6429e15a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ Quick links - `Blog <http://grodola.blogspot.com/search/label/psutil>`__ - `Forum <http://groups.google.com/group/psutil/topics>`__ - `Download <https://pypi.org/project/psutil/#files>`__ -- `Development guide <https://github.com/giampaolo/psutil/blob/master/DEVGUIDE.rst>`_ +- `Development guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`_ - `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`__ About @@ -2606,7 +2606,7 @@ FAQs 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. - On Unix you may run the the Python process as root or use the SUID bit + On Unix you may run the Python process as root or use the SUID bit (this is the trick used by tools such as ``ps`` and ``netstat``). On Windows you may run the Python process as NT AUTHORITY\\SYSTEM or install the Python script as a Windows service (this is the trick used by tools @@ -2936,7 +2936,7 @@ Timeline .. _`BPO-6973`: https://bugs.python.org/issue6973 .. _`CPU affinity`: https://www.linuxjournal.com/article/6799?page=0,0 .. _`cpu_distribution.py`: https://github.com/giampaolo/psutil/blob/master/scripts/cpu_distribution.py -.. _`development guide`: https://github.com/giampaolo/psutil/blob/master/DEVGUIDE.rst +.. _`development guide`: https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst .. _`disk_usage.py`: https://github.com/giampaolo/psutil/blob/master/scripts/disk_usage.py .. _`enums`: https://docs.python.org/3/library/enum.html#module-enum .. _`fans.py`: https://github.com/giampaolo/psutil/blob/master/scripts/fans.py @@ -2953,7 +2953,7 @@ Timeline .. _`issue #883`: https://github.com/giampaolo/psutil/issues/883 .. _`man prlimit`: https://linux.die.net/man/2/prlimit .. _`meminfo.py`: https://github.com/giampaolo/psutil/blob/master/scripts/meminfo.py -.. _`netstat.py`: https://github.com/giampaolo/psutil/blob/master/scripts/netstat.py. +.. _`netstat.py`: https://github.com/giampaolo/psutil/blob/master/scripts/netstat.py .. _`nettop.py`: https://github.com/giampaolo/psutil/blob/master/scripts/nettop.py .. _`open`: https://docs.python.org/3/library/functions.html#open .. _`os.cpu_count`: https://docs.python.org/3/library/os.html#os.cpu_count diff --git a/scripts/internal/print_timeline.py b/scripts/internal/print_timeline.py index 4bfe76b3..9bf6e9d1 100644 --- a/scripts/internal/print_timeline.py +++ b/scripts/internal/print_timeline.py @@ -30,7 +30,7 @@ def get_tag_date(tag): def main(): releases = [] - out = sh("git tags") + out = sh("git tag") for line in out.split('\n'): tag = line.split(' ')[0] ver = tag.replace('release-', '') |