microsoft · jenshnielsen · Mar 7, 2019 · Feb 15, 2019 · Feb 15, 2019 · Feb 15, 2019
diff --git a/docs/api/actions.rst b/docs/api/actions.rst
@@ -0,0 +1,5 @@
+qcodes.actions
+==============
+
+.. automodule:: qcodes.actions
+   :members:
diff --git a/docs/api/config/config.rst b/docs/api/config/config.rst
@@ -0,0 +1,5 @@
+qcodes.config.config
+--------------------
+
+.. automodule:: qcodes.config.config
+   :members:
diff --git a/docs/api/config/index.rst b/docs/api/config/index.rst
@@ -0,0 +1,19 @@
+.. _config_api :
+
+qcodes.config
+=============
+
+.. autosummary::
+
+    qcodes.config
+    qcodes.config.config
+
+
+.. automodule:: qcodes.config
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   config
diff --git a/docs/api/data/data_array.rst b/docs/api/data/data_array.rst
@@ -0,0 +1,5 @@
+qcodes.data.data_array
+----------------------
+
+.. automodule:: qcodes.data.data_array
+   :members:
diff --git a/docs/api/data/data_set.rst b/docs/api/data/data_set.rst
@@ -0,0 +1,5 @@
+qcodes.data.data_set
+--------------------
+
+.. automodule:: qcodes.data.data_set
+   :members:
diff --git a/docs/api/data/format.rst b/docs/api/data/format.rst
@@ -0,0 +1,5 @@
+qcodes.data.format
+------------------
+
+.. automodule:: qcodes.data.format
+   :members:
diff --git a/docs/api/data/gnuplot_format.rst b/docs/api/data/gnuplot_format.rst
@@ -0,0 +1,5 @@
+qcodes.data.gnuplot_format
+--------------------------
+
+.. automodule:: qcodes.data.gnuplot_format
+   :members:
diff --git a/docs/api/data/hdf5_format.rst b/docs/api/data/hdf5_format.rst
@@ -0,0 +1,5 @@
+qcodes.data.hdf5_format
+-----------------------
+
+.. automodule:: qcodes.data.hdf5_format
+   :members:
diff --git a/docs/api/data/hdf5_format_hickle.rst b/docs/api/data/hdf5_format_hickle.rst
@@ -0,0 +1,5 @@
+qcodes.data.hdf5_format_hickle
+------------------------------
+
+.. automodule:: qcodes.data.hdf5_format_hickle
+   :members:
diff --git a/docs/api/data/index.rst b/docs/api/data/index.rst
@@ -0,0 +1,33 @@
+.. _legacydata_api :
+
+qcodes.data
+===========
+
+.. autosummary::
+
+    qcodes.data
+    qcodes.data.data_array
+    qcodes.data.data_set
+    qcodes.data.format
+    qcodes.data.gnuplot_format
+    qcodes.data.hdf5_format
+    qcodes.data.hdf5_format_hickle
+    qcodes.data.io
+    qcodes.data.location
+
+
+.. automodule:: qcodes.data
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   data_array
+   data_set
+   format
+   gnuplot_format
+   hdf5_format
+   hdf5_format_hickle
+   io
+   location
diff --git a/docs/api/data/io.rst b/docs/api/data/io.rst
@@ -0,0 +1,5 @@
+qcodes.data.io
+--------------
+
+.. automodule:: qcodes.data.io
+   :members:
diff --git a/docs/api/data/location.rst b/docs/api/data/location.rst
@@ -0,0 +1,5 @@
+qcodes.data.location
+--------------------
+
+.. automodule:: qcodes.data.location
+   :members:
diff --git a/docs/api/dataset/data_set.rst b/docs/api/dataset/data_set.rst
@@ -0,0 +1,5 @@
+qcodes.dataset.data_set
+-----------------------
+
+.. automodule:: qcodes.dataset.data_set
+   :members:
diff --git a/docs/api/dataset/database_extract_runs.rst b/docs/api/dataset/database_extract_runs.rst
@@ -0,0 +1,5 @@
+qcodes.dataset.database_extract_runs
+------------------------------------
+
+.. automodule:: qcodes.dataset.database_extract_runs
+   :members:
diff --git a/docs/api/dataset/index.rst b/docs/api/dataset/index.rst
@@ -0,0 +1,28 @@
+.. _dataset_api :
+
+qcodes.dataset
+==============
+
+
+.. autosummary::
+
+    qcodes.dataset
+    qcodes.dataset.measurements
+    qcodes.dataset.plotting
+    qcodes.dataset.data_set
+    qcodes.dataset.database_extract_runs
+    qcodes.dataset.legacy_import
+
+
+.. automodule:: qcodes.dataset
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   measurements
+   plotting
+   data_set
+   database_extract_runs
+   legacy_import
diff --git a/docs/api/dataset/legacy_import.rst b/docs/api/dataset/legacy_import.rst
@@ -0,0 +1,5 @@
+qcodes.dataset.legacy_import
+----------------------------
+
+.. automodule:: qcodes.dataset.legacy_import
+   :members:
diff --git a/docs/api/dataset/measurements.rst b/docs/api/dataset/measurements.rst
@@ -0,0 +1,5 @@
+qcodes.dataset.measurements
+---------------------------
+
+.. automodule:: qcodes.dataset.measurements
+   :members:
diff --git a/docs/api/dataset/plotting.rst b/docs/api/dataset/plotting.rst
@@ -0,0 +1,5 @@
+qcodes.dataset.plotting
+-----------------------
+
+.. automodule:: qcodes.dataset.plotting
+   :members:
diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -1,17 +1,40 @@
 .. _Api :
 
-Classes and Functions
-=====================
+QCoDes API documentation
+========================
 
-This page lists the entry points to the qcodes API.
+This page documents the QCoDes API. This page contains documentation of all user facing modules.
+A few of our modules are considered legacy and documented separately below.
+This is split in roughly one page per QCoDeS submodule. A few of the submodules have been split for
+additional clarity.
 
-Public refers to what is available in qcodes namespace.
 
-Private refers to everything that is available.
+QCoDeS API
+----------
 
 .. toctree::
    :maxdepth: 4
+   :includehidden:
 
-   public
-   private
+   config/index
+   dataset/index
+   instrument/index
+   parameters/index
+   logger/index
+   math/index
+   monitor/index
+   station
+   utils/index
 
+Legacy API
+----------
+
+.. toctree::
+   :maxdepth: 4
+   :includehidden:
+
+   loops
+   actions
+   measure
+   data/index
+   plots/index
diff --git a/docs/api/instrument/base.rst b/docs/api/instrument/base.rst
@@ -0,0 +1,5 @@
+qcodes.instrument.base
+----------------------
+
+.. automodule:: qcodes.instrument.base
+   :members:
diff --git a/docs/api/instrument/channel.rst b/docs/api/instrument/channel.rst
@@ -0,0 +1,5 @@
+qcodes.instrument.channel
+-------------------------
+
+.. automodule:: qcodes.instrument.channel
+   :members:
diff --git a/docs/api/instrument/index.rst b/docs/api/instrument/index.rst
@@ -0,0 +1,23 @@
+.. _instrument_api :
+
+qcodes.instrument (Instruments)
+===============================
+
+.. autosummary::
+
+    qcodes.instrument
+    qcodes.instrument.visa
+    qcodes.instrument.channel
+    qcodes.instrument.base
+
+
+.. automodule:: qcodes.instrument
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   visa
+   channel
+   base
diff --git a/docs/api/instrument/visa.rst b/docs/api/instrument/visa.rst
@@ -0,0 +1,5 @@
+qcodes.instrument.visa
+----------------------
+
+.. automodule:: qcodes.instrument.visa
+   :members:
diff --git a/docs/api/logger/index.rst b/docs/api/logger/index.rst
@@ -0,0 +1,23 @@
+.. _logger_api :
+
+qcodes.logger
+=============
+
+
+.. autosummary::
+
+    qcodes.logger
+    qcodes.logger.instrument_logger
+    qcodes.logger.log_analysis
+    qcodes.logger.logger
+
+.. automodule:: qcodes.logger
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   instrument_logger
+   log_analysis
+   logger
diff --git a/docs/api/logger/instrument_logger.rst b/docs/api/logger/instrument_logger.rst
@@ -0,0 +1,5 @@
+qcodes.logger.instrument_logger
+-------------------------------
+
+.. automodule:: qcodes.logger.instrument_logger
+   :members:
diff --git a/docs/api/logger/log_analysis.rst b/docs/api/logger/log_analysis.rst
@@ -0,0 +1,5 @@
+qcodes.logger.log_analysis
+--------------------------
+
+.. automodule:: qcodes.logger.log_analysis
+   :members:
diff --git a/docs/api/logger/logger.rst b/docs/api/logger/logger.rst
@@ -0,0 +1,5 @@
+qcodes.logger.logger
+--------------------
+
+.. automodule:: qcodes.logger.logger
+   :members:
diff --git a/docs/api/loops.rst b/docs/api/loops.rst
@@ -0,0 +1,7 @@
+.. _loops_api :
+
+qcodes.loops
+============
+
+.. automodule:: qcodes.loops
+   :members:
diff --git a/docs/api/math/field_vector.rst b/docs/api/math/field_vector.rst
@@ -0,0 +1,5 @@
+qcodes.math.field_vector
+------------------------
+
+.. automodule:: qcodes.math.field_vector
+   :members:
diff --git a/docs/api/math/index.rst b/docs/api/math/index.rst
@@ -0,0 +1,19 @@
+.. _math_api :
+
+qcodes.math
+===========
+
+.. autosummary::
+
+    qcodes.math
+    qcodes.math.field_vector
+
+
+.. automodule:: qcodes.math
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   field_vector
diff --git a/docs/api/measure.rst b/docs/api/measure.rst
@@ -0,0 +1,5 @@
+qcodes.measure
+==============
+
+.. automodule:: qcodes.measure
+   :members:
diff --git a/docs/api/monitor/index.rst b/docs/api/monitor/index.rst
@@ -0,0 +1,19 @@
+.. _monitor_api :
+
+qcodes.monitor
+==============
+
+.. autosummary::
+
+    qcodes.monitor
+    qcodes.monitor.monitor
+
+
+.. automodule:: qcodes.monitor
+
+
+.. toctree::
+   :maxdepth: 4
+   :hidden:
+
+   monitor
diff --git a/docs/api/monitor/monitor.rst b/docs/api/monitor/monitor.rst
@@ -0,0 +1,5 @@
+qcodes.monitor.monitor
+----------------------
+
+.. automodule:: qcodes.monitor.monitor
+   :members:
diff --git a/docs/api/parameters/group_parameter.rst b/docs/api/parameters/group_parameter.rst
@@ -0,0 +1,5 @@
+qcodes.instrument.group_parameter
+---------------------------------
+
+.. automodule:: qcodes.instrument.group_parameter
+   :members: