--- a/ref_os.xmlf
+++ b/ref_os.xmlf
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book [
-<!ENTITY % eclent SYSTEM "ecl.ent">
-%eclent;
-]>
-<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en"><reference xml:id="os.dict"><title>OS Reference</title>
+<?xml version="1.0"?><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book lang="en"><reference id="os.dict"><title>OS Reference</title>
 
  <!-- ====================================================================== -->
  <!-- EXT:*HELP-MESSAGE*                                                     -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref._help-message_">
+ <refentry id="ref._help-message_">
   <refnamediv>
    <refname><varname>ext:*help-message*</varname></refname>
    <refpurpose>Command line help message</refpurpose>
@@ -46,9 +42,9 @@
  <!-- EXT:+LISP-INIT-FILES+                                                  -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref._lisp-init-file-list_">
-  <refnamediv>
-   <refname><varname>ext:*lisp-init-file-list*</varname></refname>
+ <refentry id="ref._lisp-init-files_">
+  <refnamediv>
+   <refname><varname>ext:*lisp-init-files*</varname></refname>
    <refpurpose>&ECL; initialization files.</refpurpose>
   </refnamediv>
 
@@ -87,7 +83,7 @@
  <!-- EXT:+DEFAULT-COMMAND-ARG-RULES+                                        -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref._default-command-arg-rules_">
+ <refentry id="ref._default-command-arg-rules_">
   <refnamediv>
    <refname><varname>ext:+default-command-arg-rules+</varname></refname>
    <refpurpose>&ECL; command line options</refpurpose>
@@ -123,10 +119,10 @@
  <!-- EXT:COMMAND-ARGS                                                       -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref.command-args">
+ <refentry id="ref.command-args">
   <refnamediv>
    <refname><function>ext:command-args</function></refname>
-   <refpurpose>Original list of command line arguments.</refpurpose>
+   <refpurpose>List of command line arguments.</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -161,7 +157,7 @@
  <!-- EXT:PROCESS-COMMAND-ARGS                                               -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref.process-command-args">
+ <refentry id="ref.process-command-args">
   <refnamediv>
    <refname><function>ext:process-command-args</function></refname>
    <refpurpose>Process command line arguments.</refpurpose>
@@ -172,7 +168,7 @@
    <funcsynopsis>
     <funcprototype>
      <funcdef>ext:process-command-args</funcdef>
-     <paramdef><parameter>&key;</parameter></paramdef>
+     <paramdef><parameter>&keys;</parameter></paramdef>
      <paramdef><parameter>args</parameter></paramdef>
      <paramdef><parameter>rules</parameter></paramdef>
     </funcprototype>
@@ -220,10 +216,7 @@
     <varlistentry>
      <term><symbol>:STOP</symbol></term>
      <listitem><para>If present, parsing of arguments stops after this option
-     is found and processed. The list of remaining arguments is passed to
-     the rule. &ECL;'s top-level uses this option with the <symbol>--</symbol>
-     command line option to set <symbol>ext:*unprocessed-ecl-command-args*</symbol>
-     to the list of remaining arguments.</para></listitem>
+     is found and processed.</para></listitem>
     </varlistentry>
     <varlistentry>
      <term><symbol>:NOLOADRC</symbol> and <symbol>:LOADRC</symbol></term>
@@ -240,9 +233,11 @@
    succeeeds.</para>
 
    <para>A special name <literal>"*DEFAULT*"</literal>, matches any unknown
-   command line option. If there is no <literal>"*DEFAULT*"</literal> rule and
-   no match is found, an error is signalled. For each rule that succeeds, the
-   function constructs a lisp statement using the
+   command line option. This template gets a single argument, which is the list
+   of remaining unprocessed options.</para>
+
+   <para>If no match is found, an error is signalled. For each rule
+   that succeeds, the function constructs a lisp statement using the
    <replaceable>template</replaceable>.</para>
 
    <para>After all arguments have been processed,
@@ -274,7 +269,7 @@
 (defconstant +ls-rules+
 '(("--help" 0 (progn (princ ext:*help-message* *standard-output*) (ext:quit 0)))
   ("-?" 0 (progn (princ ext:*help-message* *standard-output*) (ext:quit 0)))
-  ("*DEFAULT*" 1 (print-directory 1) :stop)))
+  ("*DEFAULT*" 1 (print-directory 1))))
 
 (let ((ext:*lisp-init-file-list* NIL)) ; No initialization files
   (handler-case (ext:process-command-args :rules +ls-rules+)
@@ -290,7 +285,7 @@
  <!-- EXT:QUIT                                                               -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref.quit">
+ <refentry id="ref.quit">
   <refnamediv>
    <refname><function>ext:quit</function></refname>
    <refpurpose>Exit &ECL;.</refpurpose>
@@ -328,7 +323,7 @@
  <!-- ====================================================================== -->
  <!-- EXT:RUN-PROGRAM                                                        -->
  <!-- ====================================================================== -->
- <refentry xml:id="ref.run-program">
+ <refentry id="ref.run-program">
   <refnamediv>
    <refname><function>ext:run-program</function></refname>
    <refpurpose>Start and communicate with a child process.</refpurpose>
@@ -341,7 +336,7 @@
      <funcdef>ext:run-program</funcdef>
      <paramdef><parameter>command</parameter></paramdef>
      <paramdef><parameter>argv</parameter></paramdef>
-     <paramdef>&key;</paramdef>
+     <paramdef>&keys;</paramdef>
      <paramdef>input</paramdef>
      <paramdef>output</paramdef>
      <paramdef>error</paramdef>
@@ -437,7 +432,7 @@
  <!-- EXT:SYSTEM                                                             -->
  <!-- ====================================================================== -->
 
- <refentry xml:id="ref.system">
+ <refentry id="ref.system">
   <refnamediv>
    <refname><function>ext:system</function></refname>
    <refpurpose>Invoke a command using the shell.</refpurpose>