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

config.toml

@@ -1,6 +1,6 @@
 base_url = "/"
 title = "M-Labs"
-description = "M-Labs is a company and community who develops, manufactures and sells advanced open hardware devices and solutions. e.g Milkymist system-on-chip (SoC)"
+description = "M-Labs is a company and community who develops, manufactures and sells advanced open hardware devices and solutions such as the ARTIQ experiment control system."
 
 compile_sass = true
 highlight_code = true
@@ -8,4 +8,4 @@ insert_anchor_links = true
 build_search_index = false
 
 [extra]
-author = "M-Labs"
+author = "M-Labs"

content/experiment-control/artiq.md

@@ -72,7 +72,7 @@ ARTIQ was initiated by the Ion Storage Group at NIST, and other partners have co
 {% layout_logos() %}
 
 [![log nist](/images/logo_nist.png)](https://www.nist.gov/pml/time-and-frequency-division/ion-storage)
-[![logo oxfort](/images/logo_oxford.png)](https://www2.physics.ox.ac.uk/)
+[![logo oxford](/images/logo_oxford.png)](https://www2.physics.ox.ac.uk/)
 [![logo jqi](/images/logo_jqi.png)](http://jqi.umd.edu/)
 [![logo duke](/images/logo_duke.png)](http://www.duke.edu)
 [![logo ptb](/images/logo_ptb.png)](http://ptb.de)

content/experiment-control/resources.md

@@ -69,7 +69,7 @@ template = "page.html"
 {% end %}
 
 
-{% layout_card(src="images/email@2x.png", css="col-12 col-md-4 text-center") %}
+{% layout_card(src="images/irc@2x.png", css="col-12 col-md-4 text-center") %}
 <a href="https://webchat.freenode.net/" target="_blank" rel="noopener noreferrer">IRC: #m-labs</a>
 
 <small>on Freenode</small>