0.6.0 release

styx-static · Feb 26, 2017 · 9a4e711 · 9a4e711
1 parent ce08af6
commit 9a4e711
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0-dev
+0.6.0
diff --git a/src/doc/library-generated.adoc b/src/doc/library-generated.adoc
@@ -811,7 +811,7 @@ The site derivation.
 [source, nix]
 .Code
 ----
-generateSite { pageList = [ pages.index ]; }
+mkSite { pageList = [ pages.index ]; }
 
 ----
 

diff --git a/src/doc/release-notes.adoc b/src/doc/release-notes.adoc
@@ -3,7 +3,7 @@
 :sectnums!:
 
 [[v0.6.0]]
-=== Styx 0.6.0 - 2017/XX/XX
+=== Styx 0.6.0 - 2017/02/26
 
 ==== Highlights:
 
@@ -35,7 +35,7 @@ Generic templates theme:
 
 * Substitutions in data files have been removed in favor embedded nix. (substitutions can still be used in static files)
 * `themes.load` function arguments were renamed:
-** `template.extraEnv` renamed to `extraEnv`.
+** `templates.extraEnv` renamed to `extraEnv`.
 ** `conf.extraConf` renamed to `extraConf`.
 * `loadDir` and `loadFile` functions arguments have changed.
 * `mkMultiTail` function have been removed in favor of `mkPageList`.

diff --git a/src/doc/styx-themes-generated.adoc b/src/doc/styx-themes-generated.adoc
@@ -4637,12 +4637,6 @@ rec {
   };
 
 
-/*-----------------------------------------------------------------------------
-   generateSite arguments preparation
-
------------------------------------------------------------------------------*/
-
-
 /*-----------------------------------------------------------------------------
    Site rendering
 

diff --git a/src/lib/generation.nix b/src/lib/generation.nix
@@ -114,7 +114,7 @@ rec {
 
     examples = [ (mkExample {
       literalCode = ''
-        generateSite { pageList = [ pages.index ]; }
+        mkSite { pageList = [ pages.index ]; }
       '';
     }) ];
 

diff --git a/src/scaffold/sample-data/posts/2016-09-19-blog-tutorial.adoc b/src/scaffold/sample-data/posts/2016-09-19-blog-tutorial.adoc
@@ -363,14 +363,14 @@ In `site.nix` find:
 
 [source, nix]
 ----
-  pagesList = lib.pagesToList { inherit pages; };
+  pageList = lib.pagesToList { inherit pages; };
 ----
 
 Let's add the default layout here:
 
 [source, nix]
 ----
-  pagesList = lib.pagesToList { inherit pages; default = { layout = templates.layout; }; };
+  pageList = lib.pagesToList { inherit pages; default = { layout = templates.layout; }; };
 ----
 
 And remove all the `layout` declarations using `templates.layout` of our pages:

diff --git a/themes/orbit b/themes/orbit
-Original file line number
+Diff line change
@@ Expand Up / @@ -811,7 +811,7 @@ The site derivation. @@
     [source, nix]
     .Code
     ----
-    generateSite { pageList = [ pages.index ]; }
+    mkSite { pageList = [ pages.index ]; }
     ----
@@ Expand Down @@