aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index b01aa961c1..2c9cba21a1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -160,7 +160,7 @@ packages. It operates on those per-user profiles, and can be used
The command provides the obvious install, remove, and upgrade
operations. Each invocation is actually a @emph{transaction}: either
-the specified operations succeed, or nothing happens. Thus, if the
+the specified operation succeeds, or nothing happens. Thus, if the
@command{guix-package} processed is terminated during the transaction,
or if a power outage occurs during the transaction, then the user's
profile remains in its previous state, and remains usable.
@@ -192,7 +192,7 @@ builds the package from source, locally.
@node Invoking guix-package
@section Invoking @command{guix-package}
-The @command{guix-package} command it the tool that allows users to
+The @command{guix-package} command is the tool that allows users to
install, upgrade, and remove packages, as well as rolling back to
previous configurations. It operates only on the user's own profile,
and works with normal user privileges (@pxref{Features}). Its syntax
@@ -202,7 +202,7 @@ is:
guix-package @var{options}
@end example
-Primarily, @var{options} specify the operations to be performed during
+Primarily, @var{options} specifies the operations to be performed during
the transaction. Upon completion, a new profile is created, but
previous generations of the profile remain available, should the user
want to roll back.
@@ -223,8 +223,8 @@ colon, followed by the name of one of the outputs of the package, as in
@itemx -r @var{package}
Remove @var{package}.
-@item --upgrade=@var{REGEXP}
-@itemx -u @var{REGEXP}
+@item --upgrade=@var{regexp}
+@itemx -u @var{regexp}
Upgrade all the installed packages matching @var{regexp}.
@item --profile=@var{profile}
@@ -283,7 +283,7 @@ familiar packaging concepts, such as the name and version of a package,
its build system, and its dependencies. These definitions can then be
turned into concrete build actions.
-Build actions are performed the Guix daemon, on behalf of users. In a
+Build actions are performed by the Guix daemon, on behalf of users. In a
standard setup, the daemon has write access to the store---the
@file{/nix/store} directory---whereas users do not. The recommended
setup also has the daemon perform builds in chroots, under a specific
@@ -369,7 +369,7 @@ object.
Naturally, @var{gnu-build-system} represents the familiar GNU Build
System, and variants thereof (@pxref{Configuration, configuration and
makefile conventions,, standards, GNU Coding Standards}). In a
-nutshell, packages using the GNU Build System may be configured, build,
+nutshell, packages using the GNU Build System may be configured, built,
and installed with the usual @code{./configure && make && make check &&
make install} command sequence. This is what @var{gnu-build-system}
does.
@@ -420,7 +420,7 @@ tool (@pxref{Invoking guix-build}).
Behind the scenes, a derivation corresponding to the @code{<package>}
object is first computed by the @code{package-derivation} procedure.
That derivation is stored in a @code{.drv} file under @file{/nix/store}.
-The build actions is prescribes may then be realized by using the
+The build actions it prescribes may then be realized by using the
@code{build-derivations} procedure (@pxref{The Store}).
@deffn {Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]