From 82bebb11de699550a36bf411737d01880e4a16a7 Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Mon, 16 Mar 2015 13:47:51 -0400
Subject: [PATCH] Update man pages.

R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/1013783002
---
 tools/mac/exception_port_tool.ad | 10 +++++-----
 tools/mac/run_with_crashpad.ad   | 29 +++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/tools/mac/exception_port_tool.ad b/tools/mac/exception_port_tool.ad
index cf7af74f..a0d7ca36 100644
--- a/tools/mac/exception_port_tool.ad
+++ b/tools/mac/exception_port_tool.ad
@@ -50,11 +50,11 @@ restricted to the superuser.
 'MASK' defines the mask of exception types to handle, from
 +<mach/exception_types.h>+. This can be *BAD_ACCESS*, *BAD_INSTRUCTION*,
 *ARITHMETIC*, *EMULATION*, *SOFTWARE*, *BREAKPOINT*, *SYSCALL*, *MACH_SYSCALL*,
-*RPC_ALERT*, *CRASH*, *RESOURCE*, *GUARD*, or *CRASH*. Different exception types
-may be combined by combining them with pipe characters (*|*). The special value
-*ALL* includes each exception type except for *CRASH*. To truly specify all
-exception types including *CRASH*, use *ALL|CRASH*. The default value of 'MASK'
-is *CRASH*.
+*RPC_ALERT*, *CRASH*, *RESOURCE*, or *GUARD*. Different exception types may be
+combined by combining them with pipe characters (*|*). The special value *ALL*
+includes each exception type except for *CRASH*. To truly specify all exception
+types including *CRASH*, use *ALL|CRASH*. The default value of 'MASK' is
+*CRASH*.
 +
 *behavior*='BEHAVIOR':::
 'BEHAVIOR' defines the specific exception handler routine to be called when an
diff --git a/tools/mac/run_with_crashpad.ad b/tools/mac/run_with_crashpad.ad
index c216153e..91a86455 100644
--- a/tools/mac/run_with_crashpad.ad
+++ b/tools/mac/run_with_crashpad.ad
@@ -46,11 +46,22 @@ run with a Crashpad exception handler.
 Invoke 'HANDLER' as the Crashpad handler program instead of the default,
 *crashpad_handler*.
 
-*-a*, *--handler-argument*='ARGUMENT'::
+*--annotation*='KEY=VALUE'::
+Passed to the Crashpad handler program as an *--annotation* argument.
+
+*--database*='PATH'::
+Passed to the Crashpad handler program as its *--database* argument.
+
+*--url*='URL'::
+Passed to the Crashpad handler program as its *--url* argument.
+
+*-a*, *--argument*='ARGUMENT'::
 Invokes the Crashpad handler program with 'ARGUMENT' as one of its arguments.
-This option may appear zero, one, or more times. Regardless of this option’s
-presence, the handler will always be invoked with the necessary arguments to
-perform a handshake.
+This option may appear zero, one, or more times. If this program has a specific
+option such as *--database* matching the desired Crashpad handler program
+option, the specific option should be used in preference to *--argument*.
+Regardless of this option’s presence, the handler will always be invoked with
+the necessary arguments to perform a handshake.
 
 *--help*::
 Display help and exit.
@@ -64,7 +75,7 @@ Starts a Crashpad exception handler server by its default name,
 *crashpad_handler*, and runs a program with this handler in effect.
 [subs="quotes"]
 ----
-$ *run_with_crashpad crash*
+$ *run_with_crashpad --database=/tmp/crashpad_database crash*
 Illegal instruction: 4
 ----
 
@@ -72,9 +83,11 @@ Starts a Crashpad exception handler server at a nonstandard path, and runs
 exception_port_tool(1) to show the task-level exception ports.
 [subs="quotes"]
 ----
-$ *run_with_crashpad --handler=/tmp/crashpad_handler exception_port_tool*
-task exception port 0, mask 0x1c00 (CRASH|RESOURCE|GUARD), port 0x30b, behavior
-0x80000003 (STATE_IDENTITY|MACH), flavor 7 (THREAD)
+$ *run_with_crashpad --handler=/tmp/crashpad_handler \
+      --database=/tmp/crashpad_database exception_port_tool \
+      --show-task*
+task exception port 0, mask 0x1c00 (CRASH|RESOURCE|GUARD), port
+0x30b, behavior 0x80000003 (STATE_IDENTITY|MACH), flavor 7 (THREAD)
 ----
 
 == Exit Status