From 94c28305720d6f98608f1998f19b41ae13f6306d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 11 Jan 2009 22:09:40 -0600 Subject: Fix linkman macro to work with asciidoc > 8.3.0 Signed-off-by: Dan McGee --- doc/asciidoc.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index f92a3eab..b7aae66e 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -8,7 +8,11 @@ # Show man link as: (
); if section is defined, else just show # the command. +[macros] +(?su)[\\]?(?Plinkman):(?P\S*?)\[(?P.*?)\]= + [attributes] +asterisk=* plus=+ caret=^ startsb=[ -- cgit v1.2.3-24-g4f1b From e9ca40b56e6b17e9f64cd428813e97a9f4f3ec60 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Jan 2009 23:19:21 -0600 Subject: doc: fix some more asciidoc fallout They keep changing things on us. This gets rid of the '.ft C' text sprinkled around our listing blocks. Signed-off-by: Dan McGee --- doc/asciidoc.conf | 6 ------ doc/pacman.conf.5.txt | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index b7aae66e..3ea510d8 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -34,13 +34,7 @@ ifndef::docbook-xsl-172[] [listingblock] {title} -ifdef::doctype-manpage[] - .ft C -endif::doctype-manpage[] | -ifdef::doctype-manpage[] - .ft -endif::doctype-manpage[] {title#} endif::docbook-xsl-172[] 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 -- cgit v1.2.3-24-g4f1b From 1191303f8b9edc01ff969e2433f5c40c9a95474a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Jan 2009 23:44:06 -0600 Subject: doc: Consistency and formatting cleanups Signed-off-by: Dan McGee --- doc/makepkg.conf.5.txt | 10 +++++----- doc/pacman.8.txt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b5398af7..9fd52e64 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -112,10 +112,10 @@ Options *docs*;; Save doc and info directories. If you wish to delete doc and info - directories, specify `!docs' in the array. + directories, specify `!docs` in the array. *libtool*;; - Leave libtool (.la) files in packages. Specify `!libtool' to remove + Leave libtool (.la) files in packages. Specify `!libtool` to remove them. *emptydirs*;; @@ -130,13 +130,13 @@ Options `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. **DOC_DIRS=(**usr/{,share/}{info,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 @@ -153,7 +153,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 ":: +**PACKAGER=**"John Doe ":: 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 <> 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*:: -- cgit v1.2.3-24-g4f1b