summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-11-30 22:34:25 -0600
committerDan McGee <dan@archlinux.org>2011-11-30 22:34:25 -0600
commit1d98c6347c9622d4334f80fc59623da524b4f37b (patch)
treeca1284032ee13c73a625f6261ac2bde2bfbc708e /doc
parent86b5b7aa4215b7408ccf1ec8368988af327703fb (diff)
parent5490cd6eb22752d2eac5410152d239c50224dbc1 (diff)
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/index.txt3
-rw-r--r--doc/makepkg.conf.5.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/index.txt b/doc/index.txt
index 359b47fa..c36dfbf2 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -71,7 +71,8 @@ Releases
[frame="topbot",grid="none",options="header,autowidth"]
!======
!Version !Date
-!4.0.0 !2011-09-13
+!4.0.1 !2011-11-20
+!4.0.0 !2011-10-13
!4.0.0rc2 !2011-09-22
!4.0.0rc1 !2011-08-11
!3.5.4 !2011-08-10
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 2778361b..db1e6d53 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -215,7 +215,7 @@ Options
**PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz"::
Sets the compression used when making compiled or source packages. The
- current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and
+ current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and
`.tar.Z`.
Do not touch these unless you know what you are doing.