make README a bit more terse

1 files changed, 15 insertions, 23 deletions

diff --git a/README.rst b/README.rst
index 03be872d..95b1e1d7 100644
--- a/README.rst
+++ b/README.rst
@@ -125,6 +125,7 @@ CPU
 .. code-block:: python
 
     >>> import psutil
+    >>>
     >>> psutil.cpu_times()
     scputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540, iowait=629.59, irq=0.0, softirq=19.42, steal=0.0, guest=0, nice=0.0)
     >>>
@@ -166,7 +167,6 @@ Memory
 
 .. code-block:: python
 
-    >>> import psutil
     >>> psutil.virtual_memory()
     svmem(total=10367352832, available=6472179712, percent=37.6, used=8186245120, free=2181107712, active=4748992512, inactive=2758115328, buffers=790724608, cached=3500347392, shared=787554304)
     >>> psutil.swap_memory()
@@ -178,7 +178,6 @@ Disks
 
 .. code-block:: python
 
-    >>> import psutil
     >>> psutil.disk_partitions()
     [sdiskpart(device='/dev/sda1', mountpoint='/', fstype='ext4', opts='rw,nosuid'),
      sdiskpart(device='/dev/sda2', mountpoint='/home', fstype='ext, opts='rw')]
@@ -195,7 +194,6 @@ Network
 
 .. code-block:: python
 
-    >>> import psutil
     >>> psutil.net_io_counters(pernic=True)
     {'eth0': netio(bytes_sent=485291293, bytes_recv=6004858642, packets_sent=3251564, packets_recv=4787798, errin=0, errout=0, dropin=0, dropout=0),
      'lo': netio(bytes_sent=2838627, bytes_recv=2838627, packets_sent=30567, packets_recv=30567, errin=0, errout=0, dropin=0, dropout=0)}
@@ -203,8 +201,6 @@ Network
     >>> psutil.net_connections()
     [sconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED', pid=1254),
      sconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING', pid=2987),
-     sconn(fd=-1, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=60759), raddr=addr(ip='72.14.234.104', port=80), status='ESTABLISHED', pid=None),
-     sconn(fd=-1, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=51314), raddr=addr(ip='72.14.234.83', port=443), status='SYN_SENT', pid=None)
      ...]
     >>>
     >>> psutil.net_if_addrs()
@@ -216,8 +212,8 @@ Network
                snicaddr(family=<AddressFamily.AF_LINK: 17>, address='c4:85:08:45:06:41', netmask=None, broadcast='ff:ff:ff:ff:ff:ff', ptp=None)]}
     >>>
     >>> psutil.net_if_stats()
-    {'eth0': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>, speed=100, mtu=1500),
-     'lo': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_UNKNOWN: 0>, speed=0, mtu=65536)}
+    {'lo': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_UNKNOWN: 0>, speed=0, mtu=65536),
+     'wlan0': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>, speed=100, mtu=1500)}
     >>>
 
 Sensors
@@ -230,10 +226,7 @@ Sensors
     {'acpitz': [shwtemp(label='', current=47.0, high=103.0, critical=103.0)],
      'asus': [shwtemp(label='', current=47.0, high=None, critical=None)],
      'coretemp': [shwtemp(label='Physical id 0', current=52.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 0', current=45.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 1', current=52.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 2', current=45.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 3', current=47.0, high=100.0, critical=100.0)]}
+                  shwtemp(label='Core 0', current=45.0, high=100.0, critical=100.0)]}
     >>>
     >>> psutil.sensors_fans()
     {'asus': [sfan(label='cpu_fan', current=3200)]}
@@ -282,11 +275,16 @@ Process management
     7055
     >>> p.ppid()
     7054
+    >>> p.children(recursive=True)
+    [psutil.Process(pid=29835, name='python2.7', started='11:45:38'),
+     psutil.Process(pid=29836, name='python2.7', started='11:43:39')]
+    >>>
     >>> p.parent()
-    <psutil.Process(pid=7054, name='bash') at 140008329539408>
-    >>> p.children()
-    [<psutil.Process(pid=8031, name='python') at 14020832451977>,
-     <psutil.Process(pid=8044, name='python') at 19229444921932>]
+    psutil.Process(pid=4699, name='bash', started='09:06:44')
+    >>> p.parents()
+    [psutil.Process(pid=4699, name='bash', started='09:06:44'),
+     psutil.Process(pid=4689, name='gnome-terminal-server', started='0:06:44'),
+     psutil.Process(pid=1, name='systemd', started='05:56:55')]
     >>>
     >>> p.status()
     'running'
@@ -321,7 +319,6 @@ Process management
     >>> p.memory_maps()
     [pmmap_grouped(path='/lib/x8664-linux-gnu/libutil-2.15.so', rss=32768, size=2125824, pss=32768, shared_clean=0, shared_dirty=0, private_clean=20480, private_dirty=12288, referenced=32768, anonymous=12288, swap=0),
      pmmap_grouped(path='/lib/x8664-linux-gnu/libc-2.15.so', rss=3821568, size=3842048, pss=3821568, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=3821568, referenced=3575808, anonymous=3821568, swap=0),
-     pmmap_grouped(path='/lib/x8664-linux-gnu/libcrypto.so.0.1', rss=34124, rss=32768, size=2134016, pss=15360, shared_clean=24576, shared_dirty=0, private_clean=0, private_dirty=8192, referenced=24576, anonymous=8192, swap=0),
      pmmap_grouped(path='[heap]',  rss=32768, size=139264, pss=32768, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=32768, referenced=32768, anonymous=32768, swap=0),
      pmmap_grouped(path='[stack]', rss=2465792, size=2494464, pss=2465792, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=2465792, referenced=2277376, anonymous=2465792, swap=0),
      ...]
@@ -335,9 +332,7 @@ Process management
     >>>
     >>> p.connections()
     [pconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED'),
-     pconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING'),
-     pconn(fd=119, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=60759), raddr=addr(ip='72.14.234.104', port=80), status='ESTABLISHED'),
-     pconn(fd=123, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=51314), raddr=addr(ip='72.14.234.83', port=443), status='SYN_SENT')]
+     pconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING')]
     >>>
     >>> p.num_threads()
     4
@@ -345,8 +340,6 @@ Process management
     8
     >>> p.threads()
     [pthread(id=5234, user_time=22.5, system_time=9.2891),
-     pthread(id=5235, user_time=0.0, system_time=0.0),
-     pthread(id=5236, user_time=0.0, system_time=0.0),
      pthread(id=5237, user_time=0.0707, system_time=1.1)]
     >>>
     >>> p.num_ctx_switches()
@@ -366,7 +359,7 @@ Process management
     >>>
     >>> p.environ()
     {'LC_PAPER': 'it_IT.UTF-8', 'SHELL': '/bin/bash', 'GREP_OPTIONS': '--color=auto',
-    'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg', 'COLORTERM': 'gnome-terminal',
+    'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg',
      ...}
     >>>
     >>> p.as_dict()
@@ -384,7 +377,6 @@ Process management
     USER         PID %CPU %MEM     VSZ     RSS TTY        START    TIME  COMMAND
     root           1  0.0  0.0   24584    2240            Jun17   00:00  init
     root           2  0.0  0.0       0       0            Jun17   00:00  kthreadd
-    root           3  0.0  0.0       0       0            Jun17   00:05  ksoftirqd/0
     ...
     giampaolo  31475  0.0  0.0   20760    3024 /dev/pts/0 Jun19   00:00  python2.4
     giampaolo  31721  0.0  2.2  773060  181896            00:04   10:30  chrome