summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-10-11 12:57:57 -0500
committerDan McGee <dan@archlinux.org>2009-10-11 12:57:57 -0500
commitcf0d619670a4d0c67ad67e22bacbb69c203714f5 (patch)
treeb4edada535df2b5beda4d9bcaf0f62e406a9c164 /doc
parent8e7652f1afd7ba5198f3aa10a94c50bb67f7a407 (diff)
parent5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (diff)
downloadpacman-cf0d619670a4d0c67ad67e22bacbb69c203714f5.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am7
-rw-r--r--doc/index.txt1
-rw-r--r--doc/pacman.conf.5.txt7
3 files changed, 12 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6261d926..fcbcab88 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,7 +26,8 @@ HTML_MANPAGES = \
HTML_OTHER = \
index.html \
submitting-patches.html \
- translation-help.html
+ translation-help.html \
+ HACKING.html
HTML_DOCS = \
$(HTML_MANPAGES) \
@@ -99,6 +100,10 @@ $(ASCIIDOC_MANS): asciidoc.conf footer.txt
asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt
dos2unix $@
+HACKING.html: ../HACKING
+ asciidoc $(ASCIIDOC_OPTS) -a linkcss -o $@ ../HACKING
+ dos2unix $@
+
# Customizations for certain HTML docs
$(HTML_MANPAGES): asciidoc.conf footer.txt
$(HTML_OTHER): asciidoc.conf
diff --git a/doc/index.txt b/doc/index.txt
index 3c2f83e6..8cd9b414 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -62,6 +62,7 @@ Releases
`------------`-------
Date Version
---------------------
+2009-10-05 v3.3.2
2009-09-22 v3.3.1
2009-08-02 v3.3.0
2009-01-05 v3.2.2
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 640e62bb..89c22a12 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -86,8 +86,11 @@ Options
*SyncFirst =* package ...::
Instructs pacman to check for newer version of these packages before any
sync operation. The user will have the choice to either cancel the current
- operation and upgrade these packages first or go on with the current operation.
- This option is typically used with the 'pacman' package.
+ operation and upgrade these packages first or go on with the current
+ operation. This option is typically used with the 'pacman' package.
+ *NOTE*: when a `SyncFirst` transaction takes place, no command line flags
+ (e.g. '\--force') are honored. If this is not ideal, disabling `SyncFirst`
+ and performing a manual sync of the involved packages may be required.
*IgnoreGroup =* group ...::
Instructs pacman to ignore any upgrades for all packages in this