diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
commit | 4d152bf1d9ff894119e913e6506632348107cf65 (patch) | |
tree | c44f06f725e3a398bd7698dd2b58480d356021b8 /doc | |
parent | 4ce823c4241ff941ca301c39db23ab91eeaa1ac9 (diff) | |
parent | 3259877d3563ac022633fbd8b73134a10567331e (diff) | |
download | guix-4d152bf1d9ff894119e913e6506632348107cf65.tar.gz guix-4d152bf1d9ff894119e913e6506632348107cf65.zip |
Merge branch 'master' into nix-integration
Conflicts:
guix/store.scm
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guix.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bab5cf7a8f..b01aa961c1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -210,7 +210,7 @@ want to roll back. @table @code @item --install=@var{package} -@itemx -x @var{package} +@itemx -i @var{package} Install @var{package}. @var{package} may specify either a simple package name, such as |