02/02: website: Remove uses of "GuixSD".

[Ludovic Court�s]

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

commit f880de2aaa771a2642ef0bee3f6ea97ac65a0667
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 28 10:23:25 2019 +0100

    website: Remove uses of "GuixSD".
    
    * website/apps/base/data.scm: Remove "GuixSD or".
    * website/apps/base/templates/contact.scm (contact-t): Likewise.
    * website/apps/base/templates/components.scm (navbar): Change branding
    from "GuixSD" to "Guix".
    * website/apps/base/templates/help.scm (help-t): Write "Guix System"
    instead of "GuixSD".
    * website/apps/download/data.scm (system-downloads): Likewise.
    * website/apps/download/templates/download.scm (download-t): Likewise.
    * website/apps/base/templates/home.scm (home-t): Rewrite to avoid
    GuixSD/Guix dichotomy.
    * website/static/base/img/Guix-logo.png: New file.
    * website/static/base/css/navbar.css (.branding): Use it.
---
 website/apps/base/data.scm                   |  17 +++++-----
 website/apps/base/templates/components.scm   |   2 +-
 website/apps/base/templates/contact.scm      |   2 +-
 website/apps/base/templates/help.scm         |   4 +--
 website/apps/base/templates/home.scm         |  49 +++++++++++++--------------
 website/apps/download/data.scm               |  16 ++++-----
 website/apps/download/templates/download.scm |   8 ++---
 website/static/base/css/navbar.css           |   4 +--
 website/static/base/img/Guix-logo.png        | Bin 0 -> 15749 bytes
 9 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index b6e9361..cea8012 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -21,7 +21,7 @@
     #:description
     '(p
       "Join the " (code "#guix") " channel on the Freenode IRC network to chat
-      with the community about GuixSD or GNU Guix or to get help in
+      with the community about GNU Guix or to get help in
       real-time.")
     #:url (guix-url "contact/irc/")
     #:log "https://gnunet.org/bot/log/guix/";)
@@ -43,18 +43,18 @@ English).")
 gemeinschaftlichen Rat zu GuixSD und Guix zu bekommen.  Sie können
 Nachrichten auch auf deutsch verfassen.")
       ("en"
-       "Subscribe to the Help mailing list to get support from the GuixSD
-and GNU Guix community via email.  You can post messages in English though we
+       "Subscribe to the Help mailing list to get support from the
+GNU Guix community via email.  You can post messages in English though we
 also accept other languages.")
       ("eo"
        "Subskribu al la retmesaĝolisto \"Help\" por demandi helpon pri
-GuixSD kaj GNU Guix al la grupo.  Vi povas skribi esperantlingve.")
+GNU Guix al la grupo.  Vi povas skribi esperantlingve.")
       ("es"
        "Suscríbete a la lista de correo electrónico \"Help\" por pedir
-ayuda con Guix y GuixSD.  Puedes escribir mensajes en Español.")
+ayuda con Guix.  Puedes escribir mensajes en Español.")
       ("fr"
        "Abonnez-vous à la liste de diffusion « Help » pour obtenir l'aide
-de la communauté sur GuixSD et GNU Guix par courrier électronique.  Vous
+de la communauté sur GNU Guix par courrier électronique.  Vous
 pouvez envoyer des messages en français.")
       ("hu"
        "Iratkozzon fel a „Help“ levelezőlistára, hogy segítséget kaphasson
@@ -91,7 +91,7 @@ het Nederlands.")
     #:name "Bug Reporting"
     #:description
     '(p
-      "If you found a bug in GuixSD or Guix, check whether the bug is
+      "If you found a bug in Guix, check whether the bug is
       already in the "
       (a (@ (href 
"https://debbugs.gnu.org/cgi/pkgreport.cgi?package=guix;max-bugs=100";))
         "bug database")
@@ -104,8 +104,7 @@ het Nederlands.")
     #:name "Development Mailing List"
     #:description
     '(p
-      "Discussion about the development of GNU Guix and the Guix
-      System Distribution (GuixSD). "
+      "Discussion about the development of GNU Guix. "
       (a (@ (href 
"https://lists.gnu.org/archive/html/bug-guix/2013-07/msg00039.html";))
         " Until July 2013")
       ", the bug-Guix mailing list filled that role. ")
diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index 285d007..443a976 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -283,7 +283,7 @@
     (h1
      (a
       (@ (class "branding") (href ,(guix-url)))
-      (span (@ (class "a11y-offset")) "GuixSD")))
+      (span (@ (class "a11y-offset")) "Guix")))
 
     ;; Menu.
     (nav (@ (class "menu"))
diff --git a/website/apps/base/templates/contact.scm 
b/website/apps/base/templates/contact.scm
index c246d4b..b4a5dda 100644
--- a/website/apps/base/templates/contact.scm
+++ b/website/apps/base/templates/contact.scm
@@ -15,7 +15,7 @@
   (theme
    #:title '("Contact")
    #:description
-   "A list of channels to communicate with GuixSD and GNU Guix users
+   "A list of channels to communicate with GNU Guix users
    and developers about anything you want."
    #:keywords
    '("GNU" "Linux" "Unix" "Free software" "Libre software"
diff --git a/website/apps/base/templates/help.scm 
b/website/apps/base/templates/help.scm
index 8dc588e..5d747e0 100644
--- a/website/apps/base/templates/help.scm
+++ b/website/apps/base/templates/help.scm
@@ -41,14 +41,14 @@
        (img
         (@ (src ,(guix-url "static/base/img/guixsd-manual-icon.png"))
            (alt "")))
-       (h3 "GuixSD Manual")
+       (h3 "Guix System Manual")
        (p
         "The documentation about the Guix System Distribution is
          available online as part of the GNU Guix package manager
          manual.")
        (p
         ,(link-more
-          #:label "Read GuixSD manual"
+          #:label "Read Guix System manual"
           #:url (manual-url "GNU-Distribution.html"))))
 
 
diff --git a/website/apps/base/templates/home.scm 
b/website/apps/base/templates/home.scm
index f7c2d1c..1cd175a 100644
--- a/website/apps/base/templates/home.scm
+++ b/website/apps/base/templates/home.scm
@@ -16,8 +16,8 @@
   (theme
    #:title '("GNU's advanced distro and transactional package manager")
    #: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
@@ -38,7 +38,7 @@
       (ul
        (li
        (b "Liberating.")
-       " The Guix System Distribution (GuixSD) is an advanced
+       " Guix is an advanced
         distribution of the "
        ,(link-yellow
          #:label "GNU operating system"
@@ -55,17 +55,20 @@
 
        (li
        (b "Dependable.")
-       " It comes with the "
+        " Guix "
        ,(link-yellow
-         #:label "GNU Guix package manager"
+         #:label "supports"
          #: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, "
+        " transactional upgrades and roll-backs, unprivileged
+        package management, "
        ,(link-yellow
          #:label "and more"
          #:url (manual-url "Features.html"))
-       ".")
+       ".  When used as a standalone distribution, Guix supports "
+        ,(link-yellow
+          #:label "declarative system configuration"
+          #:url (manual-url "Using-the-Configuration-System.html"))
+        " for transparent and reproducible operating systems.")
 
        (li
        (b "Hackable.")
@@ -96,14 +99,14 @@
         #:url (guix-url "contribute/")
         #:light #true)))
 
-     ;; Discover GuixSD.
+     ;; Discover Guix.
      (section
       (@ (class "discovery-box"))
-      (h2 "Discover GuixSD")
+      (h2 "Discover Guix")
 
       (p
        (@ (class "limit-width centered-block"))
-       "GuixSD comes with thousands of packages which include
+       "Guix comes with thousands of packages which include
        applications, system tools, documentation, fonts, and other
        digital goods readily available for installing with the "
        ,(link-yellow #:label "GNU Guix" #:url "#guix-in-other-distros")
@@ -122,13 +125,13 @@
 
       ,(horizontal-separator #:light #true)
 
-      ;; GuixSD in different fields.
-      (h3 "GuixSD and GNU Guix in your field")
+      ;; Guix in different fields.
+      (h3 "GNU Guix in your field")
 
       (p
        (@ (class "limit-width centered-block"))
-       "Read some stories about how people are using GuixSD and GNU
-       Guix in their daily lives.")
+       "Read some stories about how people are using GNU Guix in their daily
+       lives.")
 
       (div
        (@ (class "fields-box"))
@@ -183,19 +186,13 @@
       (div
        (@ (class "info-box justify-left"))
        (p
-       "If you don't use the "
-       ,(link-yellow
-         #:label "Guix System Distribution"
-         #:url (guix-url))
-       " for a particular reason, you still can use the "
-       ,(link-yellow
-         #:label "GNU Guix"
-         #:url (guix-url))
-       " package manager on top of any GNU/Linux distribution. This
+       "If you don't use GNU Guix as a standalone GNU/Linux distribution,
+        you still can use it as a
+       package manager on top of any GNU/Linux distribution. This
         way, you can benefit from all its conveniences.")
 
        (p
-       "GNU Guix won't interfere with the package manager that comes
+       "Guix won't interfere with the package manager that comes
         with your distribution. They can live together."))
 
       (div
diff --git a/website/apps/download/data.scm b/website/apps/download/data.scm
index 25249ba..e13732c 100644
--- a/website/apps/download/data.scm
+++ b/website/apps/download/data.scm
@@ -16,20 +16,20 @@
 (define system-downloads
   (list
    (download
-    #:title (string-append "GuixSD " (latest-guix-version))
+    #:title (string-append "GNU Guix System " (latest-guix-version))
     #:description
     `(div
       (div
        (@ (class "message-box msg-info"))
        (span (@ (class "msg-label")) "Note ")
-       "The Guix System Distribution (GuixSD) is beta software, "
+       "The Guix System distribution is beta software, "
        "which means it is "
        (a
        (@ (href ,(manual-url "Limitations.html")))
        "not production-ready")
        ".  But you can "
        (a (@ (href ,(guix-url "contribute"))) "help") "!")
-      (p "USB/DVD ISO installer of the Guix System Distribution."))
+      (p "USB/DVD ISO installer of the standalone Guix System."))
     #:image (guix-url "static/base/img/GuixSD-package.png")
     #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guixsd-install-";
                              (latest-guix-version) ".")
@@ -38,7 +38,7 @@
     #:manual (manual-url "System-Installation.html"))
 
    (download
-    #:title (string-append "GuixSD " (latest-guix-version) " QEMU Image")
+    #:title (string-append "GNU Guix " (latest-guix-version) " QEMU Image")
     #:description
     `(div
       (p "QCOW2 virtual machine (VM) image."))
@@ -49,11 +49,11 @@
     #:manual (manual-url "Running-GuixSD-in-a-VM.html"))
 
    (download
-    #:title (string-append "GNU Guix " (latest-guix-version) " Binary")
+    #:title (string-append "GNU Guix " (latest-guix-version) " Binary")
     #:description
     '(p
-      "Self-contained tarball providing binaries for Guix and for
-       all its dependencies.")
+      "Self-contained tarball providing binaries for Guix and its
+      dependencies, to be installed on top of your Linux-based system.")
     #:image (guix-url "static/base/img/Guix-package.png")
     #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guix-binary-";
                              (latest-guix-version) ".")
@@ -64,7 +64,7 @@
     #:manual (manual-url "Binary-Installation.html"))
 
    (download
-    #:title (string-append "GNU Guix " (latest-guix-version) " Source")
+    #:title (string-append "GNU Guix " (latest-guix-version) " Source")
     #:description '(p "Source code distribution.")
     #:image (guix-url "static/base/img/src-package.png")
     #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guix-";
diff --git a/website/apps/download/templates/download.scm 
b/website/apps/download/templates/download.scm
index aebfebd..af7e4ff 100644
--- a/website/apps/download/templates/download.scm
+++ b/website/apps/download/templates/download.scm
@@ -52,15 +52,15 @@
       (p
        (@ (class "centered-block limit-width"))
        "As of version " ,(latest-guix-version)
-       ", the Guix System Distribution "
+       ", the standalone Guix System "
        (a
        (@ (href ,(manual-url "System-Installation.html")))
        "can be installed")
-       " on an i686 or x86_64 machine. It uses the "
+       " on an i686, x86_64, ARMv7, or AArch64 machine.  It uses the "
        (a (@ (href ,(gnu-url "software/linux-libre"))) "Linux-Libre")
        " kernel and the "
        (a (@ (href ,(gnu-url "software/shepherd"))) "GNU Shepherd")
-       " init system. Alternately, its package manager, GNU Guix,
+       " init system. Alternately, GNU Guix
        can be installed as an additional package manager on top of an
        installed Linux-based system.")
 
@@ -70,7 +70,7 @@
 
       (p
        (@ (class "centered-block limit-width"))
-       "Source code and binaries for the Guix System Distribution ISO
+       "Source code and binaries for the Guix System distribution ISO
        image as well as GNU Guix can be found on the GNU servers at "
        (a (@ (href "https://alpha.gnu.org/gnu/guix/";))
          "https://alpha.gnu.org/gnu/guix/";) ".")))))
diff --git a/website/static/base/css/navbar.css 
b/website/static/base/css/navbar.css
index 761c923..d699d89 100644
--- a/website/static/base/css/navbar.css
+++ b/website/static/base/css/navbar.css
@@ -22,7 +22,7 @@
 
 .branding:link,
 .branding:visited {
-    background-image: url("../img/GuixSD-logo.png");
+    background-image: url("../img/Guix-logo.png");
     background-position: bottom;
     background-repeat: no-repeat;
     border-style: none;
@@ -226,4 +226,4 @@
     .menu-btn:link {
        display: none;
     }
-}
\ No newline at end of file
+}
diff --git a/website/static/base/img/Guix-logo.png 
b/website/static/base/img/Guix-logo.png
new file mode 100644
index 0000000..49f39a2
Binary files /dev/null and b/website/static/base/img/Guix-logo.png differ