diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
| commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
| tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/package-management.scm | |
| parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
| parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
| download | patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9f35de1819..b789b333b8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -103,10 +103,10 @@ (synopsis "Functional package manager for installed software packages and versions") (description "GNU Guix is a functional package manager for the GNU system, and is -also a distribution thereof. It includes a virtual machine image. Besides +also a distribution thereof. It includes a virtual machine image. Besides the usual package management features, it also supports transactional -upgrades and roll-backs, per-user profiles, and much more. It is based on the -Nix package manager.") +upgrades and roll-backs, per-user profiles, and much more. It is based on +the Nix package manager.") (license gpl3+))) (define-public guix guix-0.7) |