diff --git a/api/generated/qcodes.instrument_drivers.ithaco.html b/api/generated/qcodes.instrument_drivers.ithaco.html
index 729e21e1af7..8135c07eed5 100644
--- a/api/generated/qcodes.instrument_drivers.ithaco.html
+++ b/api/generated/qcodes.instrument_drivers.ithaco.html
@@ -217,7 +217,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>measured_param</strong> (<a class="reference internal" href="qcodes.Parameter.html#qcodes.Parameter" title="qcodes.Parameter"><em>Parameter</em></a>) &#8211; a gettable parameter returning the
 voltage read from the Ithaco output.</li>
-<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#module-qcodes.instrument_drivers.ithaco.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211"><em>Ithaco_1211</em></a>) &#8211; <p>an Ithaco instance where you manually
+<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211"><em>Ithaco_1211</em></a>) &#8211; <p>an Ithaco instance where you manually
 maintain the present settings of the real Ithaco amp.</p>
 <p>Note: it should be possible to use other current preamps, if they
 define parameters <code class="docutils literal"><span class="pre">sens</span></code> (sensitivity, in A/V), <code class="docutils literal"><span class="pre">sens_factor</span></code>
diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html
index 8184f569373..aeea2be1216 100644
--- a/api/generated/qcodes.instrument_drivers.signal_hound.html
+++ b/api/generated/qcodes.instrument_drivers.signal_hound.html
@@ -311,7 +311,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus">
-<code class="descname">saStatus</code><em class="property"> = {'saBandwidthClamped': 4, 'saTrackingGeneratorNotFound': -10, 'saDeviceNotIdleErr': -9, 'saTooManyDevicesErr': -5, 'saNoCorrections': 1, 'saUSBCommErr': -11, 'saInvalidDeviceErr': -2, 'saDeviceNotOpenErr': -3, 'saBandwidthErr': -91, 'saInvalidModeErr': -7, 'saOvenColdErr': -20, 'saNotConfiguredErr': -6, 'saParameterClamped': 3, 'saDeviceNotConfiguredErr': -6, 'saInternetErr': -12, 'saExternalReferenceNotFound': -89, 'saNoError': 0, 'saInvalidDetectorErr': -95, 'saUnknownErr': -666, 'saNullPtrErr': -1, 'saInvalidScaleErr': -94, 'saDeviceNotFoundErr': -8, 'saCompressionWarning': 2, 'saInvalidParameterErr': -4, 'saFrequencyRangeErr': -99}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
+<code class="descname">saStatus</code><em class="property"> = {'saDeviceNotFoundErr': -8, 'saInvalidDeviceErr': -2, 'saDeviceNotIdleErr': -9, 'saDeviceNotOpenErr': -3, 'saInternetErr': -12, 'saInvalidModeErr': -7, 'saTooManyDevicesErr': -5, 'saNotConfiguredErr': -6, 'saNoError': 0, 'saDeviceNotConfiguredErr': -6, 'saInvalidDetectorErr': -95, 'saUSBCommErr': -11, 'saInvalidScaleErr': -94, 'saCompressionWarning': 2, 'saNoCorrections': 1, 'saFrequencyRangeErr': -99, 'saExternalReferenceNotFound': -89, 'saOvenColdErr': -20, 'saInvalidParameterErr': -4, 'saBandwidthErr': -91, 'saNullPtrErr': -1, 'saParameterClamped': 3, 'saBandwidthClamped': 4, 'saUnknownErr': -666, 'saTrackingGeneratorNotFound': -10}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">
diff --git a/api/generated/qcodes.instrument_drivers.stanford_research.html b/api/generated/qcodes.instrument_drivers.stanford_research.html
index 3960b6e6d5a..a273e88ffb9 100644
--- a/api/generated/qcodes.instrument_drivers.stanford_research.html
+++ b/api/generated/qcodes.instrument_drivers.stanford_research.html
@@ -254,7 +254,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>measured_param</strong> (<a class="reference internal" href="qcodes.Parameter.html#qcodes.Parameter" title="qcodes.Parameter"><em>Parameter</em></a>) &#8211; a gettable parameter returning the
 voltage read from the SR560 output.</li>
-<li><strong>v_amp_ins</strong> (<a class="reference internal" href="#qcodes.instrument_drivers.stanford_research.SR560.SR560" title="qcodes.instrument_drivers.stanford_research.SR560.SR560"><em>SR560</em></a>) &#8211; <p>an SR560 instance where you manually
+<li><strong>v_amp_ins</strong> (<a class="reference internal" href="#module-qcodes.instrument_drivers.stanford_research.SR560" title="qcodes.instrument_drivers.stanford_research.SR560"><em>SR560</em></a>) &#8211; <p>an SR560 instance where you manually
 maintain the present settings of the real SR560 amp.</p>
 <p>Note: it should be possible to use other voltage preamps, if they
 define parameters <code class="docutils literal"><span class="pre">gain</span></code> (V_out / V_in) and <code class="docutils literal"><span class="pre">invert</span></code>
diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html
index 8baf6480ed6..1b2aeb9af30 100644
--- a/api/generated/qcodes.instrument_drivers.tektronix.html
+++ b/api/generated/qcodes.instrument_drivers.tektronix.html
@@ -258,12 +258,12 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 </table>
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL">
-<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'PHASE_N': 'd', 'MARKER1_LOW_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_OFFSET_N': 'd', 'DIGITAL_LOW_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'DIGITAL_METHOD_N': 'h', 'DELAY_IN_TIME_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'ANALOG_HIGH_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'CHANNEL_STATE_N': 'h', 'ANALOG_LOW_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'MARKER2_HIGH_N': 'd', 'MARKER1_HIGH_N': 'd', 'MARKER2_METHOD_N': 'h', 'CHANNEL_SKEW_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DIGITAL_HIGH_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER1_SKEW_N': 'd', 'EXTERNAL_ADD_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_FILTER_N': 'h', 'ANALOG_OFFSET_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER2_LOW_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_METHOD_N': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'ANALOG_METHOD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_OFFSET_N': 'd', 'ANALOG_OFFSET_N': 'd', 'DELAY_IN_TIME_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'ANALOG_LOW_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_OFFSET_N': 'd', 'DIGITAL_HIGH_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'DIGITAL_METHOD_N': 'h', 'MARKER1_LOW_N': 'd', 'CHANNEL_STATE_N': 'h', 'DELAY_IN_POINTS_N': 'd', 'DIGITAL_LOW_N': 'd', 'MARKER2_METHOD_N': 'h', 'MARKER1_SKEW_N': 'd', 'MARKER2_LOW_N': 'd', 'EXTERNAL_ADD_N': 'h', 'MARKER2_HIGH_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER1_HIGH_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'MARKER1_METHOD_N': 'h', 'ANALOG_AMPLITUDE_N': 'd', 'CHANNEL_SKEW_N': 'd', 'PHASE_N': 'd', 'ANALOG_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'MARKER2_SKEW_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD">
-<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'TRIGGER_INPUT_IMPEDANCE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'RUN_MODE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'ZEROING': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'REPETITION_RATE': 'd', 'COUPLING': 'h', 'WAIT_VALUE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'HOLD_REPETITION_RATE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'TRIGGER_SOURCE': 'h', 'REFERENCE_SOURCE': 'h', 'RUN_STATE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'DIVIDER_RATE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'INTERLEAVE': 'h', 'SAMPLING_RATE': 'd', 'JUMP_TIMING': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'CLOCK_SOURCE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'TRIGGER_SOURCE': 'h', 'RUN_MODE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'TRIGGER_INPUT_SLOPE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'HOLD_REPETITION_RATE': 'h', 'INTERLEAVE': 'h', 'ZEROING': 'h', 'DIVIDER_RATE': 'h', 'CLOCK_SOURCE': 'h', 'WAIT_VALUE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'JUMP_TIMING': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'REFERENCE_SOURCE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'RUN_STATE': 'h', 'COUPLING': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'REPETITION_RATE': 'd', 'REFERENCE_MULTIPLIER_RATE': 'h', 'SAMPLING_RATE': 'd', 'EVENT_INPUT_IMPEDANCE': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -370,7 +370,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>packed_waveforms</strong> (<a class="reference external" href="https://docs.python.org/3.5/library/stdtypes.html#dict" title="(in Python v3.5)"><em>dict</em></a>) &#8211; dictionary containing packed waveforms</li>
 <li><strong>keys wfname_l</strong> (<em>with</em>) &#8211; </li>
-<li><strong>wfname_l</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; array of waveform names, e.g.
+<li><strong>wfname_l</strong> (<em>numpy.ndarray</em>) &#8211; array of waveform names, e.g.
 array([[segm1_ch1,segm2_ch1..], [segm1_ch2,segm2_ch2..],...])</li>
 <li><strong>nrep</strong> (<a class="reference external" href="https://docs.python.org/3.5/library/stdtypes.html#list" title="(in Python v3.5)"><em>list</em></a>) &#8211; list of len(segments) of integers specifying the
 no. of repetions per sequence element.
@@ -786,17 +786,17 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>wf</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; A numpy array containing the waveform. The
+<li><strong>wf</strong> (<em>numpy.ndarray</em>) &#8211; A numpy array containing the waveform. The
 data type of wf is unimportant.</li>
-<li><strong>m1</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; A numpy array containing the first marker.</li>
-<li><strong>m2</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; A numpy array containing the second marker.</li>
+<li><strong>m1</strong> (<em>numpy.ndarray</em>) &#8211; A numpy array containing the first marker.</li>
+<li><strong>m2</strong> (<em>numpy.ndarray</em>) &#8211; A numpy array containing the second marker.</li>
 </ul>
 </td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">An array of unsigned 16 bit integers.</p>
 </td>
 </tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><p class="first"><a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)">numpy.ndarray</a></p>
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><p class="first">numpy.ndarray</p>
 </td>
 </tr>
 <tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body"><ul class="first last simple">
@@ -883,9 +883,9 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>w</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; The waveform</li>
-<li><strong>m1</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; Marker1</li>
-<li><strong>m2</strong> (<a class="reference external" href="https://docs.scipy.org/doc/numpy/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v1.12)"><em>numpy.ndarray</em></a>) &#8211; Marker2</li>
+<li><strong>w</strong> (<em>numpy.ndarray</em>) &#8211; The waveform</li>
+<li><strong>m1</strong> (<em>numpy.ndarray</em>) &#8211; Marker1</li>
+<li><strong>m2</strong> (<em>numpy.ndarray</em>) &#8211; Marker2</li>
 <li><strong>wfmname</strong> (<a class="reference external" href="https://docs.python.org/3.5/library/stdtypes.html#str" title="(in Python v3.5)"><em>str</em></a>) &#8211; waveform name</li>
 </ul>
 </td>