From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: [PATCH] doc: Improve wording and fix typos in "Introduction" and "Requirements". Date: Fri, 24 May 2013 16:22:21 +0400 Message-ID: <87r4gwh8jm.fsf@karetnikov.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:36471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufqxw-0004UQ-UY for bug-guix@gnu.org; Fri, 24 May 2013 08:19:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ufqxm-0005WG-Gt for bug-guix@gnu.org; Fri, 24 May 2013 08:19:24 -0400 Received: from [2a01:7e00::f03c:91ff:fedf:181] (port=36542 helo=cooksoni.karetnikov.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufqxm-0005Vi-6y for bug-guix@gnu.org; Fri, 24 May 2013 08:19:14 -0400 List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: bug-guix@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Is it possible to use =E2=80=99 instead of ' for the apostrophe and keep the source in ASCII? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-doc-Improve-wording-and-fix-typos-in-Introduction-an.patch Content-Transfer-Encoding: quoted-printable From=203384e3e2e00d3cbef37b913c9a17df5842522ef8 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Fri, 24 May 2013 12:02:15 +0000 Subject: [PATCH] doc: Improve wording and fix typos in "Introduction" and "Requirements". * doc/guix.texi (Introduction, Requirements): Rephrase and fix typos. =2D-- doc/guix.texi | 66 +++++++++++++++++++++++++++--------------------------= --- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c3aab81..9a12ff9 100644 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -96,42 +96,39 @@ Documentation License.'' GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``=C9=A1i=CB= =90ks'' using the international phonetic alphabet (IPA).} is a functional package management tool for the GNU system. Package management consists =2Din all the activities that relate to building packages from source, =2Dhonoring the build-time and run-time dependencies on packages, =2Dinstalling packages in user environments, upgrading installed packages =2Dto new versions or rolling back to a previous set, removing unused =2Dsoftware packages, etc. +of all activities that relate to building packages from sources, +preserving their build-time and run-time dependencies, installing +packages in user environments, upgrading installed packages to new +versions or rolling back to a previous set, removing unused software +packages, etc. =20 @cindex functional package management =2DThe term @dfn{functional} refers to a specific package management =2Ddiscipline. In Guix, the package build and installation process is seen =2Das a function, in the mathematical sense: that function takes inputs, =2Dsuch as build scripts, a compiler, and libraries depended on, and =2Dreturns the installed package. As a pure function, its result depends =2Dsolely on its inputs---for instance, it cannot refer to software or =2Dscripts that were not explicitly passed as inputs. A build function =2Dalways produces the same result when passed a given set of inputs. Last =2Dbut not least, a build function cannot alter the system's environment in =2Dany way; for instance, it cannot create, modify, or delete files outside =2Dof its build and installation directories. This is achieved by running =2Dbuild processes in dedicated ``chroots'', where only their explicit =2Dinputs are visible. +The term @dfn{functional} refers to a specific set of package management +features. In Guix, the package build and installation process is seen +as a function, in the mathematical sense. That function takes inputs, +such as build scripts, a compiler, and libraries, and returns an +installed package. As a pure function, its result depends solely on its +inputs---for instance, it cannot refer to software or scripts that were +not explicitly passed as inputs. A build function always produces the +same result when passed the same set of inputs. It cannot alter the +system's environment in any way; for instance, it cannot create, modify, +or delete files outside of its build and installation directories. This +is achieved by running build processes in isolated environments (or +@dfn{chroots}), where only their explicit inputs are visible. =20 @cindex store =2DThe result of package build functions is @dfn{cached} in the file +The result of package's build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The =2DStore}). Each package is installed in a directory of its own, in the =2Dstore---by default under @file{/nix/store}. The directory name contains =2Da hash of all the inputs used to build that package; thus, changing an =2Dinput yields a different directory name. +Store}). Each installed package has its own directory there. The +directory name contains a hash of all the inputs used to build that +package; thus, changing an input yields a different directory name. =20 This approach is the foundation of Guix's salient features: support for =2Dtransactional package upgrades and rollback, per-user installation, and +transactional package upgrades and rollbacks, per-user installation, and garbage collection of packages (@pxref{Features}). =20 =2DGuix has a command-line interface allowing users to build, install, +Guix has a command-line interface which allows users to build, install, upgrade, and remove packages, as well as a Scheme programming interface. =2DThe remainder of this manual describes them. =20 Last but not least, Guix is used to build a distribution of the GNU system, with many GNU and non-GNU free software packages. @xref{GNU @@ -175,19 +172,20 @@ following packages are also needed: @item @url{http://gcc.gnu.org, GCC's g++} @end itemize =20 =2DWhen a working installation of the Nix package manager is available, you =2Dcan instead configure Guix with @code{--disable-daemon}. In that case, =2D@url{http://nixos.org/nix/, Nix} replaces the three dependencies above. +When a working installation of @url{http://nixos.org/nix/, the Nix +package manager} is available, you can instead configure Guix with +@code{--disable-daemon}. In that case, Nix replaces the three +dependencies above. =20 Guix is compatible with Nix, so it is possible to share the same store between both. To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same =2D@code{--localstatedir} value (the latter is essential because it =2Dspecifies where the database that store meta-data about the store is =2Dlocated, among other things.) The default values are +@code{--localstatedir} value. The latter is essential because it +specifies where the database that stores metadata about the store is +located, among other things. The default values are @code{--with-store-dir=3D/nix/store} and @code{--localstatedir=3D/nix/var}. =2DNote that @code{--disable-daemon} is orthogonal and is not required if =2Dyour goal is to share the same store as Nix. +Note that @code{--disable-daemon} is not required if your goal is to +share the store with Nix. =20 @node Setting Up the Daemon @section Setting Up the Daemon =2D-=20 1.7.5.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJRn1uBAAoJEM+IQzI9IQ38y50P/3TeXcsOLYnzU+f397knqvaH Uan5EwO2Bkap7/8Nke1S0u4Yvj5bVU2JqT2WAxVhuX+dVO90CwQZs//G+dHj6KTM KEHfkaS8lKbNmamga3nRSoirY4KOsNdObUSxTvEMrt7Yqnc0lANtMnHGwFZjn/aS BXnVZe2NucygGOmcyCgSIIT/z8Ybxe6mjjy25HoDbaV0GPsJWXpPWLQefr0rbse7 rN3abJLELMkX8JJWP9GgJMYiqyM1bAa1WXIosJ4m9IpzUOIKy2eB9JBCkQUgR0+D u/FSMOpDk61ESsLjuPdvMRpRB9jVguZ2qNA0y87fKZJYrFBopyOfJmwZAO6WjTUY kVCRVW0Scwk7iXF+bfsBfvW9L3eBrVbD2AY18YnlmVXJCYS7FgWWngaX4KnTXLVY rewORyj4UgaNJ87VzJC5HJ9/ZjXmoBkVFPQ75dna1XwaS9rG+LvxUK6EaLgI/XX1 e27EBLewUrx2R8tZ53ExXZTJy+jh4SEL9ylGXLPPbwXySN2NLUcUmrgJDrpaSICe 4qmUBYCnH8frm+YJsNdq43WtTYHY7GU9hQtgfPJdTcHc+5qiBT2OwebSnSnyF7C3 0nCNGxxKdG4bZgQgZgmHry06s7bnjFm3UO6e6/Upao11vLJcBZFFqwrUVsQ0e49i P0f6B+Z6IThFXjxj4Q6t =mXvs -----END PGP SIGNATURE----- --==-=-=--