guix
/
guix-artwork
mirror of git://git.savannah.gnu.org/guix/guix-artwork.git
2
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-03-05 22:37:04 +01:00
parent 7bf974a74d
commit da771aafa5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
20 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
website/apps/base/templates/about.scm
View File

@ -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")

4
website/apps/base/templates/contribute.scm
View File

@ -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"))

4
website/apps/base/templates/graphics.scm
View File

@ -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"

7
website/apps/base/templates/help.scm
View File

@ -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 "

6
website/apps/base/templates/irc.scm
View File

@ -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"))

4
website/apps/base/templates/security.scm
View File

@ -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)
". "

8
website/apps/base/templates/theme.scm
View File

@ -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"))))

2
website/apps/base/types.scm
View File

@ -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.

4
website/apps/blog/builder.scm
View File

@ -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"

2
website/apps/blog/templates/feed.scm
View File

@ -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)))

2
website/apps/blog/templates/post-list.scm
View File

@ -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"

2
website/apps/blog/templates/post.scm
View File

@ -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

2
website/apps/blog/templates/tag.scm
View File

@ -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"

3
website/apps/download/templates/download.scm
View File

@ -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"

2
website/apps/download/types.scm
View File

@ -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:

4
website/apps/packages/templates/detailed-index.scm
View File

@ -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"

4
website/apps/packages/templates/detailed-package-list.scm
View File

@ -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"

4
website/apps/packages/templates/index.scm
View File

@ -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"

4
website/apps/packages/templates/package-list.scm
View File

@ -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"

2
website/haunt.scm
View File

@ -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")