deploy: c7e4981945

edge/config/setup.sh/index.html

@@ -1316,12 +1316,8 @@
 <div class="highlight"><pre><span></span><code>wget https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/master/setup.sh
 chmod a+x ./setup.sh
 </code></pre></div>
-<div class="admonition info">
-<p class="admonition-title">Info</p>
-<p>Make sure to get the <code>setup.sh</code> that comes with the release you're using. Look up the release and the git commit on which this release is based upon by selecting the appropriate tag on GitHub. This can done with the "Switch branches/tags" button on GitHub, choosing the right tag. This is done in order to rule out possible inconsistencies between versions.</p>
-</div>
 <h2 id="usage"><a class="toclink" href="#usage">Usage</a></h2>
-<p>Run <code>./setup.sh help</code> and you'll get some usage information:</p>
+<p>Run <code>./setup.sh help</code> and you'll get <del>all you have ever wanted</del> some usage information:</p>
 <div class="highlight"><pre><span></span><code>SETUP(1)
 
 NAME
@@ -1355,28 +1351,6 @@ VERSION
     following URL, where TAG looks like &#39;vX.X.X&#39;:
     https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/TAG/setup.sh
 
-OPTIONS
-    Config path, container or image adjustments
-        -i IMAGE_NAME
-            Provides the name of the docker-mailserver image. The default value is
-            docker.io/mailserver/docker-mailserver:latest
-
-        -c CONTAINER_NAME
-            Provides the name of the running container.
-
-        -p PATH
-            Provides the config folder path. The default is
-            /home/maxwell/Dokumente/github/docker-mailserver/config/
-
-    SELinux
-        -z
-            Allows container access to the bind mount content that is shared among
-            multiple containers on a SELinux-enabled host.
-
-        -Z
-            Allows container access to the bind mount content that is private and
-            unshared with other containers on a SELinux-enabled host.
-
 [SUB]COMMANDS
     COMMAND email :=
         ./setup.sh email add &lt;EMAIL ADDRESS&gt; [&lt;PASSWORD&gt;]
@@ -1422,6 +1396,28 @@ EXAMPLES
         This will provide you with a detailed explanation on how to use the 
         config dkim command, showing what arguments can be passed and what they do.
 
+OPTIONS
+    Config path, container or image adjustments
+        -i IMAGE_NAME
+            Provides the name of the docker-mailserver image. The default value is
+            docker.io/mailserver/docker-mailserver:latest
+
+        -c CONTAINER_NAME
+            Provides the name of the running container.
+
+        -p PATH
+            Provides the config folder path to the temporary container 
+            (does not work if docker-mailserver container already exists).
+
+    SELinux
+        -z
+            Allows container access to the bind mount content that is shared among
+            multiple containers on a SELinux-enabled host.
+
+        -Z
+            Allows container access to the bind mount content that is private and
+            unshared with other containers on a SELinux-enabled host.
+
 EXIT STATUS
     Exit status is 0 if the command was successful. If there was an unexpected error, an error
     message is shown describing the error. In case of an error, the script will exit with exit