Merge branch 'master' of https://git.m-labs.hk/M-Labs/web2019

content/experiment-control/resources.md

@@ -9,7 +9,7 @@ template = "page.html"
 
 <div class="row">
 
-{% layout_card(title="ARTIQ Documentation") %}
+{% layout_card(title="ARTIQ manual") %}
 <small>Beta (development) version</small>
 
 <a href="https://m-labs.hk/artiq/manual-beta.pdf" target="_blank">PDF</a> | <a href="https://m-labs.hk/artiq/manual-beta/" target="_blank" rel="noopener noreferrer">HTML</a>
@@ -17,21 +17,20 @@ template = "page.html"
 
 
 
-{% layout_card(title="ARTIQ Documentation") %}
+{% layout_card(title="ARTIQ manual") %}
 <small>Stable version</small>
 
 <a href="https://m-labs.hk/artiq/manual/" target="_blank">HTML</a>
 {% end %}
 
+{% layout_card(title="SiPyCo manual") %}
+<small>Starting with ARTIQ-5, this library replaces <tt>artiq.protocols</tt>.</small>
 
-
-{% layout_card(title="ARTIQ Documentation") %}
-<small>Older manuals (HTML only)</small>
-
-<a href="https://m-labs.hk/artiq/manual-release-3/" target="_blank" rel="noopener noreferrer">ARTIQ-3</a> | <a href="https://m-labs.hk/artiq/manual-release-2/" target="_blank" rel="noopener noreferrer">ARTIQ-2</a>
+<a href="https://m-labs.hk/artiq/sipyco-manual.pdf" target="_blank">PDF</a> | <a href="https://m-labs.hk/artiq/sipyco-manual/" target="_blank" rel="noopener noreferrer">HTML</a>
 {% end %}
 
 
+
 {% layout_card(title="Slideshow") %}
 <small>The ARTIQ experiment control system</small>
 

content/gateware/migen.md

@@ -47,11 +47,9 @@ Migen is the foundation for MiSoC.
 
 You can find the Migen source <a href="http://github.com/m-labs/migen" target="_blank" rel="noopener noreferrer">here</a>, released under the permissive BSD license.
 
-**Documentation** (note: sometimes out of date - please help!)
+**Documentation**
 
-- <a href="https://m-labs.hk/migen/manual" target="_blank" rel="noopener noreferrer">User guide
-- <a href="https://m-labs.hk/migen/tutorial.pdf" target="_blank" rel="noopener noreferrer">Tutorial: An introduction to Migen
-- <a href="https://m-labs.hk/migen/slides.pdf" target="_blank" rel="noopener noreferrer">Lecture slides
+- <a href="https://m-labs.hk/migen/manual/" target="_blank" rel="noopener noreferrer">User guide
 - <a href="https://www.wdj-consulting.com/blog/migen-port.html" target="_blank" rel="noopener noreferrer">Tutorial "Porting a New Board To Migen"</a> by cr1901
 - <a href="https://lab.whitequark.org/notes/2016-10-18/implementing-an-uart-in-verilog-and-migen/" target="_blank" rel="noopener noreferrer">"Implementing a UART in Verilog and Migen"</a> by whitequark
 - <a href="https://lab.whitequark.org/notes/2016-10-19/implementing-a-simple-soc-in-migen/" target="_blank" rel="noopener noreferrer">"Implementing a simple SoC in Migen"</a> by whitequark

static/js/shop.jsx

@@ -1317,7 +1317,7 @@ class Shop extends React.PureComponent {
     const a = document.createElement('a');
     const num = (new Date()).getTime();
     const subject = `[Order hardware] - Request Quote`;
-    let body = `Hello!\n\nI would like to request a quotation for my below configuration:\n\n${JSON.stringify(crate)}\n\n`;
+    let body = `Hello!\n\nI would like to request a quotation for my below configuration:\n\n${JSON.stringify(crate)}\n\n(Please do not edit the machine-readable representation above)\n\n`;
 
     if (note) {
       body = `${body}\n\nAdditional note:\n\n${note ? note.trim() : ''}`;