From patchwork Sun Feb 10 14:59:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 1013 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 9AF1B16BF3; Sun, 10 Feb 2019 15:11:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2913316BEE for ; Sun, 10 Feb 2019 15:11:43 +0000 (GMT) Received: from localhost ([127.0.0.1]:60471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsqli-0004dm-CS for patchwork@mira.cbaines.net; Sun, 10 Feb 2019 10:11:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsqbP-0005Ss-KK for guix-patches@gnu.org; Sun, 10 Feb 2019 10:01:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsqbO-0007qc-CS for guix-patches@gnu.org; Sun, 10 Feb 2019 10:01:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsqbO-0007qN-8F for guix-patches@gnu.org; Sun, 10 Feb 2019 10:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gsqbN-0003BL-Tw for guix-patches@gnu.org; Sun, 10 Feb 2019 10:01:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34414] [PATCH] gnu: Fix some typos in the installer. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Feb 2019 15:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34414@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154981081012130 (code B ref -1); Sun, 10 Feb 2019 15:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Feb 2019 15:00:10 +0000 Received: from localhost ([127.0.0.1]:42685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsqaY-00039a-3W for submit@debbugs.gnu.org; Sun, 10 Feb 2019 10:00:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsqaT-00037c-5T for submit@debbugs.gnu.org; Sun, 10 Feb 2019 10:00:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:55680) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gsqaN-0007A4-Ux for submit@debbugs.gnu.org; Sun, 10 Feb 2019 09:59:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsqaM-0004ep-IC for guix-patches@gnu.org; Sun, 10 Feb 2019 09:59:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsqaL-00078L-Bb for guix-patches@gnu.org; Sun, 10 Feb 2019 09:59:58 -0500 Received: from tobias.gr ([2001:470:7405::1]:45130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gsqaK-00074T-O6 for guix-patches@gnu.org; Sun, 10 Feb 2019 09:59:57 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 969eedad for ; Sun, 10 Feb 2019 14:59:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=2018; i=me@tobias.gr; bh=GoKS52kLP SVhRW4P4NbEin2jGH3+AmiH0a1ouX9gCTw=; b=DXICHBsHOsDgApDpiZ+RycDxf tqrU3aVa/n3f1O7XAHkKhzVeh6q/jdtGQaRBWy8FvJnmEMJRBaUdHOH248g5pEiJ C9KzSPeiWBhIxvKKxcMMwGRu8ywLCDTvwWHzr7QVvORV0/WWtOSpjlal4kVrSCDY j3aY8eJUxQigHmXxcpu6xI4oJChbKI46Y51bHJerDhgDAB/KYv163JBprjaxCWBO zkkG+EYdh9wjm5oe9m+i4b3YdoZPTaozZ976CHiid+F1cG60T2m7lFHbFNBnbsVi 82STe3iNfPYWc66PveuTlU39ffhVef99MJaQj77hq7MnHoU+uWoA+zeekLVIg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a6850c35 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 10 Feb 2019 14:59:43 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 15:59:32 +0100 Message-Id: <20190210145932.20075-1-me@tobias.gr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * gnu/installer/connman.scm (connman-connect-with-auth): Fix typo in docstring. * gnu/installer/newt/keymap.scm (sort-variants): Likewise. * gnu/installer/newt/page.scm (run-listbox-selection-page): Likewise. * gnu/installer/parted.scm (mkpart): Likewise. * gnu/installer/newt/utils.scm (destroy-form-and-pop): Likewise. * gnu/installer/newt/timezone.scm (timezone-listbox-heigth): Rename to… (timezone-listbox-height): …this. * gnu/installer/newt/wifi.scm (run-unknown-error-page): Fix typo. (wifi-listbox-heigth): Rename to… (wifi-listbox-height): …this, and adjust caller. --- Hullo, Some minor typo fixes, mainly in docstrings, one user-visible. TIMEZONE-LISTBOX-HEIGTH appears unused, so perhaps it can just go? Kind regards, T G-R gnu/installer/connman.scm | 2 +- gnu/installer/newt/keymap.scm | 2 +- gnu/installer/newt/page.scm | 2 +- gnu/installer/newt/timezone.scm | 4 ++-- gnu/installer/newt/utils.scm | 2 +- gnu/installer/newt/wifi.scm | 8 ++++---- gnu/installer/parted.scm | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/installer/connman.scm b/gnu/installer/connman.scm index 740df7424a..ef8cca3952 100644 --- a/gnu/installer/connman.scm +++ b/gnu/installer/connman.scm @@ -299,7 +299,7 @@ to merge stdout and stderr using bash redirection. Then error messages are extracted from connmanctl output using a regexp. This makes the whole procedure even more unreliable. -Raise &connman-connection-error if an error occured during connection. Raise +Raise &connman-connection-error if an error occurred during connection. Raise &connman-password-error if the given password is incorrect." (define connman-error-regexp (make-regexp "Error[ ]*([^\n]+)\n")) diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm index 6211af2bc5..3e765bfdd4 100644 --- a/gnu/installer/newt/keymap.scm +++ b/gnu/installer/newt/keymap.scm @@ -71,7 +71,7 @@ (cut append <> <>))) (define (sort-variants variants) - "Sort VARIANTS list by putting the internation variant ahead and return it." + "Sort VARIANTS list by putting the international variant ahead and return it." (call-with-values (lambda () (partition diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index edf0b8c999..23fbfcce76 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -188,7 +188,7 @@ If SORT-LISTBOX-ITEMS? is set to #t, the listbox items are sorted using 'string<=' procedure (after being converted to text). If ALLOW-DELETE? is #t, the form will return if the key is pressed, -otherwise nothing will happend. +otherwise nothing will happen. Each time the listbox current item changes, call SKIP-ITEM-PROCEDURE? with the current listbox item as argument. If it returns #t, skip the element and jump diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm index 6c96ee55b1..80583f638b 100644 --- a/gnu/installer/newt/timezone.scm +++ b/gnu/installer/newt/timezone.scm @@ -30,8 +30,8 @@ #:use-module (newt) #:export (run-timezone-page)) -;; Heigth of the listbox displaying timezones. -(define timezone-listbox-heigth (make-parameter 20)) +;; Height of the listbox displaying timezones. +(define timezone-listbox-height (make-parameter 20)) ;; Information textbox width. (define info-textbox-width (make-parameter 40)) diff --git a/gnu/installer/newt/utils.scm b/gnu/installer/newt/utils.scm index 1c2ce4e628..dfb113e0c6 100644 --- a/gnu/installer/newt/utils.scm +++ b/gnu/installer/newt/utils.scm @@ -30,7 +30,7 @@ (define screen-rows (make-parameter 0)) (define (destroy-form-and-pop form) - "Destory the given FORM and pop the current window." + "Destroy the given FORM and pop the current window." (destroy-form form) (pop-window)) diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 59e40e327e..4cf5c128e7 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -100,7 +100,7 @@ nmc_wifi_strength_bars." "Run a page to inform user that a connection error happened." (run-error-page (format #f - (G_ "An error occured while trying to connect to ~a, please retry.") + (G_ "An error occurred while trying to connect to ~a, please retry.") service-name) (G_ "Connection error"))) @@ -160,8 +160,8 @@ of records present in LISTBOX." ;; Maximum length of a wifi service name. (define service-name-max-length (make-parameter 20)) -;; Heigth of the listbox displaying wifi services. -(define wifi-listbox-heigth (make-parameter 20)) +;; Height of the listbox displaying wifi services. +(define wifi-listbox-height (make-parameter 20)) ;; Information textbox width. (define info-textbox-width (make-parameter 40)) @@ -188,7 +188,7 @@ network when the corresponding listbox entry is selected. A button allow to force a wifi scan." (let* ((listbox (make-listbox -1 -1 - (wifi-listbox-heigth) + (wifi-listbox-height) (logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT))) (form (make-form)) (buttons-grid (make-grid 1 1)) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 187311e633..020f77086f 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -677,7 +677,7 @@ otherwise." (define* (mkpart disk user-partition #:key (previous-partition #f)) "Create the given USER-PARTITION on DISK. The PREVIOUS-PARTITION argument as -to be set to the partition preceeding USER-PARTITION if any." +to be set to the partition preceding USER-PARTITION if any." (define (parse-start-end start end) "Parse start and end strings as positions on DEVICE expressed with a unit, @@ -735,7 +735,7 @@ cause them to cross." (+ start-sector start-offset) start-sector))) ;; This is a hackery but parted almost always fails to create optimally - ;; aligned partitions (unless specifiying percentages) because, the + ;; aligned partitions (unless specifying percentages) because, the ;; default range of 1MB centered on the start sector is not enough when ;; the optimal alignment is 2048 sectors of 512KB. (extend-ranges! start-range end-range #:offset start-offset)