diff options
author | Dan McGee <dan@archlinux.org> | 2009-01-13 07:10:36 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-01-13 07:10:36 +0100 |
commit | b369f71fd62effa611214f5afc3de8568533253a (patch) | |
tree | 720d557f939cc2b23415d21adef6895636c6df18 /doc/pacman.8.txt | |
parent | 3d6da93093caa12f726f723ba19d737c8a55b44d (diff) | |
parent | 1191303f8b9edc01ff969e2433f5c40c9a95474a (diff) | |
download | pacman-b369f71fd62effa611214f5afc3de8568533253a.tar.gz pacman-b369f71fd62effa611214f5afc3de8568533253a.tar.xz |
Merge branch 'maint'
Conflicts:
doc/makepkg.conf.5.txt
Diffstat (limited to 'doc/pacman.8.txt')
-rw-r--r-- | doc/pacman.8.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 6f071bac..c5748724 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -22,8 +22,8 @@ hooks, and the ability to sync your local machine with a remote ftp server to automatically upgrade packages. Pacman packages are a zipped tar format. Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the -"Arch Linux Package Management" library. This library allows alternative front -ends to be written (for instance, a GUI front end). +``Arch Linux Package Management'' library. This library allows alternative +front ends to be written (for instance, a GUI front end). Operations @@ -73,7 +73,7 @@ to determine which packages need upgrading. This behavior operates as follows: *-U, \--upgrade*:: Upgrade or add a package to the system. Either a URL or file path can be - specified. This is a "remove-then-add" process. See <<HCF,Handling Config + specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config Files>> for an explanation on how pacman takes care of config files. *-V, \--version*:: @@ -141,7 +141,7 @@ Options the installation root setting. *\--noconfirm*:: - Bypass any and all "Are you sure?" messages. It's not a good idea to do + Bypass any and all ``Are you sure?'' messages. It's not a good idea to do this unless you want to run pacman from a script. *\--noprogressbar*:: |