update doc

4 files changed, 46 insertions, 25 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index e2f8a319..a2d0a5d0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -20,14 +20,17 @@ include docs/conf.py
 include docs/index.rst
 include docs/make.bat
 include make.bat
+include psutil/TODO.aix
 include psutil/__init__.py
 include psutil/_common.py
 include psutil/_compat.py
+include psutil/_psaix.py
 include psutil/_psbsd.py
 include psutil/_pslinux.py
 include psutil/_psosx.py
 include psutil/_psposix.py
 include psutil/_pssunos.py
+include psutil/_psutil_aix.c
 include psutil/_psutil_bsd.c
 include psutil/_psutil_common.c
 include psutil/_psutil_common.h
@@ -38,6 +41,11 @@ include psutil/_psutil_posix.h
 include psutil/_psutil_sunos.c
 include psutil/_psutil_windows.c
 include psutil/_pswindows.py
+include psutil/arch/aix/ifaddrs.c
+include psutil/arch/aix/ifaddrs.h
+include psutil/arch/aix/net_connections.c
+include psutil/arch/aix/net_connections.h
+include psutil/arch/aix/net_kernel_structs.h
 include psutil/arch/freebsd/proc_socks.c
 include psutil/arch/freebsd/proc_socks.h
 include psutil/arch/freebsd/specific.c
diff --git a/README.rst b/README.rst
index bd77387b..1b45c50d 100644
--- a/README.rst
+++ b/README.rst
@@ -48,13 +48,20 @@ retrieving information on **running processes** and **system utilization**
 (CPU, memory, disks, network, sensors) in Python.
 It is useful mainly for **system monitoring**, **profiling and limiting process
 resources** and **management of running processes**.
-It implements many functionalities offered by command line tools such as:
+It implements many functionalities offered by UNIX 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.6** (users of Python 2.4 and 2.5 may use
+psutil currently supports the following platforms:
+
+- **Linux**
+- **Windows**
+- **OSX**,
+- **FreeBSD, OpenBSD**, **NetBSD**
+- **Sun Solaris**
+- **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).
 `PyPy <http://pypy.org/>`__ is also known to work.
 
diff --git a/docs/index.rst b/docs/index.rst
index 3ab44461..b8becb3a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -8,13 +8,13 @@ psutil documentation
 Quick links
 -----------
 
-* `Home page <https://github.com/giampaolo/psutil>`__
-* `Install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`_
-* `Blog <http://grodola.blogspot.com/search/label/psutil>`__
-* `Forum <http://groups.google.com/group/psutil/topics>`__
-* `Download <https://pypi.python.org/pypi?:action=display&name=psutil#downloads>`__
-* `Development guide <https://github.com/giampaolo/psutil/blob/master/DEVGUIDE.rst>`_
-* `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`__
+- `Home page <https://github.com/giampaolo/psutil>`__
+- `Install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`_
+- `Blog <http://grodola.blogspot.com/search/label/psutil>`__
+- `Forum <http://groups.google.com/group/psutil/topics>`__
+- `Download <https://pypi.python.org/pypi?:action=display&name=psutil#downloads>`__
+- `Development guide <https://github.com/giampaolo/psutil/blob/master/DEVGUIDE.rst>`_
+- `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`__
 
 About
 -----
@@ -25,11 +25,19 @@ retrieving information on running
 in **Python**.
 It is useful mainly for **system monitoring**, **profiling**, **limiting
 process resources** and the **management of running processes**.
-It implements many functionalities offered by command line tools
+It implements many functionalities offered by UNIX 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
+psutil currently supports the following platforms:
+
+- **Linux**
+- **Windows**
+- **OSX**,
+- **FreeBSD, OpenBSD**, **NetBSD**
+- **Sun Solaris**
+- **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).
 `PyPy <http://pypy.org/>`__ is also known to work.
@@ -560,12 +568,8 @@ Network
      ...]
 
   .. note::
-    (OSX) :class:`psutil.AccessDenied` is always raised unless running as root.
-    This is a limitation of the OS and ``lsof`` does the same.
-
-  .. note::
-    (AIX) :class:`psutil.AccessDenied` is always raised unless running as root
-    (lsof does the same).
+    (OSX and AIX) :class:`psutil.AccessDenied` is always raised unless running
+    as root. This is a limitation of the OS and ``lsof`` does the same.
 
   .. note::
     (Solaris) UNIX sockets are not supported.
@@ -2135,10 +2139,11 @@ Constants
   It must be noted that this trick works only for APIs which rely on /proc
   filesystem (e.g. `memory`_ APIs and most :class:`Process` class methods).
 
-  Availability: Linux, Solaris
+  Availability: Linux, Solaris, AIX
 
   .. versionadded:: 3.2.3
   .. versionchanged:: 3.4.2 also available on Solaris.
+  .. versionchanged:: 5.4.0 also available on AIX.
 
 .. _const-pstatus:
 .. data:: STATUS_RUNNING
@@ -2551,7 +2556,7 @@ Q&A
 * Q: What about load average?
 * A: psutil does not expose any load average function as it's already available
   in python as
-  `os.getloadavg <https://docs.python.org/2/library/os.html#os.getloadavg>`__
+  `os.getloadavg <https://docs.python.org/2/library/os.html#os.getloadavg>`__.
 
 Running tests
 =============
diff --git a/psutil/__init__.py b/psutil/__init__.py
index 9c6451e4..006d5f57 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -11,10 +11,11 @@ sensors) in Python. Supported platforms:
  - Linux
  - Windows
  - OSX
- - Sun Solaris
  - FreeBSD
  - OpenBSD
  - NetBSD
+ - Sun Solaris
+ - AIX
 
 Works with Python versions from 2.6 to 3.X.
 """
@@ -211,7 +212,7 @@ __all__ = [
 ]
 __all__.extend(_psplatform.__extra__all__)
 __author__ = "Giampaolo Rodola'"
-__version__ = "5.3.2"
+__version__ = "5.4.0"
 version_info = tuple([int(num) for num in __version__.split('.')])
 AF_LINK = _psplatform.AF_LINK
 POWER_TIME_UNLIMITED = _common.POWER_TIME_UNLIMITED