summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-01-13 00:10:36 -0600
committerDan McGee <dan@archlinux.org>2009-01-13 00:10:36 -0600
commitb369f71fd62effa611214f5afc3de8568533253a (patch)
tree720d557f939cc2b23415d21adef6895636c6df18
parent3d6da93093caa12f726f723ba19d737c8a55b44d (diff)
parent1191303f8b9edc01ff969e2433f5c40c9a95474a (diff)
downloadpacman-b369f71fd62effa611214f5afc3de8568533253a.tar.xz
Merge branch 'maint'
Conflicts: doc/makepkg.conf.5.txt
-rw-r--r--doc/asciidoc.conf10
-rw-r--r--doc/makepkg.conf.5.txt10
-rw-r--r--doc/pacman.8.txt8
-rw-r--r--doc/pacman.conf.5.txt1
4 files changed, 14 insertions, 15 deletions
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index f92a3eab..3ea510d8 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -8,7 +8,11 @@
# Show man link as: <command>(<section>); if section is defined, else just show
# the command.
+[macros]
+(?su)[\\]?(?P<name>linkman):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
[attributes]
+asterisk=&#42;
plus=&#43;
caret=&#94;
startsb=&#91;
@@ -30,13 +34,7 @@ ifndef::docbook-xsl-172[]
[listingblock]
<example><title>{title}</title>
<literallayout>
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
|
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
</literallayout>
{title#}</example>
endif::docbook-xsl-172[]
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 72bdbea2..399f0260 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -117,11 +117,11 @@ Options
*docs*;;
Save doc directories. If you wish to delete doc directories, specify
- `!docs' in the array. The directories affected are specified by the
+ `!docs` in the array. The directories affected are specified by the
`DOC_DIRS` variable.
*libtool*;;
- Leave libtool (.la) files in packages. Specify `!libtool' to remove
+ Leave libtool (.la) files in packages. Specify `!libtool` to remove
them.
*emptydirs*;;
@@ -148,13 +148,13 @@ Options
slash to the directory name.
**DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**::
- If "!docs" is specified in the OPTIONS array, this variable will
+ If `!docs` is specified in the OPTIONS array, this variable will
instruct makepkg where to look to remove docs. If you build packages
that are located in opt/, you may need to add the directory to this
array. *NOTE:* Do not add the leading slash to the directory name.
**STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**::
- If "strip" is specified in the OPTIONS array, this variable will
+ If `strip` is specified in the OPTIONS array, this variable will
instruct makepkg where to look to for files to strip. If you build
packages that are located in opt/, you may need to add the directory
to this array. *NOTE:* Do not add the leading slash to the directory
@@ -176,7 +176,7 @@ Options
in the current directory. Many people like to keep all source files in
a central location for easy cleanup, so this path can be set here.
-**PACKAGER=**"John Doe <john@doe.com>"::
+**PACKAGER=**"John Doe <john@example.com>"::
This value is used when querying a package to see who was the builder.
It is recommended you change this to your name and email address.
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*::
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 8ef11ecb..fa212947 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -25,6 +25,7 @@ which defines global options.
Example
-------
+
--------
#
# pacman.conf