From patchwork Sat Dec 18 10:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 35373 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2E9DD27BBEA; Sat, 18 Dec 2021 10:41:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 938A627BBE9 for ; Sat, 18 Dec 2021 10:41:16 +0000 (GMT) Received: from localhost ([::1]:48248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myX9P-0001iS-Nd for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 05:41:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myX9D-0001gB-PY for guix-patches@gnu.org; Sat, 18 Dec 2021 05:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myX9D-0005ZU-H1 for guix-patches@gnu.org; Sat, 18 Dec 2021 05:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myX9B-0004up-W0; Sat, 18 Dec 2021 05:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52596] [guix-artwork PATCH] website: Relabel stable/latest to release/current. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 10:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52596 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52596@debbugs.gnu.org Cc: zimoun , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.163982405118869 (code B ref -1); Sat, 18 Dec 2021 10:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 10:40:51 +0000 Received: from localhost ([127.0.0.1]:41317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myX91-0004uF-9j for submit@debbugs.gnu.org; Sat, 18 Dec 2021 05:40:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:49470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myX8y-0004u7-PS for submit@debbugs.gnu.org; Sat, 18 Dec 2021 05:40:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myX8y-0001Pf-J6 for guix-patches@gnu.org; Sat, 18 Dec 2021 05:40:48 -0500 Received: from [2a00:1450:4864:20::32c] (port=35598 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myX8w-0005WZ-Eq for guix-patches@gnu.org; Sat, 18 Dec 2021 05:40:48 -0500 Received: by mail-wm1-x32c.google.com with SMTP id bg2-20020a05600c3c8200b0034565c2be15so5782771wmb.0 for ; Sat, 18 Dec 2021 02:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CfkghPW0AKn46dpExY5fGCMfWKcCyKFplk/PeSe2dvs=; b=XAEuRtWWNjPeoQ08tRKCp6lT+NRL9Xfbgk1PkM5ua20iCTgRMOKsZ00+NK8c6vCk5B Fe2oP92xa6WOx01oikFXIKowfZTLKbjUwCWarwx6/VMqyIe/s/2F/maW97+avFF+OHwM Ln5zysWyHxB+8h6Dm3Ubbme4N0f0dbgj4IT/QuILRhg3LqGtExTfeXNKQ3QV7ngD+BqL WQt5dpHriRGioMCCZ38sotjdux63Hp1s22Fr6a5T0yzKPi3S6n1G7Y+cQaWQOzb7i3UO f/H5waMFwyUor17hv34jZWZhTCfxt/moOhxzsY7PBDW9k8ZXwbe8Bce4vw70cg7PX8AJ ky9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CfkghPW0AKn46dpExY5fGCMfWKcCyKFplk/PeSe2dvs=; b=tq9I+ZCTkmFYuSF1jXflVYWC7mzzSHeRaX56nh5T/iHDU6o+PrcBf+OA8HopaN8a0W duqrEIm9MkvLqD6uS5kWmIAq1zLsXApz5aGqOuGxR6u76t1n8axRScXMgt+a/1wG/jKs 4HTnJZWTauv7QbRo4cPUqVDAxxv9FHEltUYcfxG8PdsUx7y0WoUMspjw4mrVuN6sm3FP xM86bX7n2ecCmoaZNZMODgC3OsxzBdMw8FjsuSln79xW45UWKJxTZKLTaKUU8N0nIYB+ PCZVTz1cWluQNP/c8sPc7mHmZfWoR52irnrQFeXQwN2g9rE3LJRFvLyqfhBSaY2GYUbQ B87A== X-Gm-Message-State: AOAM531j2ehXzUhTRUUfdlDQXpPDVCLYAMFaJCAPf4Q7Ijh7bcJAdSs0 15intiUIP160TdSTcgdZbD8Ab1bXn0k= X-Google-Smtp-Source: ABdhPJzBOjMLEXLI4qbCYdNYjgravnfO9KDbRLlEMFlRXs6o/mzAjKAARMnmKZf6B17SmA8wavqA0g== X-Received: by 2002:a7b:c207:: with SMTP id x7mr13098385wmi.108.1639824044719; Sat, 18 Dec 2021 02:40:44 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id az15sm5381166wmb.47.2021.12.18.02.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 02:40:44 -0800 (PST) From: zimoun Date: Sat, 18 Dec 2021 11:40:38 +0100 Message-Id: <20211218104038.306475-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * website/apps/base/templates/components.scm (navbar): Relabel. * website/apps/base/templates/help.scm (help-t): Relabel. * website/apps/download/templates/download-latest.scm (download-latest-t): Relabel. --- Hi, This discussion [1] points that the current label stable/latest for: - things related to release - things related to current master is confusing. Mainly because 'stable' has other meaning in other distro. Moreover, 'latest' does not imply less stable or buggy than 'stable' itself. Instead, the label 'release/current' appears to be more accurate for a rolling-release. WDYT? 1: Cheers, simon website/apps/base/templates/components.scm | 8 ++++---- website/apps/base/templates/help.scm | 7 +++---- website/apps/download/templates/download-latest.scm | 13 +++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) base-commit: ceaad7ee0c237fc5cd58a542247e9eaaea68e2bf diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm index e2a74d3..4488549 100644 --- a/website/apps/base/templates/components.scm +++ b/website/apps/base/templates/components.scm @@ -399,11 +399,11 @@ manual. #:items (list (C_ "website menu" - (menu-item #:label "Stable" + (menu-item #:label "Release" #:active-item active-item #:url (guix-url "download/"))) (C_ "website menu" - (menu-item #:label "Latest" + (menu-item #:label "Current" #:active-item active-item #:url (guix-url "download/latest/"))))) @@ -417,11 +417,11 @@ manual. #:active-item active-item #:url (guix-url "help/"))) (C_ "website menu" - (menu-item #:label "GNU Guix Manual (stable)" + (menu-item #:label "GNU Guix Manual (release)" #:active-item active-item #:url (guix-url "manual/"))) (C_ "website menu" - (menu-item #:label "GNU Guix Manual (latest)" + (menu-item #:label "GNU Guix Manual (current)" #:active-item active-item #:url (guix-url "manual/devel/"))) (C_ "website menu" diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm index 3d54ae1..fb25bd5 100644 --- a/website/apps/base/templates/help.scm +++ b/website/apps/base/templates/help.scm @@ -51,7 +51,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) online. You may also find more information about Guix by running " ,(G_ `(code "info guix")) ".")) (p - ,(link-more #:label (G_ "Read stable manual") + ,(link-more #:label `(G_ "Read manual " ,(latest-guix-version) "") #:url (guix-url "manual/en" #:localize #f))) (p (a (@ (href ,(guix-url "manual/de" #:localize #f))) "Deutsch") " | " @@ -71,13 +71,12 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (img (@ (src ,(guix-url "static/base/img/manual-latest-icon.png")) (alt ""))) - ,(G_ `(h3 "GNU Guix Manual (Latest)")) + ,(G_ `(h3 "GNU Guix Manual (Current)")) ,(G_ `(p "This version of the manual is updated frequently to include the latest changes from Guix's source files. It is - more up-to-date than the manual for the stable release of - Guix.")) + more up-to-date than the manual for the release of Guix.")) (p ,(link-more #:label (G_ "Read latest manual") #:url (guix-url "manual/devel/" #:localize #f)))) diff --git a/website/apps/download/templates/download-latest.scm b/website/apps/download/templates/download-latest.scm index 17eaadf..3d328aa 100644 --- a/website/apps/download/templates/download-latest.scm +++ b/website/apps/download/templates/download-latest.scm @@ -143,10 +143,10 @@ (define (download-latest-t) "Return the Download latest page in SHTML." (theme - #:title (C_ "webpage title" '("Download latest")) + #:title (C_ "webpage title" '("Download current")) #:description - (G_ "Download latest GNU Guix System images built by the Cuirass continuous -integration system.") + (G_ "Download latest development GNU Guix System images built +by the Cuirass continuous integration system.") #:keywords (string-split ;TRANSLATORS: |-separated list of webpage keywords (G_ "GNU|Linux|Unix|Free software|Libre software|Operating \ @@ -158,12 +158,12 @@ Package manager") #\|) (guix-url "static/base/css/download.css")) #:crumbs (list (crumb (C_ "website menu" "Download") (guix-url "download/")) - (crumb (C_ "website menu" "Latest") "./")) + (crumb (C_ "website menu" "Current") "./")) #:content `(main (section (@ (class "page")) - ,(G_ `(h2 "Download latest images")) + ,(G_ `(h2 "Download latest developement images")) ;; TRANSLATORS: Continuous Integration is a section name ;; in the English (en) manual. ,(G_ @@ -175,7 +175,8 @@ Package manager") #\|) " continuous integration system at " (a (@ (href ,ci-url)) "ci.guix.gnu.org") ". These images are " ,(G_ `(b "development snapshots")) - ", you might prefer to use stable images that can be found " + ", you might prefer to use well-tested released images +that can be found " ,(G_ `(a (@ (href ,(guix-url "download/"))) "here.")))) (div (@ (class "centered-block limit-width"))