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

doc/manual: minor fixes

This commit is contained in:
Sebastien Bourdeauducq 2014-12-02 19:23:15 +08:00
parent 2a843ea436
commit 6de650a701
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manual/core_language_reference.rst
View File

@ -1,6 +1,8 @@
Core language reference Core language reference
======================= =======================
The most commonly used features from those modules can be imported with ``from artiq import *``.
:mod:`artiq.language.core` module :mod:`artiq.language.core` module
--------------------------------- ---------------------------------
@ -8,7 +10,7 @@ Core language reference
:members: :members:
:mod:`artiq.language.context` module :mod:`artiq.language.context` module
--------------------------------- ------------------------------------
.. automodule:: artiq.language.context .. automodule:: artiq.language.context
:members: :members:

6
doc/manual/installing.rst
View File

@ -8,11 +8,11 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
* Install the FPGA vendor tools (e.g. Xilinx ISE and/or Vivado): * Install the FPGA vendor tools (e.g. Xilinx ISE and/or Vivado):
Get Xilinx tools from http://www.xilinx.com/support/download/index.htm. ISE can build bitstreams both for boards using the Spartan-6 (Papilio Pro) and 7-series devices (KC705), while Vivado supports only boards using 7-series devices. * Get Xilinx tools from http://www.xilinx.com/support/download/index.htm. ISE can build bitstreams both for boards using the Spartan-6 (Papilio Pro) and 7-series devices (KC705), while Vivado supports only boards using 7-series devices.
The Papilio Pro is supported by Webpack, the KC705 is not. * The Papilio Pro is supported by Webpack, the KC705 is not.
During the Xilinx toolchain installation, uncheck ``Install cable drivers`` (they are not required as we use better and open source alternatives). * During the Xilinx toolchain installation, uncheck ``Install cable drivers`` (they are not required as we use better and open source alternatives).
* Create a development directory: :: * Create a development directory: ::