01/02: website: Remove leftover "GuixSD" references.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix-artwork.

commit da771aafa5317e8f8612a213e9565e54d440d071
Author: Ludovic Courtès <address@hidden>
Date:   Tue Mar 5 22:37:04 2019 +0100

    website: Remove leftover "GuixSD" references.
    
    * website/apps/base/templates/about.scm (about-t): Remove mentions of
    "GuixSD".
    * website/apps/base/templates/contribute.scm (contribute-t): Likewise.
    * website/apps/base/templates/help.scm (help-t): Likewise.
    * website/apps/base/templates/irc.scm (irc-t): Likewise.
    * website/apps/base/templates/security.scm (security-t): Likewise.
    * website/apps/packages/templates/detailed-package-list.scm 
(detailed-package-list-t):
    Likewise.
    * website/apps/packages/templates/package-list.scm (package-list-t): 
Likewise.
    * website/apps/packages/templates/index.scm (index-t): Likewise.
    * website/apps/packages/templates/detailed-index.scm (detailed-index-t): 
Likewise.
    * website/apps/download/templates/download.scm (download-t): Likewise.
    * website/apps/blog/templates/post-list.scm (post-list-t): Likewise.
    * website/apps/blog/templates/tag.scm (tag-t): Likewise.
    * website/apps/blog/templates/post.scm (post-t): Likewise.
    * website/apps/blog/templates/feed.scm (atom-feed-t): Likewise.
    * website/apps/base/templates/graphics.scm (graphics-t): Likewise.
    * website/apps/base/templates/theme.scm (theme): Likewise.
    * website/apps/blog/builder.scm (tag-feed-builder): Likewise.
    * website/apps/download/types.scm: Likewise.
    * website/haunt.scm (#:title): Likewise.
---
 website/apps/base/templates/about.scm                  | 18 ++++++++----------
 website/apps/base/templates/contribute.scm             |  4 ++--
 website/apps/base/templates/graphics.scm               |  4 ++--
 website/apps/base/templates/help.scm                   |  7 +++----
 website/apps/base/templates/irc.scm                    |  6 ++----
 website/apps/base/templates/security.scm               |  4 ++--
 website/apps/base/templates/theme.scm                  |  8 ++++----
 website/apps/base/types.scm                            |  2 +-
 website/apps/blog/builder.scm                          |  4 ++--
 website/apps/blog/templates/feed.scm                   |  2 +-
 website/apps/blog/templates/post-list.scm              |  2 +-
 website/apps/blog/templates/post.scm                   |  2 +-
 website/apps/blog/templates/tag.scm                    |  2 +-
 website/apps/download/templates/download.scm           |  3 +--
 website/apps/download/types.scm                        |  2 +-
 website/apps/packages/templates/detailed-index.scm     |  4 +---
 .../apps/packages/templates/detailed-package-list.scm  |  4 +---
 website/apps/packages/templates/index.scm              |  4 +---
 website/apps/packages/templates/package-list.scm       |  4 +---
 website/haunt.scm                                      |  2 +-
 20 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/website/apps/base/templates/about.scm 
b/website/apps/base/templates/about.scm
index 323ae6e..099927a 100644
--- a/website/apps/base/templates/about.scm
+++ b/website/apps/base/templates/about.scm
@@ -14,8 +14,8 @@
   (theme
    #:title '("About")
    #:description
-   "GuixSD is an advanced distribution of the GNU operating system.
-    GuixSD is technology that respects the freedom of computer users.
+   "Guix is an advanced distribution of the GNU operating system.
+    Guix is technology that respects the freedom of computer users.
     You are free to run the system for any purpose, study how it
     works, improve it, and share it with the whole world."
    #:keywords
@@ -32,18 +32,16 @@
       (h2 "About the Project")
 
       (p
-       "The " (em "Guix System Distribution (GuixSD)") " and the "
-       (em "GNU Guix") " package manager are "
+       "The " (em "GNU Guix") " package and system manager is a "
        (a (@ (href ,(gnu-url "philosophy/free-sw.html")))
          "free software")
-       " projects developed by volunteers around the world under the
-       umbrella of the " (a (@ (href ,(gnu-url))) "GNU Project") ". "
-       "This is the official web site for both projects.")
+       " project developed by volunteers around the world under the
+       umbrella of the " (a (@ (href ,(gnu-url))) "GNU Project") ". ")
 
       (p
-       "GuixSD is a distribution of the "
+       "Guix System is an advanced distribution of the "
        (a (@ (href ,(gnu-url))) "GNU operating system")
-       " centered on the GNU Guix package manager.  It uses the "
+       ".  It uses the "
        (a (@ (href ,(gnu-url "software/linux-libre"))) "Linux-libre")
        " kernel, and support for "
        (a (@ (href ,(gnu-url "software/hurd"))) "the Hurd")
@@ -72,7 +70,7 @@
        " language—which makes it nicely hackable.")
 
       (p
-       "GuixSD takes that a step further by supporting stateless,
+       "Guix takes that a step further by additionally supporting stateless,
        reproducible "
        (a (@ (href ,(manual-url "Using-the-Configuration-System.html")))
          "operating system configurations")
diff --git a/website/apps/base/templates/contribute.scm 
b/website/apps/base/templates/contribute.scm
index 7591c62..c0493b2 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -15,7 +15,7 @@
   (theme
    #:title '("Contribute")
    #:description
-   "Check all the ways you can contribute to make GuixSD and GNU Guix
+   "Check all the ways you can contribute to make GNU Guix
    better, and join the world-wide community of volunteers."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
@@ -34,7 +34,7 @@
       (h2 "Contribute")
 
       (p
-       "The Guix System Distribution is a large project developed
+       "GNU Guix is a large project developed
        mostly by volunteers from all around the world. You are welcome
        to join us in the "
        (a (@ (href "https://lists.gnu.org/mailman/listinfo/guix-devel";))
diff --git a/website/apps/base/templates/graphics.scm 
b/website/apps/base/templates/graphics.scm
index 9f7c357..84a70d6 100644
--- a/website/apps/base/templates/graphics.scm
+++ b/website/apps/base/templates/graphics.scm
@@ -14,8 +14,8 @@
   (theme
    #:title '("Graphics")
    #:description
-   "Information about images used for the graphical identity of GuixSD
-   and GNU Guix."
+   "Information about images used for the graphical identity of
+   GNU Guix and Guix System (formerly “GuixSD”)."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
      "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/base/templates/help.scm 
b/website/apps/base/templates/help.scm
index d6b9815..2fb95ff 100644
--- a/website/apps/base/templates/help.scm
+++ b/website/apps/base/templates/help.scm
@@ -15,7 +15,7 @@
   (theme
    #:title '("Help")
    #:description
-   "A list of resources about how to use GuixSD and GNU Guix, plus
+   "A list of resources about how to use GNU Guix, plus
    information about getting help from the community of users and
    developers."
    #:keywords
@@ -81,7 +81,7 @@
                (alt "")))
        (h3 "GNU Manuals")
        (p
-        "GuixSD is a distribution of the "
+        "Guix is a distribution of the "
         (a (@ (href ,(gnu-url))) "GNU operating system")
         ".  Documentation for GNU packages is
          available online in various formats. ")
@@ -99,8 +99,7 @@
        (p
         "For real-time support from the community, you can connect
          to the " (code "#guix") " channel on irc.freenode.net. There
-         you can get help about anything related to both the Guix
-         System Distribution and GNU Guix.")
+         you can get help about anything related to GNU Guix.")
        (p
         "The " (code "#guix") " channel is logged. Previous
          conversations can be browsed online. See the "
diff --git a/website/apps/base/templates/irc.scm 
b/website/apps/base/templates/irc.scm
index 9b09775..44e2a2d 100644
--- a/website/apps/base/templates/irc.scm
+++ b/website/apps/base/templates/irc.scm
@@ -14,9 +14,7 @@
   (theme
    #:title '("IRC" "Contact")
    #:description
-   "Installers and source files for the Guix System distribution
-   (GuixSD), and the GNU Guix package manager. GNU Guix can be
-   installed on different GNU/Linux distributions."
+   "Internet relay chat."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
      "Operating system" "GNU Hurd" "GNU Guix package manager"
@@ -38,7 +36,7 @@
        "Join the " (code "#guix") " channel on the "
        (a (@ (href "https://en.wikipedia.org/wiki/Freenode";))
        "Freenode IRC network")
-       " to chat with the GuixSD and GNU Guix community or to get help
+       " to chat with the GNU Guix community or to get help
        in real-time. You can use the chat widget below, or just use
        the "
        (a (@ (href 
"https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients";))
diff --git a/website/apps/base/templates/security.scm 
b/website/apps/base/templates/security.scm
index b7f5f07..655b6e4 100644
--- a/website/apps/base/templates/security.scm
+++ b/website/apps/base/templates/security.scm
@@ -17,7 +17,7 @@
    #:title '("Security")
    #:description
    "Important information about geting security updates for your
-   GuixSD or GNU Guix installation, and instructions on how to report
+   GNU Guix installation, and instructions on how to report
    security issues."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
@@ -60,7 +60,7 @@
 
       (h3 "Release signatures")
       (p
-       "Releases of Guix and GuixSD are signed using the OpenPGP "
+       "Releases of Guix are signed using the OpenPGP "
        "key with the fingerprint "
        (span (@ (class "mono")) ,ludovics-key)
        ".  "
diff --git a/website/apps/base/templates/theme.scm 
b/website/apps/base/templates/theme.scm
index 1d90478..7435fce 100644
--- a/website/apps/base/templates/theme.scm
+++ b/website/apps/base/templates/theme.scm
@@ -30,7 +30,7 @@
      document. The elements of the list are joined together with em
      dashes as separators between them. For example, a list with two
      strings like 'Hello', and 'Blog' will result in a title like
-     'Hello — Blog — GuixSD'.
+     'Hello — Blog — Guix'.
 
    DESCRIPTION (string)
      The description of the document. This is the value used for the
@@ -69,8 +69,8 @@
 
      (head
       ,(if (null? title)
-          `(title "GuixSD")
-          `(title ,(string-join (append title '("GuixSD")) " — ")))
+          `(title "GNU Guix")
+          `(title ,(string-join (append title '("GNU Guix")) " — ")))
       (meta (@ (charset "UTF-8")))
       (meta (@ (name "keywords") (content ,(string-join keywords ", "))))
       (meta (@ (name "description") (content ,description)))
@@ -91,7 +91,7 @@
             css)
       ;; Feeds.
       (link (@ (type "application/atom+xml") (rel "alternate")
-              (title "GuixSD — Activity Feed")
+              (title "GNU Guix — Activity Feed")
               (href ,(guix-url "feeds/blog.atom"))))
       (link (@ (rel "icon") (type "image/png")
               (href ,(guix-url "static/base/img/icon.png"))))
diff --git a/website/apps/base/types.scm b/website/apps/base/types.scm
index 5ae8ff7..9e84ac1 100644
--- a/website/apps/base/types.scm
+++ b/website/apps/base/types.scm
@@ -45,7 +45,7 @@
 ;;;
 ;;; description (SXML)
 ;;;   A short description. For example:
-;;;   '(p "Discussion about the development of the GuixSD.").
+;;;   '(p "Discussion about the development of Guix.").
 ;;;
 ;;; url (string)
 ;;;   A URL to the main page of the contact medium.
diff --git a/website/apps/blog/builder.scm b/website/apps/blog/builder.scm
index 44c9f18..eaa10a0 100644
--- a/website/apps/blog/builder.scm
+++ b/website/apps/blog/builder.scm
@@ -62,7 +62,7 @@
         (context
          (list
           (cons "domain" domain)
-          (cons "title" "GuixSD — Blog")
+          (cons "title" "GNU Guix — Blog")
           (cons "id" (url-path-join domain "feeds" "blog.atom"))
           (cons "alternate" (url-path-join domain "blog" ""))
           (cons "posts"
@@ -111,7 +111,7 @@
               (list
                (cons "domain" domain)
                (cons "title"
-                     (string-append "GuixSD — Blog — " tag-name))
+                     (string-append "GNU Guix — Blog — " tag-name))
                (cons "id" (url-path-join domain
                                          "feeds"
                                          "blog"
diff --git a/website/apps/blog/templates/feed.scm 
b/website/apps/blog/templates/feed.scm
index d0566ad..7a3f26e 100644
--- a/website/apps/blog/templates/feed.scm
+++ b/website/apps/blog/templates/feed.scm
@@ -28,7 +28,7 @@
       (@ (xmlns "http://www.w3.org/2005/Atom";))
       (id ,id)
       (title ,title)
-      (author (name "GuixSD") (uri ,domain))
+      (author (name "GNU Guix") (uri ,domain))
       (icon ,(guix-url "static/base/img/icon.png"))
       (updated ,(date->string (current-date) "~4"))
       (link (@ (rel "alternate") (href ,alternate)))
diff --git a/website/apps/blog/templates/post-list.scm 
b/website/apps/blog/templates/post-list.scm
index 6ab9d7b..bb900d4 100644
--- a/website/apps/blog/templates/post-list.scm
+++ b/website/apps/blog/templates/post-list.scm
@@ -21,7 +21,7 @@
     (theme
      #:title (list (string-append "Page " page-number) "Blog")
      #:description
-     "Blog posts about GuixSD and the GNU Guix package manager."
+     "Blog posts about GNU Guix."
      #:keywords
      '("GNU" "Linux" "Unix" "Free software" "Libre software"
        "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/blog/templates/post.scm 
b/website/apps/blog/templates/post.scm
index f87792b..17d2f4b 100644
--- a/website/apps/blog/templates/post.scm
+++ b/website/apps/blog/templates/post.scm
@@ -23,7 +23,7 @@
                   (date->string (post-date post) "~Y")
                   "Blog")
      #:description
-     "Blog posts about GuixSD and the GNU Guix package manager."
+     "Blog posts about GNU Guix."
      #:keywords tags
      #:active-menu-item "Blog"
      #:css
diff --git a/website/apps/blog/templates/tag.scm 
b/website/apps/blog/templates/tag.scm
index 5565167..92e99d4 100644
--- a/website/apps/blog/templates/tag.scm
+++ b/website/apps/blog/templates/tag.scm
@@ -25,7 +25,7 @@
      #:description
      (string-append "Blog posts about "
                    tag
-                   "on GuixSD and the GNU Guix package manager.")
+                   " on GNU Guix.")
      #:keywords
      '("GNU" "Linux" "Unix" "Free software" "Libre software"
        "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/download/templates/download.scm 
b/website/apps/download/templates/download.scm
index af7e4ff..9360b7d 100644
--- a/website/apps/download/templates/download.scm
+++ b/website/apps/download/templates/download.scm
@@ -31,8 +31,7 @@
   (theme
    #:title '("Download")
    #:description
-   "Installers and source files for the Guix System distribution
-   (GuixSD), and the GNU Guix package manager. GNU Guix can be
+   "Installers and source files for GNU Guix.  GNU Guix can be
    installed on different GNU/Linux distributions."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
diff --git a/website/apps/download/types.scm b/website/apps/download/types.scm
index f508573..9e5b152 100644
--- a/website/apps/download/types.scm
+++ b/website/apps/download/types.scm
@@ -37,7 +37,7 @@
 ;;;
 ;;; title (string)
 ;;;   The human readable name of the download. For example:
-;;;   "GuixSD Installer".
+;;;   "Guix Installer".
 ;;;
 ;;; description (SXML)
 ;;;   A description of the download. For example:
diff --git a/website/apps/packages/templates/detailed-index.scm 
b/website/apps/packages/templates/detailed-index.scm
index 245687f..36d9d7d 100644
--- a/website/apps/packages/templates/detailed-index.scm
+++ b/website/apps/packages/templates/detailed-index.scm
@@ -20,9 +20,7 @@ packages to advertise."
     (theme
      #:title (list "Packages")
      #:description
-     "List of packages available for the Guix System Distribution
-     (GuixSD) and foreign GNU/Linux distributions through the GNU
-     Guix package manager."
+     "List of packages available through GNU Guix."
      #:keywords
      (list "GNU" "Linux" "Unix" "Free software" "Libre software"
           "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/packages/templates/detailed-package-list.scm 
b/website/apps/packages/templates/detailed-package-list.scm
index df898b4..1b2219a 100644
--- a/website/apps/packages/templates/detailed-package-list.scm
+++ b/website/apps/packages/templates/detailed-package-list.scm
@@ -22,9 +22,7 @@
     (theme
      #:title (list (string-append "Page " page-number) letter "Packages")
      #:description
-     "List of packages available for the Guix System Distribution
-      (GuixSD) and foreign GNU/Linux distributions through the GNU
-      Guix package manager."
+     "List of packages available through GNU Guix."
      #:keywords
      '("GNU" "Linux" "Unix" "Free software" "Libre software"
        "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/packages/templates/index.scm 
b/website/apps/packages/templates/index.scm
index 4de93aa..ee45bdc 100644
--- a/website/apps/packages/templates/index.scm
+++ b/website/apps/packages/templates/index.scm
@@ -20,9 +20,7 @@
     (theme
      #:title (list "Packages")
      #:description
-     "List of packages available for the Guix System Distribution
-   (GuixSD) and foreign GNU/Linux distributions through the GNU
-   Guix package manager."
+     "List of packages available through GNU Guix."
      #:keywords
      (list "GNU" "Linux" "Unix" "Free software" "Libre software"
           "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/apps/packages/templates/package-list.scm 
b/website/apps/packages/templates/package-list.scm
index 18e6a7c..8688900 100644
--- a/website/apps/packages/templates/package-list.scm
+++ b/website/apps/packages/templates/package-list.scm
@@ -22,9 +22,7 @@
     (theme
      #:title (list (string-append "Page " page-number) letter "Packages")
      #:description
-     "List of packages available for the Guix System Distribution
-      (GuixSD) and foreign GNU/Linux distributions through the GNU
-      Guix package manager."
+     "List of packages available through GNU Guix."
      #:keywords
      '("GNU" "Linux" "Unix" "Free software" "Libre software"
        "Operating system" "GNU Hurd" "GNU Guix package manager"
diff --git a/website/haunt.scm b/website/haunt.scm
index 2860da5..9ecdde8 100644
--- a/website/haunt.scm
+++ b/website/haunt.scm
@@ -13,7 +13,7 @@
              (haunt site))
 
 
-(site #:title "GuixSD"
+(site #:title "GNU Guix"
       #:domain (if (getenv "GUIX_WEB_SITE_INFO")
                    "https://guix.info";
                    "https://gnu.org/software/guix";)