Merge remote-tracking branch 'github/master' into pva

Author: coretl

docs/explanations/why-use-pythonIoc.rst

@@ -38,6 +38,7 @@ allows you to write this as:
     # Leave the IOC running with an interactive shell.
     softioc.interactive_ioc(globals())
 
+
 Dynamically created PVs
 -----------------------
 
@@ -76,13 +77,10 @@ this as:
     # Leave the IOC running with an interactive shell.
     softioc.interactive_ioc(globals())
 
-ADD THE PANDA USE CASE HERE
 
 Existing Python Support
 -----------------------
 
 It may be that you have specific device support written in Python that you wish
 to expose as PVs. This could be either in the form of a device support library
 or using a Python library to calculate PV values as above.
-
-ADD THE FURKA/GRIMSEL MONITORING IOC USE CASE HERE

docs/how-to/use-asyncio-in-an-ioc.rst

@@ -12,7 +12,7 @@ an IOC.
 .. literalinclude:: ../examples/example_asyncio_ioc.py
 
 
-The ``dispatcher`` is created and passed to :func:`~softioc.softioc.iocInit`. This is what 
+The ``dispatcher`` is created and passed to :func:`~softioc.softioc.iocInit`. This is what
 allows the use of `asyncio` functions in this IOC. It contains a new event loop to handle
 this.
 
@@ -21,13 +21,14 @@ sleeping that coroutine between updates.
 Note that we run this coroutine in the ``loop`` of the ``dispatcher``, and not in the
 main event loop.
 
-This IOC will, like the one in `../tutorials/creating-an-ioc`, leave an interactive 
-shell open. The values of the PVs can be queried using the methods defined in the 
+This IOC will, like the one in `../tutorials/creating-an-ioc`, leave an interactive
+shell open. The values of the PVs can be queried using the methods defined in the
 `softioc.softioc` module.
 
 
 Asynchronous Channel Access
 ---------------------------
 
-PVs can be retrieved externally from a PV in an asynchronous manner by using the :py`aioca` module. 
-It provides ``await``-able implementations of ``caget``, ``caput``, etc. See that module for more information.
+PVs can be retrieved externally from a PV in an asynchronous manner by using the
+`aioca` module. It provides ``await``-able implementations of ``caget``,
+``caput``, etc. See that module for more information.

docs/index.rst

@@ -5,7 +5,7 @@ How the documentation is structured
 -----------------------------------
 
 Documentation is split into four categories, accessible from links below or in
-the side-bar. Use the links below or in the side-bar.
+the side-bar.
 
 .. rst-class:: columns
 

docs/tutorials/creating-an-ioc.rst

@@ -58,7 +58,7 @@ which must be called in this order.  After calling
     :end-before: # Finally
 
 We define a long-running operation that will increment the value of ``ai`` once per
-second. This is run as a background thread by `cothread`.
+second. This is run in the background by `cothread`.
 
 .. literalinclude:: ../examples/example_cothread_ioc.py
     :start-after: # Finally