Merge branch 'master' of github.com:stanford-ppl/spatial-doc

stanford-ppl · Mar 3, 2018 · ccf3e7f · ccf3e7f
2 parents 7d3a4cb + 82c42eb
commit ccf3e7f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/docs/site/conf.py → docs/site/conf b/docs/site/conf.py → docs/site/conf
diff --git a/docs/site/index.rst b/docs/site/index.rst
@@ -4,7 +4,7 @@ Spatial
 
 For a brief introduction to Spatial and its purpose, see `this presentation <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/WhatIsSpatial.pdf>`_.
 
-For a brief rundown of the language and its constructs, see `this presentation <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/Rundown.pdf>`_ and the :doc:`in-depth tutorials <tutorial/starting>` on this website.
+For a brief rundown of the language and its constructs, see `these slides <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/Rundown.pdf>`_ and the :doc:`in-depth tutorials <tutorial/starting>` on this website.
 
 .. image:: images/spatial_start.png
 

diff --git a/docs/site/tutorial/nw.rst b/docs/site/tutorial/nw.rst
@@ -223,7 +223,7 @@ Generally, an FSM is a hardware version of a while loop.  It allows you to arbit
 control structures and selectively execute code until some breaking state condition is reached.
 
 Asserts, Breakpoints, and Sleep
----------------------
+-------------------------------
 
 There are sometimes cases where the app writer wants to escape the app early or pause the app for a period of time.  In this
 subsection we will explore how to implement the breakpoint/exit and sleep functions in Spatial.  
@@ -405,4 +405,4 @@ Here is the final code for this version of NW::
         println("Aligned A: " + seqA_aligned_string)
         println("Aligned B: " + seqB_aligned_string)
       }
-    }
+    }
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -4,7 +4,7 @@ Spatial
 
 For a brief introduction to Spatial and its purpose, see `this presentation <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/WhatIsSpatial.pdf>`_.
 
-For a brief rundown of the language and its constructs, see `this presentation <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/Rundown.pdf>`_ and the :doc:`in-depth tutorials <tutorial/starting>` on this website.
+For a brief rundown of the language and its constructs, see `these slides <https://github.com/stanford-ppl/spatial-doc/tree/master/docs/site/slides/Rundown.pdf>`_ and the :doc:`in-depth tutorials <tutorial/starting>` on this website.
 
 .. image:: images/spatial_start.png
 

diff --git a/docs/source/tutorial/nw.rst b/docs/source/tutorial/nw.rst
@@ -215,7 +215,7 @@ Generally, an FSM is a hardware version of a while loop.  It allows you to arbit
 control structures and selectively execute code until some breaking state condition is reached.
 
 Asserts, Breakpoints, and Sleep
----------------------
+-------------------------------
 
 There are sometimes cases where the app writer wants to escape the app early or pause the app for a period of time.  In this
 subsection we will explore how to implement the breakpoint/exit and sleep functions in Spatial.  

diff --git a/src/main/scala/processor/Preprocessor.scala b/src/main/scala/processor/Preprocessor.scala
@@ -207,6 +207,7 @@ object Preprocessor {
 
       Files.copy(Paths.get(origPath), Paths.get(path), StandardCopyOption.REPLACE_EXISTING)
     }
+    Files.move(Paths.get(out + "/conf"), Paths.get(out + "/conf.py"))
 
     var displ: Map[String, String] = Map.empty   // Map from alias to display name
     var paths: Map[String, String] = Map.empty   // Map from type name to absolute path to filename (without .rst)