occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

doc: cleanup shell prompts

This commit is contained in:
Sebastien Bourdeauducq 2015-08-10 15:16:52 +08:00
parent 54b11a392a
commit 9772676f2d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/installing.rst
View File

@ -286,7 +286,7 @@ This should be done after either installation methods (conda or source).
You should see something like this in the serial console: :: You should see something like this in the serial console: ::
~/dev/misoc$ ./tools/flterm --port /dev/ttyUSB1 $ ./tools/flterm --port /dev/ttyUSB1
[FLTERM] Starting... [FLTERM] Starting...
MiSoC BIOS http://m-labs.hk MiSoC BIOS http://m-labs.hk

10
doc/manual/management_system.rst
View File

@ -42,9 +42,9 @@ The master may use a Git repository for the storage of experiment source code. U
Even though the master also supports non-bare repositories, it is recommended to use a bare repository so that it can easily support push transactions from clients. Create it with e.g.: :: Even though the master also supports non-bare repositories, it is recommended to use a bare repository so that it can easily support push transactions from clients. Create it with e.g.: ::
mkdir experiments $ mkdir experiments
cd experiments $ cd experiments
git init --bare $ git init --bare
You want Git to notify the master every time the repository is pushed to (updated), so that it is rescanned for experiments and e.g. the GUI controls and the experiment list are updated. You want Git to notify the master every time the repository is pushed to (updated), so that it is rescanned for experiments and e.g. the GUI controls and the experiment list are updated.
@ -55,11 +55,11 @@ Create a file named ``post-receive`` in the ``hooks`` folder (this folder has be
Then set the execution permission on it: :: Then set the execution permission on it: ::
chmod 755 hooks/post-receive $ chmod 755 hooks/post-receive
You may now run the master with the Git support enabled: :: You may now run the master with the Git support enabled: ::
artiq_master -g -r /path_to/experiments $ artiq_master -g -r /path_to/experiments
Push commits containing experiments to the bare repository using e.g. Git over SSH, and the new experiments should automatically appear in the GUI. Push commits containing experiments to the bare repository using e.g. Git over SSH, and the new experiments should automatically appear in the GUI.