[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: website: Assorted tweaks.
|
From: |
Ludovic Courtès |
|
Subject: |
01/04: website: Assorted tweaks. |
|
Date: |
Wed, 13 May 2015 12:01:50 +0000 |
civodul pushed a commit to branch master
in repository guix-artwork.
commit bc321f26858eda13bfdb6a961a4bd459cb53b691
Author: Ludovic Courtès <address@hidden>
Date: Wed May 13 13:45:34 2015 +0200
website: Assorted tweaks.
* website/www.scm (main-page): Remove extra capital letters.
Remove gnu-linux-libre from here. Use about#contact for the list of
mailing lists.
* website/www/about.scm (about-page): Tweak wording.
* website/www/contribute.scm (contribute-page): Tweak Savannah box. Use
more appropriate URL for the TP.
* website/www/help.scm (help-page): Use about#contact for the mailing
lists.
---
website/www.scm | 16 +++++-----------
website/www/about.scm | 18 ++++++++++--------
website/www/contribute.scm | 10 +++++-----
website/www/help.scm | 2 +-
4 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/website/www.scm b/website/www.scm
index 50bb4a2..e4e145f 100644
--- a/website/www.scm
+++ b/website/www.scm
@@ -135,7 +135,7 @@ character."
(a (@ (href ,(guix-url "manual"))
(class "hlink-yellow"))
"GNU Guix")
- " Package Manager, in addition to standard
+ " package manager, in addition to standard
package management features, supports transactional upgrades and roll-backs,
unprivileged package management, per-user profiles, and garbage collection.")
(li (b "Hackable.")
@@ -251,6 +251,7 @@ check whether the bug is already in the "
(a (@ (href "mailto:address@hidden";)
(class "button btn-red"))
"Report")))
+
(div (@ (class "info-box text-left"))
(h3 "Mailing Lists")
(p (a (@ (href
"https://lists.gnu.org/mailman/listinfo/guix-devel";))
@@ -273,22 +274,15 @@ the Guix System Distribution (GuixSD).")
Distribution.")
(p (a (@ (href
"https://lists.gnu.org/mailman/listinfo/gnu-system-discuss";))
(b "gnu-system-discuss"))
- (small " ( "
+ (small " ("
(a (@ (href
"http://lists.gnu.org/archive/html/gnu-system-discuss/";))
"archive")
")")
(br)
"Discussion about the development of
the broader GNU system.")
- (p (a (@ (href
"https://lists.nongnu.org/mailman/listinfo/gnu-linux-libre";))
- (b "gnu-linux-libre"))
- (small " ("
- (a (@ (href
"http://lists.nongnu.org/archive/html/gnu-linux-libre/";))
- "archive")
- ")")
- (br)
- "Workgroup for fully free GNU/Linux distributions.")
- (p (a (@ (href
"https://savannah.gnu.org/mail/?group=guix";)
+
+ (p (a (@ (href (base-url "about#contact"))
(class "hlink-more-dark"))
"Find all the available lists")))))
,(html-page-footer))))
diff --git a/website/www/about.scm b/website/www/about.scm
index f6b7cc7..ed5a2c4 100644
--- a/website/www/about.scm
+++ b/website/www/about.scm
@@ -17,11 +17,11 @@
" and the "
(em "GNU Guix")
" package manager are free software projects developed by
-the "
+volunteers around the work under the umbrella of the "
(a (@ (href ,(gnu-url "")))
- "GNU Project")
- " and independent volunteers from various parts of the
-world. This is the official website for both projects. ")
+ "GNU Project") ". "
+ " This is the official web site for both projects. ")
+
(blockquote
(p (strong
"Free software means the users have the freedom to run,
@@ -43,13 +43,14 @@ this.")
your neighbor (freedom 2).")
(li "The freedom to improve the program, and release your
improvements to the public, so that the whole community benefits (freedom
-3). Access to the source code is a precondition for this."))
- (p "\xa0gnu.org"))
+3). Access to the source code is a precondition for this.")))
+
(h2 (@ (id "mantainer")) "Maintainer")
(p "Guix is currently being maintained by Ludovic
Courtès. Please use the "
(a (@ (href "#contact")) "mailing lists")
" for contact. ")
+
(h2 (@ (id "license")) "Licensing")
(p "Guix is free software; you can redistribute it and/or modify
it under the terms of the "
@@ -57,6 +58,7 @@ it under the terms of the "
"GNU General Public License")
" as published by the Free Software Foundation; either
version\xa03 of the License, or (at your option) any later version. ")
+
(h2 (@ (id "contact")) "Contact")
(p (a (@ (href
"https://lists.gnu.org/mailman/listinfo/guix-devel";))
(b "guix-devel"))
@@ -85,8 +87,7 @@ System Distribution (GuixSD). "
"archive")
") ")
(br)
- "Discussion about the development of the broader GNU
-system.")
+ "Discussion about the development of the broader GNU
system.")
(p (a (@ (href
"https://lists.nongnu.org/mailman/listinfo/gnu-linux-libre";))
(b "gnu-linux-libre"))
(small " ("
@@ -125,4 +126,5 @@ urgent issue, you can escalate to the general "
(a (@ (href "https://gnunet.org/bot/log/guix/";))
"logs")
").")))))
+
,(html-page-footer))))
diff --git a/website/www/contribute.scm b/website/www/contribute.scm
index 970e74a..42db215 100644
--- a/website/www/contribute.scm
+++ b/website/www/contribute.scm
@@ -25,18 +25,18 @@ will do our best to guide you. ")
(div (@ (class "text-center"))
(div (@ (class "summary-box"))
(h2 (@ (id "pms"))
- "Project Management System")
+ "Project Management")
(p "We use "
(a (@ (href "https://savannah.gnu.org/";))
"Savannah")
" as the central point for development,
maintenance and distribution of the Guix System Distribution and GNU Guix.")
(p "The source files for all the components of the
-project, including software, webiste, documentation, and artwork, are available
-in various repositories in Savannah. ")
+project, including software, web site, documentation, and artwork, are
available
+in repositories at Savannah. ")
(a (@ (href "https://savannah.gnu.org/projects/guix";)
(class "hlink-more-dark"))
- "Get the source"))
+ "Access Savannah"))
(div (@ (class "summary-box"))
(h2 (@ (id "art")) "Art")
(p "We are always looking for artists to help us
@@ -138,7 +138,7 @@ reports. ")
(p "You can help us translate software and
documentation to your language. The main components of the Guix System
Distribution, including the Guix package manager, can be translated in the "
- (a (@ (href "https://translationproject.org/";))
+ (a (@ (href
"https://translationproject.org/html/translators.html";))
"Translation Project")
".")
(p "Other "
diff --git a/website/www/help.scm b/website/www/help.scm
index dc83849..aa31071 100644
--- a/website/www/help.scm
+++ b/website/www/help.scm
@@ -94,7 +94,7 @@ the Guix System Distribution (GuixSD).")
(br)
"Bug reports for GNU Guix and the Guix System
Distribution. ")
- (a (@ (href
"https://savannah.gnu.org/mail/?group=guix";)
+ (a (@ (href ,(base-url "about#contact"))
(class "hlink-more-dark"))
"Check all the lists")))
(h2 "Additional Documentation")