9 files changed, 37 insertions, 11 deletions
diff --git a/doc/context/scripts/mkiv/context.html b/doc/context/scripts/mkiv/context.html
index 9a8a18609..3262b91d1 100644
--- a/doc/context/scripts/mkiv/context.html
+++ b/doc/context/scripts/mkiv/context.html
@@ -62,7 +62,8 @@
         <tr><th>--directives</th><td>list</td><td>set directive variables (show list with --showdirectives)</td></tr>
         <tr><th>--silent</th><td>list</td><td>disable logcatgories (show list with --showlogcategories)</td></tr>
         <tr><th>--strip</th><td></td><td>strip Lua code (only meant for production where no errors are expected)</td></tr>
-        <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when ----silent)</td></tr>
+        <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when --silent)</td></tr>
+        <tr><th>--htmlerrorpage</th><td></td><td>generate html error page instead (optional: =scite)</td></tr>
         <tr><th>--noconsole</th><td></td><td>disable logging to the console (logfile only)</td></tr>
         <tr><th>--purgeresult</th><td></td><td>purge result file before run</td></tr>
         <tr><th/><td/><td/></tr>
@@ -83,8 +84,10 @@
         <tr><th/><td/><td/></tr>
         <tr><th>--batchmode</th><td></td><td>run without stopping and do not show messages on the console</td></tr>
         <tr><th>--nonstopmode</th><td></td><td>run without stopping</td></tr>
+        <tr><th/><td/><td/></tr>
         <tr><th>--nosynctex</th><td></td><td>never initializes synctex (for production runs)</td></tr>
         <tr><th>--synctex</th><td></td><td>run with synctex enabled (better use \setupsynctex[state=start]</td></tr>
+        <tr><th/><td/><td/></tr>
         <tr><th>--nodates</th><td></td><td>omit runtime dates in pdf file (optional value: a number (this 1970 offset time) or string "YYYY-MM-DD HH:MM")</td></tr>
         <tr><th>--nocompression</th><td></td><td>forcefully turns off compression in the backend</td></tr>
         <tr><th>--trailerid</th><td></td><td>alternative trailer id (or constant one)</td></tr>
diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man
index 5f28efd81..04e3fdc1a 100644
--- a/doc/context/scripts/mkiv/context.man
+++ b/doc/context/scripts/mkiv/context.man
@@ -69,7 +69,10 @@ disable logcatgories (show list with --showlogcategories)
 strip Lua code (only meant for production where no errors are expected)
 .TP
 .B --errors=list
-show errors at the end of a run, quit when in list (also when ----silent)
+show errors at the end of a run, quit when in list (also when --silent)
+.TP
+.B --htmlerrorpage
+generate html error page instead (optional: =scite)
 .TP
 .B --noconsole
 disable logging to the console (logfile only)
diff --git a/doc/context/scripts/mkiv/context.xml b/doc/context/scripts/mkiv/context.xml
index b0566517d..0c7038d26 100644
--- a/doc/context/scripts/mkiv/context.xml
+++ b/doc/context/scripts/mkiv/context.xml
@@ -74,7 +74,10 @@
                     <short>strip Lua code (only meant for production where no errors are expected)</short>
                 </flag>
                 <flag name="errors" value="list">
-                    <short>show errors at the end of a run, quit when in list (also when <ref name="--silent"/>)</short>
+                    <short>show errors at the end of a run, quit when in list (also when <ref name="silent"/>)</short>
+                </flag>
+                <flag name="htmlerrorpage">
+                    <short>generate html error page instead (optional: =scite)</short>
                 </flag>
                 <flag name="noconsole">
                     <short>disable logging to the console (logfile only)</short>
@@ -131,12 +134,16 @@
                 <flag name="nonstopmode">
                     <short>run without stopping</short>
                 </flag>
+            </subcategory>
+            <subcategory>
                 <flag name="nosynctex">
                     <short>never initializes synctex (for production runs)</short>
                 </flag>
                 <flag name="synctex">
                     <short>run with synctex enabled (better use \setupsynctex[state=start]</short>
                 </flag>
+            </subcategory>
+            <subcategory>
                 <flag name="nodates">
                     <short>omit runtime dates in pdf file (optional value: a number (this 1970 offset time) or string "YYYY-MM-DD HH:MM")</short>
                 </flag>
@@ -146,7 +153,7 @@
                 <flag name="trailerid">
                     <short>alternative trailer id (or constant one)</short>
                 </flag>
-                </subcategory>
+            </subcategory>
             <subcategory>
                 <flag name="generate">
                     <short>generate file database etc. (as luatools does)</short>
diff --git a/doc/context/scripts/mkiv/mtx-context.html b/doc/context/scripts/mkiv/mtx-context.html
index 9a8a18609..3262b91d1 100644
--- a/doc/context/scripts/mkiv/mtx-context.html
+++ b/doc/context/scripts/mkiv/mtx-context.html
@@ -62,7 +62,8 @@
         <tr><th>--directives</th><td>list</td><td>set directive variables (show list with --showdirectives)</td></tr>
         <tr><th>--silent</th><td>list</td><td>disable logcatgories (show list with --showlogcategories)</td></tr>
         <tr><th>--strip</th><td></td><td>strip Lua code (only meant for production where no errors are expected)</td></tr>
-        <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when ----silent)</td></tr>
+        <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when --silent)</td></tr>
+        <tr><th>--htmlerrorpage</th><td></td><td>generate html error page instead (optional: =scite)</td></tr>
         <tr><th>--noconsole</th><td></td><td>disable logging to the console (logfile only)</td></tr>
         <tr><th>--purgeresult</th><td></td><td>purge result file before run</td></tr>
         <tr><th/><td/><td/></tr>
@@ -83,8 +84,10 @@
         <tr><th/><td/><td/></tr>
         <tr><th>--batchmode</th><td></td><td>run without stopping and do not show messages on the console</td></tr>
         <tr><th>--nonstopmode</th><td></td><td>run without stopping</td></tr>
+        <tr><th/><td/><td/></tr>
         <tr><th>--nosynctex</th><td></td><td>never initializes synctex (for production runs)</td></tr>
         <tr><th>--synctex</th><td></td><td>run with synctex enabled (better use \setupsynctex[state=start]</td></tr>
+        <tr><th/><td/><td/></tr>
         <tr><th>--nodates</th><td></td><td>omit runtime dates in pdf file (optional value: a number (this 1970 offset time) or string "YYYY-MM-DD HH:MM")</td></tr>
         <tr><th>--nocompression</th><td></td><td>forcefully turns off compression in the backend</td></tr>
         <tr><th>--trailerid</th><td></td><td>alternative trailer id (or constant one)</td></tr>
diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man
index 5f28efd81..04e3fdc1a 100644
--- a/doc/context/scripts/mkiv/mtx-context.man
+++ b/doc/context/scripts/mkiv/mtx-context.man
@@ -69,7 +69,10 @@ disable logcatgories (show list with --showlogcategories)
 strip Lua code (only meant for production where no errors are expected)
 .TP
 .B --errors=list
-show errors at the end of a run, quit when in list (also when ----silent)
+show errors at the end of a run, quit when in list (also when --silent)
+.TP
+.B --htmlerrorpage
+generate html error page instead (optional: =scite)
 .TP
 .B --noconsole
 disable logging to the console (logfile only)
diff --git a/doc/context/scripts/mkiv/mtx-context.xml b/doc/context/scripts/mkiv/mtx-context.xml
index b0566517d..0c7038d26 100644
--- a/doc/context/scripts/mkiv/mtx-context.xml
+++ b/doc/context/scripts/mkiv/mtx-context.xml
@@ -74,7 +74,10 @@
                     <short>strip Lua code (only meant for production where no errors are expected)</short>
                 </flag>
                 <flag name="errors" value="list">
-                    <short>show errors at the end of a run, quit when in list (also when <ref name="--silent"/>)</short>
+                    <short>show errors at the end of a run, quit when in list (also when <ref name="silent"/>)</short>
+                </flag>
+                <flag name="htmlerrorpage">
+                    <short>generate html error page instead (optional: =scite)</short>
                 </flag>
                 <flag name="noconsole">
                     <short>disable logging to the console (logfile only)</short>
@@ -131,12 +134,16 @@
                 <flag name="nonstopmode">
                     <short>run without stopping</short>
                 </flag>
+            </subcategory>
+            <subcategory>
                 <flag name="nosynctex">
                     <short>never initializes synctex (for production runs)</short>
                 </flag>
                 <flag name="synctex">
                     <short>run with synctex enabled (better use \setupsynctex[state=start]</short>
                 </flag>
+            </subcategory>
+            <subcategory>
                 <flag name="nodates">
                     <short>omit runtime dates in pdf file (optional value: a number (this 1970 offset time) or string "YYYY-MM-DD HH:MM")</short>
                 </flag>
@@ -146,7 +153,7 @@
                 <flag name="trailerid">
                     <short>alternative trailer id (or constant one)</short>
                 </flag>
-                </subcategory>
+            </subcategory>
             <subcategory>
                 <flag name="generate">
                     <short>generate file database etc. (as luatools does)</short>
diff --git a/doc/context/scripts/mkiv/mtx-scite.html b/doc/context/scripts/mkiv/mtx-scite.html
index 497098f9e..957d7595e 100644
--- a/doc/context/scripts/mkiv/mtx-scite.html
+++ b/doc/context/scripts/mkiv/mtx-scite.html
@@ -41,7 +41,7 @@
         <tr><th/><td/><td/></tr>
         <tr><th>--words</th><td></td><td>convert spell-*.txt into spell-*.lua</td></tr>
         <tr><th>--tree</th><td></td><td>converts a tree into an html tree (--source --target --numbers)</td></tr>
-        <tr><th>--file</th><td></td><td>converts a file into an html tree (--source --target --numbers --lexer)</td></tr>
+        <tr><th>--file</th><td></td><td>converts a file into an html file (--source --target --numbers --lexer)</td></tr>
     </table>
 <br/>
             </div>
diff --git a/doc/context/scripts/mkiv/mtx-scite.man b/doc/context/scripts/mkiv/mtx-scite.man
index 60450c516..cdae4ff23 100644
--- a/doc/context/scripts/mkiv/mtx-scite.man
+++ b/doc/context/scripts/mkiv/mtx-scite.man
@@ -18,7 +18,7 @@ convert spell-*.txt into spell-*.lua
 converts a tree into an html tree (--source --target --numbers)
 .TP
 .B --file
-converts a file into an html tree (--source --target --numbers --lexer)
+converts a file into an html file (--source --target --numbers --lexer)
 .SH AUTHOR
 More information about ConTeXt and the tools that come with it can be found at:
 
diff --git a/doc/context/scripts/mkiv/mtx-scite.xml b/doc/context/scripts/mkiv/mtx-scite.xml
index 65ad8736a..f49aa8116 100644
--- a/doc/context/scripts/mkiv/mtx-scite.xml
+++ b/doc/context/scripts/mkiv/mtx-scite.xml
@@ -10,7 +10,7 @@
    <subcategory>
     <flag name="words"><short>convert spell-*.txt into spell-*.lua</short></flag>
     <flag name="tree"><short>converts a tree into an html tree (--source --target --numbers)</short></flag>
-    <flag name="file"><short>converts a file into an html tree (--source --target --numbers --lexer)</short></flag>
+    <flag name="file"><short>converts a file into an html file (--source --target --numbers --lexer)</short></flag>
    </subcategory>
   </category>
  </flags>