[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: build: Fix docstring typos.
From: |
guix-commits |
Subject: |
01/04: build: Fix docstring typos. |
Date: |
Fri, 16 Oct 2020 09:27:11 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 7dff32986228fb515dbda483aaee18de93489e2a
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Sep 20 21:24:45 2020 +0200
build: Fix docstring typos.
* gnu/build/image.scm (estimate-partition-size): Fix typo in docstring.
* guix/build/copy-build-system.scm (install): Likewise.
* guix/build/lisp-utils.scm (generate-executable): Likewise.
* guix/build/maven/pom.scm (find-parent, fix-pom-dependencies): Likewise.
* guix/build-system/cargo.scm (expand-crate-sources): Likewise.
---
gnu/build/image.scm | 2 +-
guix/build-system/cargo.scm | 2 +-
guix/build/copy-build-system.scm | 2 +-
guix/build/lisp-utils.scm | 2 +-
guix/build/maven/pom.scm | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index d8efa73..b6bf259 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -60,7 +60,7 @@
(inexact->exact (ceiling (/ size 1024)))))
(define (estimate-partition-size root)
- "Given the ROOT directory, evalute and return its size. As this doesn't
+ "Given the ROOT directory, evaluate and return its size. As this doesn't
take the partition metadata size into account, take a 25% margin."
(* 1.25 (file-size root)))
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 6c8edf6..ed69746 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -217,7 +217,7 @@ any dependent crates. This can be a benefits:
- It avoids waiting for quadratic builds from source: cargo always builds
dependencies within the current workspace. This is largely due to Rust not
having a stable ABI and other resolutions that cargo applies. This means that
- if we have a depencency chain of X -> Y -> Z and we build each definition
+ if we have a dependency chain of X -> Y -> Z and we build each definition
independently the following will happen:
* Cargo will build and test crate Z
* Cargo will build crate Z in Y's workspace, then build and test Y
diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm
index a86f0cd..ac4a62a 100644
--- a/guix/build/copy-build-system.scm
+++ b/guix/build/copy-build-system.scm
@@ -58,7 +58,7 @@ In the above, FILTERS are optional.
one of the elements in the list.
- With `#:include-regexp`, install subpaths matching the regexps in the
list.
- The `#:exclude*` FILTERS work similarly. Without `#:include*` flags,
- install every subpath but the files matching the `#:exlude*` filters.
+ install every subpath but the files matching the `#:exclude*` filters.
If both `#:include*` and `#:exclude*` are specified, the exclusion is
done
on the inclusion list.
diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm
index f6d9168..88605bd 100644
--- a/guix/build/lisp-utils.scm
+++ b/guix/build/lisp-utils.scm
@@ -407,7 +407,7 @@ DEPENDENCY-PREFIXES to ensure references to those libraries
are retained."
type
compress?
#:allow-other-keys)
- "Generate an executable by using asdf operation TYPE, containing whithin the
+ "Generate an executable by using asdf operation TYPE, containing within the
image all DEPENDENCIES, and running ENTRY-PROGRAM in the case of an
executable. Link in any asd files from DEPENDENCY-PREFIXES to ensure
references to those libraries are retained."
diff --git a/guix/build/maven/pom.scm b/guix/build/maven/pom.scm
index aa60af2..dd61f65 100644
--- a/guix/build/maven/pom.scm
+++ b/guix/build/maven/pom.scm
@@ -59,7 +59,7 @@ represents a @file{.pom} file content, or parts of it."
(pom-ref content "parent"))
(define* (find-parent content inputs #:optional local-packages)
- "Find the parent pom for the pom file whith @var{content} in a package's
+ "Find the parent pom for the pom file with @var{content} in a package's
@var{inputs}. When the parent pom cannot be found in @var{inputs}, but
@var{local-packages} is defined, the parent pom is looked up in it.
@@ -243,17 +243,17 @@ to re-declare the namespaces in the top-level element."
(define* (fix-pom-dependencies pom-file inputs
#:key with-plugins? with-build-dependencies?
(excludes '()) (local-packages '()))
- "Open @var{pom-file}, and override its content, rewritting its dependencies
+ "Open @var{pom-file}, and override its content, rewriting its dependencies
to set their version to the latest version available in the @var{inputs}.
-@var{#:with-plugins?} controls whether plugins are also overiden.
+@var{#:with-plugins?} controls whether plugins are also overridden.
@var{#:with-build-dependencies?} controls whether build dependencies (whose
-scope is not empty) are also overiden. By default build dependencies and
-plugins are not overiden.
+scope is not empty) are also overridden. By default build dependencies and
+plugins are not overridden.
@var{#:excludes} is an association list of groupID to a list of artifactIDs.
When a pair (groupID, artifactID) is present in the list, its entry is
-removed instead of being overiden. If the entry is ignored because of the
+removed instead of being overridden. If the entry is ignored because of the
previous arguments, the entry is not removed.
@var{#:local-packages} is an association list that contains additional version
@@ -262,7 +262,7 @@ not found in @var{inputs}, information from this list is
used instead to determi
the latest version of the package. This is an association list of group IDs
to another association list of artifact IDs to a version number.
-Returns nothing, but overides the @var{pom-file} as a side-effect."
+Returns nothing, but overrides the @var{pom-file} as a side-effect."
(define pom (get-pom pom-file))
(define (ls dir)