summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-11-08 15:13:39 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-11-08 15:13:39 +0100
commitb0209d0acd50fd95723a30bf24e7d06b9378835e (patch)
tree3b4b257c107843eefe6811352cf385699b6e6a6a
parent147de27ff4a1f9f078b7e3783dae48a8c9eb8da6 (diff)
downloadpsutil-b0209d0acd50fd95723a30bf24e7d06b9378835e.tar.gz
update doc
-rw-r--r--README.rst3
-rw-r--r--docs/index.rst11
-rwxr-xr-xscripts/internal/print_announce.py7
3 files changed, 13 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index 4559e55c..4ac707ab 100644
--- a/README.rst
+++ b/README.rst
@@ -61,8 +61,7 @@ psutil currently supports the following platforms:
- **AIX**
...both **32-bit** and **64-bit** architectures, with Python
-versions from **2.6 to 3.6** (users of Python 2.4 and 2.5 may use
-`2.1.3 <https://pypi.python.org/pypi?name=psutil&version=2.1.3&:action=files>`__ version).
+versions from **2.6 to 3.6**.
`PyPy <http://pypy.org/>`__ is also known to work.
====================
diff --git a/docs/index.rst b/docs/index.rst
index 7690dfea..ce798e92 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2520,8 +2520,8 @@ Top 3 processes opening more file descriptors::
(2721, {'name': 'chrome', 'num_fds': 185}),
(2650, {'name': 'chrome', 'num_fds': 354})]
-Q&A
-===
+FAQs
+====
* Q: What Windows versions are supported?
* A: From Windows **Vista** onwards, both 32 and 64 bit versions.
@@ -2534,6 +2534,13 @@ Q&A
----
+* Q: What Python versions are supported?
+* A: From 2.6 to 3.6, both 32 and 64 bit versions. Last version supporting
+ Python 2.4 and 2.5 is `psutil 2.1.3 <https://pypi.python.org/pypi?name=psutil&version=2.1.3&:action=files>`__.
+ PyPy is also known to work.
+
+----
+
* Q: What SunOS versions are supported?
* A: From Solaris 10 onwards.
diff --git a/scripts/internal/print_announce.py b/scripts/internal/print_announce.py
index 9d2cbb62..1c2b9e11 100755
--- a/scripts/internal/print_announce.py
+++ b/scripts/internal/print_announce.py
@@ -39,10 +39,9 @@ monitoring, profiling and limiting process resources and management of \
running processes. It implements many functionalities offered by command \
line tools such as: ps, top, lsof, netstat, ifconfig, who, df, kill, free, \
nice, ionice, iostat, iotop, uptime, pidof, tty, taskset, pmap. It \
-currently supports Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and \
-NetBSD, both 32-bit and 64-bit architectures, with Python versions from 2.6 \
-to 3.5 (users of Python 2.4 and 2.5 may use 2.1.3 version). PyPy is also \
-known to work.
+currently supports Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD, NetBSD \
+and AIX, both 32-bit and 64-bit architectures, with Python versions from 2.6 \
+to 3.6. PyPy is also known to work.
What's new
==========