Merge remote-tracking branch 'origin/master' into landing-page

NixOS · Apr 22, 2020 · 8740679 · 8740679
2 parents fc4f2c3 + 1c680dc
commit 8740679
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,11 @@ To automatically rebuild on every change:
 
     [nix-shell]$ git ls-files | entr make
 
+To test the complete result from a nix-build:
+
+    $ nix-build
+    $ nix-shell --run 'python -m http.server 8000 --directory result'
+
 ## License
 
 The content of the website is licensed under the [Creative Commons Attribution Share Alike 4.0 International](LICENSES/CC-BY-SA-4.0.txt) license.

diff --git a/netlify.toml b/netlify.toml
@@ -34,6 +34,12 @@
   status = 302
   force = true
 
+[[redirects]]
+  from = "/nixos/support.html"
+  to = "/community.html"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/nixos/community.html"
   to = "/community.html"

diff --git a/news.tt b/news.tt
@@ -1,5 +1,5 @@
-[% WRAPPER layout.tt title="News" menu='organization' %]
+[% WRAPPER layout.tt title="News" menu='nixos' %]
 
 [% INSERT "all-news.xhtml" %]
 
-[% END %]
+[% END %]
diff --git a/nix/index.tt b/nix/index.tt
@@ -36,7 +36,7 @@
 
     <p>GPG verification instructions, source tarballs and more
     installation information are <a
-    href="[%root%]nix/download.html">available</a>.</p>
+    href="[%root%]download.html">available</a>.</p>
 
   [% END %]
   </div>

diff --git a/nixos/index.tt b/nixos/index.tt
@@ -19,7 +19,7 @@
 
   <div class="get-nixos get-button">
   <a class="btn btn-large btn-success"
-  href="[%root%]nixos/download.html"><i class="fa
+  href="[%root%]download.html"><i class="fa
   fa-cloud-download"></i> Get NixOS</a>
   </div>
 </div>