summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-01 12:13:49 -0500
committerDan McGee <dan@archlinux.org>2011-06-01 12:13:49 -0500
commit41da2253366b6f641fc3e986817ee617c9e18df3 (patch)
treec0ef91021a88bd663905a170087a7cbfec874436 /doc
parentfe9804a96d9e50a44e549c7be9189152e20893c5 (diff)
parentaad57cc06ac60dc8fdcff9bea811e990d64f74d3 (diff)
downloadpacman-41da2253366b6f641fc3e986817ee617c9e18df3.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/asciidoc.conf4
-rw-r--r--doc/makepkg.8.txt2
-rw-r--r--doc/pacman.8.txt4
-rw-r--r--doc/pacman.conf.5.txt12
5 files changed, 15 insertions, 11 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index def58c4e..bc0244c2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -92,9 +92,9 @@ html: $(HTML_DOCS)
website: html
bsdtar czf website.tar.gz $(HTML_DOCS) \
-C /etc/asciidoc/stylesheets/ \
- xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+ asciidoc.css asciidoc-manpage.css \
-C /etc/asciidoc/javascripts/ \
- asciidoc-xhtml11.js \
+ asciidoc.js \
-C /etc/asciidoc/ \
images
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index 3ea510d8..e2e72672 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -17,7 +17,11 @@ plus=&#43;
caret=&#94;
startsb=&#91;
endsb=&#93;
+backslash=&#92;
tilde=&#126;
+apostrophe=&#39;
+backtick=&#96;
+litdd=&#45;&#45;
ifdef::backend-docbook[]
[linkman-inlinemacro]
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 1a2dcd04..e61f7ab3 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -53,7 +53,7 @@ Options
in linkman:makepkg.conf[5].
*\--config* <file>::
- Use an alternate config file instead of the `{sysconfdir}/makepkg.conf`
+ Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
default.
*-d, \--nodeps*::
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 3b92d193..531c992a 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -117,7 +117,7 @@ Options
-------
*-b, \--dbpath* <path>::
Specify an alternative database location (a typical default is
- `{localstatedir}/lib/pacman`). This should not be used unless you know what you are
+ +{localstatedir}/lib/pacman+). This should not be used unless you know what you are
doing. *NOTE*: if specified, this is an absolute path and the root path is
not automatically prepended.
@@ -138,7 +138,7 @@ Options
*\--cachedir* <dir>::
Specify an alternative package cache location (a typical default is
- `{localstatedir}/cache/pacman/pkg`). Multiple cache directories can be specified,
+ +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be specified,
and they are tried in the order they are passed to pacman. *NOTE*: this
is an absolute path, the root path is not automatically prepended.
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