Merge branch 'maint'

Conflicts:
	lib/libalpm/dload.c
	po/it.po
	scripts/makepkg.sh.in

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index ddf73dae..4bb37808 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -119,7 +119,7 @@ Options
 
 *-r, \--rmdeps*::
 	Upon successful build, remove any dependencies installed by makepkg
-	during dependency auto-resolution (using `-b` or `-s`).
+	during dependency auto-resolution and installation when using `-s`.
 
 *-R, \--repackage*::
 	Repackage contents of pkg/ without rebuilding the package. This is