Merge branch 'maint'

Conflicts:
	lib/libalpm/diskspace.c
	src/pacman/util.h

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 39551e15..0813b887 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -349,7 +349,7 @@ Sync Options[[SO]]
 	databases are saved for every sync DB you download from, and are not
 	deleted even if they are removed from the configuration file
 	linkman:pacman.conf[5]. Use one '\--clean' switch to only remove
-	packages that are no longer installed; use two to remove all packages
+	packages that are no longer installed; use two to remove all files
 	from the cache. In both cases, you will have a yes or no option to
 	remove packages and/or unused downloaded databases.
 +