Document that final hook match wins

Signed-off-by: Allan McRae <allan@archlinux.org>

doc/alpm-hooks.5.asciidoc

@@ -55,15 +55,15 @@ defined the hook will run if the transaction matches *any* of the triggers.
 
 *Type =* Path|Package::
 	Select whether targets are matched against transaction packages or files.
-	See CAVEATS for special notes regarding Path triggers. 'File' is a deprecated
-	alias for 'Path' and will be removed in a future release.  Required.
+	See CAVEATS for special notes regarding Path triggers. Required.
 
 *Target =* <path|package>::
 	The path or package name to match against the active transaction.
 	Paths refer to the files in the package archive; the installation root
 	should *not* be included in the path.  Shell-style glob patterns are
 	allowed. It is possible to invert matches by prepending a target with an
-	exclamation mark. May be specified multiple times. Required.
+	exclamation mark. May be specified multiple times, with subsequent
+	matches overriding previous ones. Required.
 
 ACTIONS
 -------

lib/libalpm/hook.c

@@ -189,10 +189,6 @@ static int _alpm_hook_parse_cb(const char *file, int line,
 			}
 			if(strcmp(value, "Package") == 0) {
 				t->type = ALPM_HOOK_TYPE_PACKAGE;
-			} else if(strcmp(value, "File") == 0) {
-				_alpm_log(handle, ALPM_LOG_DEBUG,
-						"File targets are deprecated, use Path instead\n");
-				t->type = ALPM_HOOK_TYPE_PATH;
 			} else if(strcmp(value, "Path") == 0) {
 				t->type = ALPM_HOOK_TYPE_PATH;
 			} else {

src/pacman/pacman.c

@@ -1035,6 +1035,8 @@ static int parseargs(int argc, char *argv[])
 		{"color",      required_argument, 0, OP_COLOR},
 		{"disable-download-timeout", no_argument, 0, OP_DISABLEDLTIMEOUT},
 		{"disable-sandbox", no_argument, 0, OP_DISABLESANDBOX},
+		{"disable-sandbox-filesystem", no_argument, 0, OP_DISABLESANDBOXFILESYSTEM},
+		{"disable-sandbox-syscalls", no_argument, 0, OP_DISABLESANDBOXSYSCALLS},
 		{0, 0, 0, 0}
 	};