diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-12 09:53:59 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-12 09:53:59 +0100 |
| commit | c3f9aefcca689e0455e4a0b792f7f3c6b4f93cb5 (patch) | |
| tree | eab0d79f4206e3c5a9278e8ed6195df8db36799b | |
| parent | f5e2a3175da0699c5a9cd9eeafe1b86dd962eca9 (diff) | |
| parent | fbc6a824d8f9450087b2184c9ce6d03ef65da832 (diff) | |
| download | otp-c3f9aefcca689e0455e4a0b792f7f3c6b4f93cb5.tar.gz otp-c3f9aefcca689e0455e4a0b792f7f3c6b4f93cb5.tar.bz2 otp-c3f9aefcca689e0455e4a0b792f7f3c6b4f93cb5.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/observer/doc/src/crashdump_ug.xml | 4 | ||||
| -rw-r--r-- | lib/observer/src/crashdump_viewer.erl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml index dc65fe5b39..8b60f6ee98 100644 --- a/lib/observer/doc/src/crashdump_ug.xml +++ b/lib/observer/doc/src/crashdump_ug.xml @@ -48,8 +48,8 @@ Information which shows a short summary of the information in the crashdump.</p> - <p>The default browser is Internet Explorer on Windows or else - Firefox. To use another browser, give the browser's start command + <p>The default browser is Internet Explorer on Windows, open on Mac OS X, + or else Firefox. To use another browser, give the browser's start command as the second argument to <c>cdv</c>. If the given browser name is not known to Crashdump Viewer, the browser argument is executed as a command with the start URL as the only argument.</p> diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl index 3b8d17c7d9..64a8457d16 100644 --- a/lib/observer/src/crashdump_viewer.erl +++ b/lib/observer/src/crashdump_viewer.erl @@ -214,6 +214,7 @@ script_start([File]) -> DefaultBrowser = case os:type() of {win32,_} -> iexplore; + {unix,darwin} -> open; _ -> firefox end, script_start([File,DefaultBrowser]); @@ -277,8 +278,8 @@ usage() -> io:format( "\nusage: cdv file [ browser ]\n" "\tThe \'file\' must be an existing erlang crash dump.\n" - "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows\n" - "\tor else \'firefox\'.\n", + "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows,\n" + "\t\'open\' on Mac OS X, or else \'firefox\'.\n", []). |