summaryrefslogtreecommitdiffstats
path: root/doc/pacman.conf.5.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-01 19:13:49 +0200
committerDan McGee <dan@archlinux.org>2011-06-01 19:13:49 +0200
commit41da2253366b6f641fc3e986817ee617c9e18df3 (patch)
treec0ef91021a88bd663905a170087a7cbfec874436 /doc/pacman.conf.5.txt
parentfe9804a96d9e50a44e549c7be9189152e20893c5 (diff)
parentaad57cc06ac60dc8fdcff9bea811e990d64f74d3 (diff)
downloadpacman-41da2253366b6f641fc3e986817ee617c9e18df3.tar.gz
pacman-41da2253366b6f641fc3e986817ee617c9e18df3.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc/pacman.conf.5.txt')
-rw-r--r--doc/pacman.conf.5.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 99fb0fa4..70d42eb3 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow
NoUpgrade = etc/fstab
[core]
-Include = {sysconfdir}/pacman.d/core
+Include = /etc/pacman.d/core
[custom]
Server = file:///home/pkgs
@@ -57,13 +57,13 @@ Options
*DBPath =* path/to/db/dir::
Overrides the default location of the toplevel database directory. A
- typical default is `{localstatedir}/lib/pacman/`. Most users will not need to set
+ typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set
this option. *NOTE*: if specified, this is an absolute path and the root
path is not automatically prepended.
*CacheDir =* path/to/cache/dir::
Overrides the default location of the package cache directory. A typical
- default is `{localstatedir}/cache/pacman/pkg/`. Multiple cache directories can be
+ default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
specified, and they are tried in the order they are listed in the config
file. If a file is not found in any cache directory, it will be downloaded
to the first cache directory with write access. *NOTE*: this is an absolute
@@ -81,7 +81,7 @@ Options
*LogFile =* '/path/to/file'::
Overrides the default location of the pacman log file. A typical default
- is `{localstatedir}/log/pacman.log`. This is an absolute path and the root directory
+ is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
is not prepended.
*HoldPkg =* package ...::
@@ -158,7 +158,7 @@ Options
*UseSyslog*::
Log action messages through syslog(). This will insert log entries into
- `{localstatedir}/log/messages` or equivalent.
+ +{localstatedir}/log/messages+ or equivalent.
*UseDelta*::
Download delta files instead of complete packages if possible. Requires
@@ -225,7 +225,7 @@ directory with these packages so pacman can find it when run with '\--refresh'.
The above command will generate a compressed database named
'/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
-'{treename}.db.tar.gz', where '{treename}' is the name of the section defined in
+'\{treename\}.db.tar.gz', where '\{treename\}' is the name of the section defined in
the configuration file. That's it! Now configure your custom section in the
configuration file as shown in the config example above. Pacman will now use your
package repository. If you add new packages to the repository, remember to