M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

doc: minor cleanup

This commit is contained in:
Sebastien Bourdeauducq 2015-08-09 13:53:06 +08:00
parent f81b2eba43
commit 799a58a442
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -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

2
doc/manual/introduction.rst
View File

@ -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

2
doc/manual/management_system.rst
View File

@ -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.