From 799a58a44296ca2577a1d8152efdb4d8e1dba67b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 9 Aug 2015 13:53:06 +0800 Subject: [PATCH] doc: minor cleanup --- README.rst | 4 +--- doc/manual/introduction.rst | 2 +- doc/manual/management_system.rst | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index efa1eeeee..7287516c8 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,10 @@ .. image:: doc/logo/artiq.png .. image:: https://travis-ci.org/m-labs/artiq.svg :target: https://travis-ci.org/m-labs/artiq -.. image:: https://coveralls.io/repos/m-labs/artiq/badge.svg?branch=master - :target: https://coveralls.io/r/m-labs/artiq?branch=master ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is -being developed in partnership with the Ion Storage Group at NIST, and its +developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping. The system features a high-level programming language that helps describing diff --git a/doc/manual/introduction.rst b/doc/manual/introduction.rst index 0b224f38c..a538c3980 100644 --- a/doc/manual/introduction.rst +++ b/doc/manual/introduction.rst @@ -7,7 +7,7 @@ Introduction ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is -being developed in partnership with the Ion Storage Group at NIST, and its +developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping. The system features a high-level programming language that helps describing diff --git a/doc/manual/management_system.rst b/doc/manual/management_system.rst index b5686f04b..353e77575 100644 --- a/doc/manual/management_system.rst +++ b/doc/manual/management_system.rst @@ -63,7 +63,7 @@ You may now run the master with the Git support enabled: :: Push commits containing experiments to the bare repository using e.g. Git over SSH, and the new experiments should automatically appear in the GUI. -.. note:: If you plan to run the ARTIQ system entirely on a single machine, you may also consider using a non-bare repository and the ``post-commit`` hook to trigger repository scans every time you commit changes (locally). +.. note:: If you plan to run the ARTIQ system entirely on a single machine, you may also consider using a non-bare repository and the ``post-commit`` hook to trigger repository scans every time you commit changes (locally). The ARTIQ master never uses the repository's working directory, but only what is committed. The GUI always runs experiments from the repository. The command-line client, by default, runs experiment from the raw filesystem (which is useful for iterating rapidly without creating many disorganized commits). If you want to use the repository instead, simply pass the ``-R`` option.