--- a/core/builtins/dialog.cif	Tue Sep 14 09:49:39 2010 +0100
+++ b/core/builtins/dialog.cif	Wed Sep 15 18:07:34 2010 +0100
@@ -18,29 +18,11 @@
 
 ==long-description
 
-Up to two buttons are supported. By default the first is labelled C<OK> and the second C<Cancel>. The button the user selected can be determined by the return code of the command. The first button will produce a return code of zero (0), and the second a code of one (1). If there was an error displaying the dialog, the error code will be returned (always a negative number). The return code makes it possible to write scripts like:
-
-  dialog --body 'Do you want to proceed?' && do_something
-
-This will result in F<do_something> only being executed if the user presses the first button. An error or the user pressing the second button with NOT result in F<do_something> being executed. Note though that the text window server's notifier implementation appears to assign the first button one (1) and the second, zero (0). Also, on the 3rd edition of S60 killing a dialog command while it is running will result in the handset resetting itself when the actual dialog is dismissed.
-
-The environment variable C<DIALOG_IMPL> can be used to control the way in which the user is interacted with. The following values of C<DIALOG_IMPL> are supported:
-
-=over 5
-
-=item C<notifier>
+Up to two buttons are supported. If neither C<--first-button> or C<--second-button> are specified, two buttons are shown, C<OK> and C<Cancel>. The button the user selected can be determined by the return code of the command. The first button will produce a return code of zero (0), and the second a code of one (1). If there was an error displaying the dialog, the error code will be returned (always a negative number). The return code makes it possible to write scripts like:
 
-The C<RNotifier> API will be used. This is the default if C<DIALOG_IMPL> is not defined The behaviour of C<RNotifier> depends on the handset configuration, but normally it will result in graphical dialogs being displayed.
-
-=item C<console>
-
-The user will be interacted with via the console that the dialog command is connected to. In this mode, pressing the enter (or on some platforms, select) key corresponds to pressing the first button and any other corresponds to pressing the second button.
+  dialog "Do you want to proceed?" && do_something
 
-=item C<null>
-
-No attempt is made to interact with the user and it is assumed that the first button is always pressed. This mode allows all user interaction to be disabled.
-
-=back
+This will result in C<do_something> only being executed if the user presses the first button. An error or the user pressing the second button with NOT result in C<do_something> being executed. Note that killing a dialog command while it is running will usually result in the device crashing or hanging, to prevent this the dialog command traps the CTRL-C key combination.
 
 ==argument string body optional
 
@@ -48,7 +30,7 @@
 
 ==option string t title
 
-The title of the dialog.
+The title of the dialog. If not specified, defaults to "Attention".
 
 ==option string f first-button
 
@@ -58,6 +40,22 @@
 
 The text for the first button.
 
+==option enum m mode DIALOG_IMPL
+
+Specify the way in which the dialog is displayed. If not specified the default is "notifier".
+
+==enum-value notifier
+
+The C<RNotifier> API will be used. The behaviour of C<RNotifier> depends on the handset configuration, but normally it will result in a graphical dialog being displayed.
+
+==enum-value console
+
+The user will be interacted with via the console that the dialog command is connected to. In this mode, pressing the enter (or on some platforms, select) key corresponds to pressing the first button and any other input corresponds to pressing the second button.
+
+==enum-value null
+
+The dialog is not shown to the user and it is assumed that the first button is always pressed. This mode allows all user interaction to be disabled.
+
 ==copyright
 
 Copyright (c) 2006-2010 Accenture. All rights reserved.