Merge branch 'edge' into pvt-pipette-1ch-assembly-qc-v1

Author: andySigler

api/docs/v2/new_modules.rst

@@ -37,7 +37,7 @@ When you load a module in a protocol, you inform the OT-2 that you want the spec
 
 .. versionadded:: 2.0
 
-.. _available_modules
+.. _available_modules:
 
 Available Modules
 -----------------

api/docs/v2/new_protocol_api.rst

@@ -42,26 +42,31 @@ Labware and Wells
 Modules
 -------
 
-.. autoclass:: opentrons.protocol_api.TemperatureModuleContext
+.. autoclass:: opentrons.protocol_api.HeaterShakerContext
    :members:
-   :exclude-members: start_set_temperature, await_temperature, broker, geometry, load_labware_object
+   :exclude-members: broker, geometry, load_labware_object
+   :inherited-members:
+
+.. autoclass:: opentrons.protocol_api.MagneticBlockContext
+   :members:
+   :exclude-members: broker, geometry, load_labware_object
    :inherited-members:
 
 .. autoclass:: opentrons.protocol_api.MagneticModuleContext
    :members:
    :exclude-members: calibrate, broker, geometry, load_labware_object
    :inherited-members:
 
+.. autoclass:: opentrons.protocol_api.TemperatureModuleContext
+   :members:
+   :exclude-members: start_set_temperature, await_temperature, broker, geometry, load_labware_object
+   :inherited-members:
+
 .. autoclass:: opentrons.protocol_api.ThermocyclerContext
    :members:
    :exclude-members: total_step_count, current_cycle_index, total_cycle_count, hold_time, ramp_rate, current_step_index, broker, geometry, load_labware_object
    :inherited-members:
 
-.. autoclass:: opentrons.protocol_api.HeaterShakerContext
-   :members:
-   :exclude-members: broker, geometry, load_labware_object
-   :inherited-members:
-
 
 .. _protocol-api-types: