diff options
| -rw-r--r-- | tools/website.tmpl | 17 | ||||
| -rw-r--r-- | web/download.txt | 11 | ||||
| -rw-r--r-- | web/question.txt | 28 | ||||
| -rw-r--r-- | web/support.txt | 38 |
4 files changed, 52 insertions, 42 deletions
diff --git a/tools/website.tmpl b/tools/website.tmpl index ba08c9c4c..bc3ed8e2c 100644 --- a/tools/website.tmpl +++ b/tools/website.tmpl @@ -65,7 +65,7 @@ </div> <div id="slide1"> <div> - <h2>Nim looks like this..</h2> + <h2>Nim is simple..</h2> <pre> <span class="cmt"># compute average line length</span> <span class="kwd">var</span> @@ -81,7 +81,7 @@ echo(<span class="val">"Average line length: "</span>, </pre> </div> <div> - <h2>..and this...</h2> + <h2>..and type safe...</h2> <pre> <span class="cmt"># create and greet someone</span> <span class="kwd">type</span> <span class="def">Person</span> = <span class="kwd">object</span> @@ -92,7 +92,7 @@ echo(<span class="val">"Average line length: "</span>, <span class="tab"> </span>echo <span class="val">"Hi, I'm "</span>, p.name, <span class="val">"."</span> <span class="tab end"> </span>echo <span class="val">"I am "</span>, p.age, <span class="val">" years old."</span> -<span class="kwd">var</span> p = <span class="typ">Person</span>(name:<span class="val">"Jon"</span>, age:<span class="val">18</span>) +<span class="kwd">let</span> p = <span class="typ">Person</span>(name:<span class="val">"Jon"</span>, age:<span class="val">18</span>) p.greet() <span class="cmt"># or greet(p)</span> </pre> </div> @@ -108,7 +108,7 @@ p.greet() <span class="cmt"># or greet(p)</span> <span class="tab end"> </span>header: <span class="val">"<stdio.h>"</span>.} <span class="cmt"># ..and use it...</span> -<span class="kwd">var</span> x: cint +<span class="kwd">var</span> x: <span class="typ">cint</span> stdin.unsafeScanf(<span class="val">"%d"</span>, <span class="kwd">addr</span> x) </pre> <p><span class="desc"><b>Compile and run with:</b><br> $ nim c -r example.nim</span></p> @@ -116,10 +116,10 @@ stdin.unsafeScanf(<span class="val">"%d"</span>, <span class="kwd">addr</span> x <div> <h2>..and DSLs are too...</h2> <pre> -<span class="cmt"># a simple web server</span> -<span class="kwd">import</span> jester, asyncdispatch, htmlgen +<span class="cmt"># a simple html server</span> +<span class="kwd">import</span> + jester, asyncdispatch, htmlgen -<span class="cmt"># using jester commands</span> <span class="kwd">routes</span>: <span class="tab"> </span><span class="kwd">get</span> <span class="val">"/"</span>: <span class="tab end"> <span class="tab end"> </span></span><span class="kwd">resp</span> h1(<span class="val">"Hello world"</span>) @@ -146,7 +146,7 @@ runForever() # end for </div> # end if -# if len(c.ticker) > 0 and currentTab != "support": +# if len(c.ticker) > 0: <h3 class="blue">Latest News</h3> <div id="sidebar-news"> $c.ticker @@ -173,6 +173,7 @@ runForever() <div> <h4>Documentation</h4> <a href="documentation.html">Stable Documentation</a> + <a href="learn.html">Learning Resources</a> <!-- <a href="">Development Documentation</a> --> <a href="https://github.com/Araq/Nimrod">Issues & Requests</a> </div> diff --git a/web/download.txt b/web/download.txt index 497781ad6..3d47467f2 100644 --- a/web/download.txt +++ b/web/download.txt @@ -1,13 +1,16 @@ +Download the compiler +===================== + You can download the latest version of the Nim compiler here. **Note:** The Nim compiler requires a C compiler to compile software. On Windows we recommend that you use `Mingw-w64 <http://mingw-w64.sourceforge.net/>`_. GCC is recommended on Linux -and clang on Mac OS X. +and Clang on Mac. Binaries -======== +-------- Unfortunately for now we only provide builds for Windows. * 32 bit: `nim-0.10.2_x32.exe <download/nim-0.10.2_x32.exe>`_ @@ -15,7 +18,7 @@ Unfortunately for now we only provide builds for Windows. Installation based on generated C code -====================================== +-------------------------------------- This installation method is the preferred way for Linux, Mac OS X, and other Unix like systems. Binary packages may be provided later. @@ -32,7 +35,7 @@ but these tend to cause more problems. Installation from github -======================== +------------------------ Use the following commands to build the compiler from source. Change the branch to suit your needs:: diff --git a/web/question.txt b/web/question.txt index 1fb501e2c..28c7ece14 100644 --- a/web/question.txt +++ b/web/question.txt @@ -3,8 +3,8 @@ =========================================== -General -======= +General FAQ +=========== .. container:: standout @@ -124,8 +124,8 @@ General keyword. -Compilation -=========== +Compilation FAQ +=============== .. container:: standout @@ -149,16 +149,16 @@ Compilation Edit the ``config/nim.cfg`` file. Change the value of the ``cc`` variable to one of the following: - ============== ============================================ - Abbreviation C/C++ Compiler - ============== ============================================ - ``vcc`` Microsoft's Visual C++ - ``gcc`` Gnu C - ``llvm_gcc`` LLVM-GCC compiler - ``icc`` Intel C++ compiler - ``clang`` Clang compiler - ``ucc`` Generic UNIX C compiler - ============== ============================================ + ================ ============================================ + **Abbreviation** **C/C++ Compiler** + ================ ============================================ + ``vcc`` Microsoft's Visual C++ + ``gcc`` Gnu C + ``llvm_gcc`` LLVM-GCC compiler + ``icc`` Intel C++ compiler + ``clang`` Clang compiler + ``ucc`` Generic UNIX C compiler + ================ ============================================ Other C compilers are not officially supported, but might work too. diff --git a/web/support.txt b/web/support.txt index d72d91b9c..deedf2c7b 100644 --- a/web/support.txt +++ b/web/support.txt @@ -1,32 +1,38 @@ +Commercial and Community Support +================================ + We offer a multitude of support networks including those in both a community and commercial setting. -Commercial support involves: +Commercial support includes: + +.. container:: standout + + Priority Bug Fixes + ------------------ -Priority Bug Fixes ------------------- + File a bug report and we will address them with the highest priority. Once + fixed, you will be able to access either the current Git build or at your + request a custom build against the latest release with your bug fixed. -File a bug report and we will address them with the highest priority. Once -fixed, you will be able to access either the current Git build or at your -request a custom build against the latest release with your bug fixed. -Features Requests ------------------ +.. container:: standout -Suggest to us any feature that you might need, we will examine your request with -care and provide a proper answer about its potential for inclusion. + Features Requests + ----------------- -Communication happens via email or for a slightly higher fee via Skype. -The pricing is based on the amount of hours spent on the bugfix / feature -implementation and is open to negotiation. + Suggest to us any feature that you might need, we will examine your request with + care and provide a proper answer about its potential for inclusion. + Communication happens via email or for a slightly higher fee via Skype. + The pricing is based on the amount of hours spent on the bugfix / feature + implementation and is open to negotiation. -.. raw:: html - <p>All interested parties should email <img src="assets/images/email.png" alt = "email" />.</p> +All interested parties should email ``support@nim-lang.org``. The bid for contracting work is a commercial offer provided by: -| Andreas Rumpf +| **Andreas Rumpf** | St.-Quentin-Ring 47 | 67663 Kaiserslautern | GERMANY |