m-labs · Jul 7, 2016 · Jul 7, 2016 · Jul 7, 2016
Showing with 10 additions and 2 deletions.

+1 −0 RELEASE_NOTES.rst

+3 −1 doc/manual/faq.rst

+6 −1 doc/manual/getting_started_core.rst
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -40,6 +40,7 @@ unreleased [2.x]
   takes into account the repository revision field.
 * By default, ``NumberValue`` and ``Scannable`` infer the scale from the unit
   for common units.
+* By default, artiq_client keeps the current persist flag on the master.
 
 
 1.1

diff --git a/doc/manual/faq.rst b/doc/manual/faq.rst
@@ -18,7 +18,9 @@ Copy the ``examples`` folder from that path into your home/user directory, and s
 prevent my first RTIO command from causing an underflow?
 --------------------------------------------------------
 
-The first RTIO event is programmed with a small timestamp above the value of the timecounter at the start of the experiment. If the kernel needs more time than this timestamp to produce the event, an underflow will occur. You can prevent it by calling ``break_realtime`` just before programming the first event, or by adding a sufficient delay.
+The first RTIO event is programmed with a small timestamp above the value of the timecounter when the core device is reset. If the kernel needs more time than this timestamp to produce the event, an underflow will occur. You can prevent it by calling ``break_realtime`` just before programming the first event, or by adding a sufficient delay.
+
+If you are not resetting the core device, the time cursor stays where the previous experiment left it.
 
 organize datasets in folders?
 -----------------------------

diff --git a/doc/manual/getting_started_core.rst b/doc/manual/getting_started_core.rst
@@ -31,11 +31,16 @@ Copy the file ``device_db.pyon`` (containing the device database) from the ``exa
         self.led.output()
         delay(0.1*us)
 
+.. note::
+    To obtain the examples, you can find where the ARTIQ package is installed on your machine with: ::
+
+        python3.5 -c "import artiq; print(artiq.__path__[0])"
+
 Run your code using ``artiq_run``, which is part of the ARTIQ front-end tools: ::
 
     $ artiq_run led.py
 
-The LED of the device should turn on. Congratulations! You have a basic ARTIQ system up and running.
+The process should terminate quietly and the LED of the device should turn on. Congratulations! You have a basic ARTIQ system up and running.
 
 Host/core device interaction
 ----------------------------