From adf588a9daa73072ad3f1b39581ba5881a6cf780 Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Sat, 27 Jan 2018 16:31:02 -0800
Subject: [PATCH] website: Clarify the descriptions of Guix and GuixSD.

* website/apps/base/templates/home.scm: Clarify descriptions.
---
 website/apps/base/templates/home.scm | 47 +++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/website/apps/base/templates/home.scm b/website/apps/base/templates/home.scm
index f7c2d1c..beb1b39 100644
--- a/website/apps/base/templates/home.scm
+++ b/website/apps/base/templates/home.scm
@@ -36,10 +36,27 @@
       (@ (class "featured-content"))
       (h2 (@ (class "a11y-offset")) "Summary")
       (ul
+       (li
+	(b "Dependable.")
+	,(link-yellow
+	  #:label "GNU Guix"
+	  #:url (manual-url "Package-Management.html"))
+	" is a "
+	,(link-yellow
+	  #:label "purely functional"
+	  #:url (manual-url "Introduction.html#index-functional-package-management"))
+	" package management tool.  In addition to standard package
+		management features, it supports transactional upgrades
+		and roll-backs, unprivileged package management, per-user profiles, "
+	,(link-yellow
+	  #:label "and more"
+	  #:url (manual-url "Features.html"))
+	".")
+
        (li
 	(b "Liberating.")
-	" The Guix System Distribution (GuixSD) is an advanced
-        distribution of the "
+	" The GNU Guix System Distribution (GuixSD) is an advanced
+	 distribution of the "
 	,(link-yellow
 	  #:label "GNU operating system"
 	  #:url (gnu-url "gnu/about-gnu.html"))
@@ -47,34 +64,24 @@
 	,(link-yellow
 	  #:label "GNU Project"
 	  #:url (gnu-url))
-	"—which respects the "
+	", with Guix at its core.  Because GuixSD is "
 	,(link-yellow
-	  #:label "freedom of computer users"
+	  #:label "FSDG"
 	  #:url (gnu-url "distros/free-system-distribution-guidelines.html"))
-	". ")
-
-       (li
-	(b "Dependable.")
-	" It comes with the "
-	,(link-yellow
-	  #:label "GNU Guix package manager"
-	  #:url (manual-url "Package-Management.html"))
-	", which in addition to standard package management features,
-        supports transactional upgrades and roll-backs, unprivileged
-        package management, per-user profiles, "
+	"-compliant, all software in the distribution"
 	,(link-yellow
-	  #:label "and more"
-	  #:url (manual-url "Features.html"))
-	".")
+	  #:label "respects your freedom"
+	  #:url (gnu-url "philosophy/free-sw.html"))
+	". ")
 
        (li
 	(b "Hackable.")
-	" It provides "
+	" Both Guix and GuixSD provide "
 	,(link-yellow
 	  #:label "Guile Scheme"
 	  #:url (gnu-url "software/guile/"))
 	" APIs, including high-level embedded domain-specific
-        languages (EDSLs) to "
+        languages (EDSLs) to declaratively "
 	,(link-yellow
 	  #:label "define packages"
 	  #:url (manual-url "Defining-Packages.html"))
-- 
2.15.1