diff --git a/HACKING.md b/HACKING.md
index 74a6eedcb..9b1ffe68a 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -68,13 +68,13 @@ However, for some reason, you wish setup manually, the following tips will help:
    as possible). Simply run it as:
 
    ```
-   $ sudo ./run --debug
+   $ sudo ./run --debug --develop
    ```
 
    In this mode, FreedomBox Service (Plinth) runs in working directory without
-   need for installation. It uses the `plinth.conf` config file in the working
-   directory if no regular config file (`/etc/plinth/plinth.conf`) is found. It
-   creates all that data and runtime files in `data/var/*`.
+   need for installation. The `plinth.conf` config file and the action
+   scripts of the working directory are used. It creates all that data and
+   runtime files in `data/var/*`.
 
    *Note:* This mode is supported only in a limited manner.  The following are
    the unknown issues with it:
diff --git a/doc/plinth.xml b/doc/plinth.xml
index 40412c405..6a533b293 100644
--- a/doc/plinth.xml
+++ b/doc/plinth.xml
@@ -39,6 +39,7 @@
       <arg><option>-h, </option><option>--help</option></arg>
       <arg><option>--server_dir</option><arg choice="req">SERVER_DIR</arg></arg>
       <arg><option>--debug</option></arg>
+      <arg><option>--develop</option></arg>
       <arg><option>--diagnose</option></arg>
       <arg>
         <option>--setup</option>
@@ -92,11 +93,7 @@
             shipped with a value of <filename>/plinth</filename> in
             <filename>/etc/plinth/plinth.config</filename>.  This
             means that Plinth will be available as
-            http://localhost:8000/plinth by default.  When
-            <filename>/etc/plinth/plinth.config</filename> is not
-            available, <filename>plinth.config</filename> from current
-            directory is used.  In source directory, this has the
-            default value of <filename>/</filename>.
+            http://localhost:8000/plinth by default.
           </para>
         </listitem>
       </varlistentry>
@@ -112,6 +109,16 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--develop</option></term>
+        <listitem>
+          <para>
+            Enable development mode.  Use plinth.config and the actions_dir
+            of the current working directory, opposed to the actions_dir
+            and plinth.config file of the operating system installation.
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--diagnose</option></term>
         <listitem>
@@ -200,12 +207,21 @@
     </example>
 
     <example>
-      <title>Run Plinth for debugging</title>
-      <synopsis>$ plinth --server_dir=/plinth --debug</synopsis>
+      <title>Run Plinth with different URL prefix</title>
+      <synopsis>$ plinth --server_dir='/myurl'</synopsis>
       <para>
-        Enable debug mode and run on terminal.  Also override the
-        configuration file value for the URL fragment to start Plinth
-        under and set it to /plinth.
+        Run Plinth with the '/myurl' prefix. Note that Apache forwards requests
+        to '/plinth' by default, so /myurl is not accessible outside of your
+        FreedomBox without adapting the apache configuration.
+      </para>
+    </example>
+
+    <example>
+      <title>Run Plinth in development mode</title>
+      <synopsis>$ plinth --debug --develop</synopsis>
+      <para>
+        Enable debug and development mode and run on terminal.  This uses
+        the configuration and action files of the current working directory.
       </para>
     </example>
   </refsect1>