Merge branch 'maint'

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.