summary refs log tree commit diff stats
path: root/web
diff options
context:
space:
mode:
authorVarriount <clay.sweetser@gmail.com>2015-07-10 01:27:11 -0400
committerVarriount <clay.sweetser@gmail.com>2015-07-10 03:51:00 -0400
commit9da1ee4fe40a2c40ef55c4a4002373b903a386d0 (patch)
tree45694dc735ef80bf393eb34d64ade1eec1ba88fd /web
parent7beeb2fadeaec1886b4b82af7e2896e865e97c09 (diff)
downloadNim-9da1ee4fe40a2c40ef55c4a4002373b903a386d0.tar.gz
Add NEP1 to documentation.
Changes:
  - Added NEP 1 to the documentation set.
  - Modified nimdoc's css to add additional spacing between list entries, as well as between code blocks.
  - Added a warning to nimdoc.css for future developers.
Diffstat (limited to 'web')
-rw-r--r--web/documentation.txt3
-rw-r--r--web/website.ini2
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"