diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2015-07-11 13:22:25 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2015-07-11 13:22:25 +0200 |
| commit | df9b5e6884bf42bc12187fcc4ff9cd3e4d40387c (patch) | |
| tree | c09244ebbf941c9649de30a27f253976854b4506 /web | |
| parent | 53b36178c75d6a6a2aa9d8d52898a82133d94c60 (diff) | |
| parent | 9da1ee4fe40a2c40ef55c4a4002373b903a386d0 (diff) | |
| download | Nim-df9b5e6884bf42bc12187fcc4ff9cd3e4d40387c.tar.gz | |
Merge pull request #3098 from Varriount/add-nep1
Add NEP1 to documentation.
Diffstat (limited to 'web')
| -rw-r--r-- | web/documentation.txt | 3 | ||||
| -rw-r--r-- | web/website.ini | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/web/documentation.txt b/web/documentation.txt index 67f8b4070..afb25d1d1 100644 --- a/web/documentation.txt +++ b/web/documentation.txt @@ -14,6 +14,9 @@ Nim's Documentation - | `Language Manual <docs/manual.html>`_ | The Nim manual is a draft that will evolve into a proper specification. + - | `Nim Style Guide <nep1.html>`_ + | The stylistic conventions that Nim's official projects adhere to. + - | `Compiler User Guide <docs/nimc.html>`_ | The user guide lists command line arguments, special features of the compiler, etc. diff --git a/web/website.ini b/web/website.ini index fb98d639a..95f0f5b57 100644 --- a/web/website.ini +++ b/web/website.ini @@ -31,7 +31,7 @@ file: ticker.txt [Documentation] doc: "endb;intern;apis;lib;manual.txt;tut1;tut2;nimc;overview;filters" doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.txt" -doc: "nimfix.txt;nimsuggest.txt" +doc: "nimfix.txt;nimsuggest.txt;nep1.txt" pdf: "manual.txt;lib;tut1;tut2;nimc;niminst;gc" srcdoc2: "system.nim" srcdoc2: "core/macros;pure/marshal;core/typeinfo;core/unsigned" |