Merge branch 'maint'

Conflicts:
	scripts/repo-add.sh.in

2 files changed, 14 insertions, 3 deletions

diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index a21c1dff..eefdbd4b 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -40,8 +40,9 @@ similar to `$_basekernver`.
 
 *pkgname (array)*::
 	Either the name of the package or an array of names for split packages.
-	Because it will be used in the package filename, this has to be unix-friendly.
-	Members of the array are not allowed to start with hyphens.
+	Valid characters for members of this array are alphanumerics, and any of
+	the following characters: ```@ . _ + -`''. Additionally, names are not
+	allowed to start with hyphens.
 
 *pkgver*::
 	The version of the software as released from the author (e.g., '2.7.1').
diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt
index 3804c5d9..5913dba6 100644
--- a/doc/pkgdelta.8.txt
+++ b/doc/pkgdelta.8.txt
@@ -11,7 +11,7 @@ pkgdelta - package delta generation utility
 
 Synopsis
 --------
-'pkgdelta' [-q] <package1> <package2>
+'pkgdelta' [options] <package1> <package2>
 
 
 Description
@@ -27,6 +27,16 @@ significantly.
 
 Options
 -------
+*--max-delta-size <ratio>*::
+	Only create delta files if the delta is smaller than ratio * package_size.
+	Possible values: 0.0 to 2.0.
+	Recommended values: 0.2 to 0.9.
+	Default value: 0.7
+
+*--min-pkg-size <size>*::
+	Minimal size of the package file in bytes to be considered for delta creation.
+	Default value: 1048576 bytes = 1MiB
+
 *-q, \--quiet*::
 	Be quiet. Do not output anything but warnings and errors.