From 914de61678fce707bb1199345de26673c565afd7 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 18 Jul 2019 23:04:57 +0800 Subject: [PATCH] minor content corrections --- content/gateware/migen.md | 6 ++++-- templates/_base.html | 35 +++++------------------------------ templates/index.html | 2 +- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/content/gateware/migen.md b/content/gateware/migen.md index c2956600..a80bcc92 100644 --- a/content/gateware/migen.md +++ b/content/gateware/migen.md @@ -6,7 +6,7 @@ template = "page.html" [extra] logo = "images/migen@2x.png" logo_size = 125 -title = "migen" +title = "Migen" +++ {% centerp(safe=true) %} @@ -36,12 +36,14 @@ title = "migen"

Other Migen libraries are built on FHDL and provide various tools such as a system-on-chip interconnect infrastructure, a dataflow programming system, a more traditional high-level synthesizer that compiles Python routines into state machines with datapaths, and a simulator that allows test benches to be written in Python.

+

Migen is the foundation for MiSoC.

+
-
Migen is the foundation for MiSoC.
+
More...

You can find the Migen source here, released under the permissive BSD license.

Documentation (note: sometimes out of date - please help!)

    diff --git a/templates/_base.html b/templates/_base.html index 4c0c76fa..528122a1 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -117,43 +117,18 @@
    Sales inquiries
    - - - - - - - - - - - - - - - - - - - - - -
    Salessales@m-***s.hk
    Sébastiensb@m-***s.hk
    Robertrj@m-***s.hk
    +

    + To purchase ARTIQ Sinara hardware, software and gateware development services, or technical support: contact sales@m-***s.hk. +

-
Technicals inquiries
+
Technical inquiries

- Ask on the Mattermost chat room (or the IRC channel #m-labs on Freenode), open an issue in the relevant project, or write to the mailing list devel (for Migen/MiSoC) or ARTIQ. -
- Patches should be sent via a pull request. -

- -

- Go to forum.m-labs.hk to discuss all things ARTIQ, (n)Migen, MiSoC and HeavyX with the community. + Ask on the live chat room (bridged to the IRC channel #m-labs on Freenode), or go to forum.m-labs.hk, a place to discuss all things ARTIQ, (n)Migen, MiSoC and HeavyX with the community.

diff --git a/templates/index.html b/templates/index.html index da4946cd..b4e70707 100644 --- a/templates/index.html +++ b/templates/index.html @@ -100,7 +100,7 @@
-

We'd love to hear from you!

+

Contact us