diff options
author | Araq <rumpf_a@web.de> | 2015-11-18 13:32:29 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2015-11-18 13:32:29 +0100 |
commit | 2f07ac785f1f61b3f5b51a4d4476627108d93831 (patch) | |
tree | a6a1b492397da52ec2150986dfca445950742811 | |
parent | 528cf3eae4eead9b91527f8d79523a4e55936753 (diff) | |
download | Nim-2f07ac785f1f61b3f5b51a4d4476627108d93831.tar.gz |
website updated
-rw-r--r-- | tools/website.tmpl | 25 | ||||
-rw-r--r-- | web/documentation.txt | 17 |
2 files changed, 12 insertions, 30 deletions
diff --git a/tools/website.tmpl b/tools/website.tmpl index 1f882510c..d2fcb0afd 100644 --- a/tools/website.tmpl +++ b/tools/website.tmpl @@ -49,26 +49,7 @@ # if currentTab == "index": <div id="slideshow"> <!-- slides --> - <div id="slide0" class="active zeoslide"> - <a href="news.html#Z2015-10-16-first-nim-conference"> - <img src="assets/zeo/banner.jpg" alt="First Nim workshop in Ukraine!"/> - </a> - </div> - <div id="slide1" class="codeslide1"> - <h2>Why should I be excited?</h2> - <span class="desc">Nim is the only language that leverages automated proof technology to perform a <i>disjoint check</i> for your parallel code. Working on disjoint data means no locking is required and yet data races are impossible:</span><br><br> -<pre> -<span class="kwd">parallel</span>: -<span class="tab"> </span><span class="kwd">var</span> i = <span class="val">0</span> -<span class="tab"> </span><span class="kwd">while</span> i <= a.high: -<span class="tab"> <span class="tab"> </span></span></span><span class="kwd">spawn</span> f(a[i]) -<span class="tab"> <span class="tab"> </span></span></span><span class="kwd">spawn</span> f(a[i+<span class="val">1</span>]) -<span class="tab"> <span class="tab"> </span></span></span><span class="cmt"># ERROR: cannot prove a[i] is disjoint from a[i+1]</span> -<span class="tab"> <span class="tab"> </span></span></span><span class="cmt"># BUT: replace 'i += 1' with 'i += 2' and the code compiles!</span> -<span class="tab end"> <span class="tab end"> </span></span>i += <span class="val">1</span> -</pre> - </div> - <div id="slide2" class="codeslide2"> + <div id="slide0" class="active codeslide2"> <div> <h2>Nim is simple..</h2> <pre> @@ -102,7 +83,7 @@ p.greet() <span class="cmt"># or greet(p)</span> </pre> </div> </div> - <div id="slide3" class="codeslide3"> + <div id="slide1" class="codeslide3"> <div> <h2>C FFI is easy in Nim..</h2> <pre> @@ -138,8 +119,6 @@ runForever() <div id="slideshow-nav"> <div id="slideControl0" onclick="slideshow_click(0)" class="active"></div> <div id="slideControl1" onclick="slideshow_click(1)"></div> - <div id="slideControl2" onclick="slideshow_click(2)"></div> - <div id="slideControl3" onclick="slideshow_click(3)"></div> </div> # end <aside id="sidebar"> diff --git a/web/documentation.txt b/web/documentation.txt index 65aba0660..ec33d0827 100644 --- a/web/documentation.txt +++ b/web/documentation.txt @@ -3,6 +3,16 @@ Nim's Documentation .. container:: standout + Search Options + -------------- + + .. container:: internals + + `Documentation Index <docs/theindex.html>`_ - The generated + index. **Index + (Ctrl+F) == Joy** + +.. container:: standout + Standards & Guides ------------------ @@ -58,10 +68,3 @@ Nim's Documentation - | `Internal Documentation <docs/intern.html>`_ | The internal documentation describes how the compiler is implemented. Read this if you want to hack the compiler. - - -Search Options --------------- - -`Documentation Index <docs/theindex.html>`_ - The generated -index. **Index + (Ctrl+F) == Joy** |