Merge branch 'maint'

3 files changed, 5 insertions, 1 deletions

diff --git a/doc/index.txt b/doc/index.txt
index 81588102..c6b4aea2 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -71,6 +71,7 @@ Releases
 [frame="topbot",grid="none",options="header,autowidth"]
 !======
 !Version !Date
+!4.1.1  !2013-05-07
 !4.1.0  !2013-04-01
 !4.1.0rc1 !2013-03-09
 !4.0.3 !2012-04-07
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 82ef88b8..a10242d2 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -144,6 +144,9 @@ Options
 	remote builder, or a tarball upload. Because integrity checks are verified,
 	all source files of the package need to be present or downloadable.
 
+*-V, \--version*::
+	Display version information.
+
 *\--allsource*::
 	Do not actually build the package, but build a source-only tarball that
 	includes all sources, including those that are normally download via
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 0d1cf00c..be5b809a 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -182,7 +182,7 @@ Options
 	*debug*;;
 		Add the user-specified debug flags as specified in DEBUG_CFLAGS and
 		DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate
-		package containing the debug symbols with used with `strip'.
+		package containing the debug symbols when used with `strip'.
 
 **INTEGRITY_CHECK=(**check1 ...**)**::
 	File integrity checks to use. Multiple checks may be specified; this