BCDA-APS · prjemian · Jul 6, 2022 · Jul 5, 2022 · Jul 6, 2022 · Jul 6, 2022
diff --git a/.github/workflows/publish-sphinx.yml b/.github/workflows/publish-sphinx.yml
@@ -23,9 +23,17 @@ jobs:
       with:
         fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
 
-    - name: Install sphinx-rtd-theme
+    - name: Install pandoc
       run: |
-        pip install sphinx-rtd-theme
+        sudo apt-get update && sudo apt-get install pandoc
+
+    - name: Install Sphinx build requirements
+      run: |
+        pip install -r requirements-sphinx.txt
+
+    - name: Diagnostics
+      run: |
+        pip list
 
     - name: Build and Commit
       uses: sphinx-notes/pages@master

diff --git a/apstools/devices/area_detector_support.py b/apstools/devices/area_detector_support.py
@@ -21,8 +21,6 @@
    ~AD_setup_FrameType
 """
 
-# TODO: JPEG & TIFF similar to AD_EpicsFileNameHDF5Plugin
-
 from collections import OrderedDict
 from ophyd.areadetector.filestore_mixins import FileStoreBase
 from ophyd.areadetector.filestore_mixins import FileStoreIterativeWrite
@@ -300,9 +298,9 @@ class AD_EpicsFileNameMixin(FileStorePluginBase):
 
     .. caution:: *Caveat emptor* applies here.  You assume expertise!
 
-    Replace standard Bluesky algorithm where file names
+    Replace standard ophyd file naming algorithm (where file names
     are defined as UUID strings, virtually guaranteeing that
-    no existing images files will ever be overwritten.
+    no existing images files will ever be overwritten).
 
     Caller is responsible for setting values of these Components:
 

diff --git a/apstools/plans/alignment.py b/apstools/plans/alignment.py
@@ -210,8 +210,8 @@ class TuneAxis(object):
         RE(tuner.multi_pass_tune(width=2, num=9), live_table)
         RE(tuner.tune(width=0.05, num=9), live_table)
 
-    Also see the jupyter notebook referenced here:
-    :ref:`example_tuneaxis`.
+    Also see the jupyter notebook tited **Demonstrate TuneAxis()**
+    in the :ref:`examples` section.
 
     .. autosummary::
 

diff --git a/docs/source/api/_devices.rst b/docs/source/api/_devices.rst
@@ -4,7 +4,8 @@
 Devices
 =======
 
-(ophyd) Devices that might be useful at the APS using Bluesky
+Devices (subclasses of ophyd's `Device`) that might be useful at the APS using
+Bluesky.
 
 Also consult the :ref:`Index <genindex>` under the *Ophyd* heading for
 links to the Devices, Exceptions, Mixins, Signals, and other support
@@ -13,6 +14,16 @@ items described here.
 Categories
 ----------
 
+See these categories:
+
+* :ref:`devices.aps_support`
+* :ref:`devices.area_detector`
+* :ref:`devices.motors`
+* :ref:`devices.scalers`
+* :ref:`devices.shutters`
+* :ref:`devices.slits`
+* :ref:`devices.temperature_controllers`
+
 .. _devices.aps_support:
 
 APS General Support
@@ -44,7 +55,7 @@ Area Detector Support
     ~apstools.devices.area_detector_support.AD_EpicsTIFFIterativeWriter
     ~apstools.devices.area_detector_support.AD_full_file_name_local
     ~apstools.devices.area_detector_support.AD_plugin_primed
-    ~apstools.devices.area_detector_support.AD_prime_plugin
+    ~apstools.devices.area_detector_support.AD_prime_plugin2
     ~apstools.devices.area_detector_support.AD_setup_FrameType
 
 .. _devices.scalers:

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -40,6 +40,7 @@
     sphinx.ext.mathjax
     sphinx.ext.todo
     sphinx.ext.viewcode
+    nbsphinx
 """.split()
 
 # Add any paths that contain templates here, relative to this directory.