diff --git a/docs/commandline.xml b/docs/commandline.xml
index d31e374b..23b14c13 100644
--- a/docs/commandline.xml
+++ b/docs/commandline.xml
@@ -4,15 +4,62 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" lang="en" xml:lang="en">
   <head>
-    <title>Command-line arguments</title>
+    <title>
+      Command-line arguments
+    </title>
   </head>
   <body>
-    <h1>Command-line arguments</h1>
-    <h2>About</h2>
-      <p>
-        If you open the file <i>assaultcube.bat</i> (or the respective .sh file in linux) with a text editor, you can add or
-        change command line options. Some of these settings can be set ingame as well using the menu.
-      </p>
+    <h1>
+      Command-line arguments
+    </h1>
+    
+    <h2>
+      About
+    </h2>
+    <p>
+      When launching AssaultCube, you need to use a small script file, irrespective of operating system. These script files can be modified
+      with "switches" to allow different settings to occur on startup. Note: Some of these options can be changed in-game through the menus
+      without the need to manually edit the script file.
+    </p>
+      
+    <h2 id="launcher">
+      How to edit the AssaultCube launcher
+    </h2>
+    <h3>
+      Microsoft Windows
+    </h3>
+    <p>
+      In the AssaultCube folder, there is a file named "<i>assaultcube.bat</i>". Right click this and open it with "notepad" to edit the clients launcher. 
+      <br />Also, after using the server wizard, in this folder will be "<i>server_autoconfigured.bat</i>". 
+      Right click this and open it with "notepad" to edit the servers launcher.
+    </p>
+    <p>
+      All switches are placed after the phrase: <span class="code">bin_win32\ac_client.exe</span><br />
+      (If you're editing the client, you'll need to add it before the phrase: <span class="code">%1 %2 %3 %4 %5</span>).
+    </p>
+    <p>
+      Remember to save once you're finished!
+    </p>
+    <h3>
+      Linux
+    </h3>
+    <p>
+      In the AssaultCube folder, there is a file named "<i>assaultcube.sh</i>". Open it with your favourite text editor, such as 
+      Gedit, Nano, etc. to edit the clients launcher. 
+      <br />Also, after using the server wizard, in this folder will be "<i>server_autogenerated.sh</i>". 
+      Open it with your favourite text editor to edit the servers launcher.
+    </p>
+    <p>
+      All switches for the client must be put inside the quote marks on this line:
+      <span class="code">CUBE_OPTIONS="--home=${HOME}/.assaultcube --init"</span>
+    </p>
+    <p>
+      All switches for the server must be placed after the phrase: <span class="code">./server.sh</span>.
+    </p>
+    <p>
+      Remember to save once you're finished!
+    </p>
+    
     
     <h2>Client</h2>