8 files changed, 57 insertions, 11 deletions
diff --git a/doc/guide.html b/doc/guide.html
index 69c94f4..4b0a35f 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -60,16 +60,59 @@
 	a small trading outpost on the edge of the civilized world.
 	You begin the game as the proud owner of a small trading vessel and a modest amount of credits.
 </p><p>
-	<img src="icons/launch.png" ALT=""> Click the <span class="fixed">Launch</span> icon on the top of the screen to launch into space.
+	You're currently docked at a space station and you're looking at a menu with available actions,
+	but first, we take a look at the icons on the top of the screen. This icons are available most
+	of the time and open the game's main information windows.
 </p>
-</div>
+	<table>
+	<tr>
+		<td><img src="icons/menu.png" ALT=""></td>
+		<td>Menu</td>
+		<td>Opens the main menu</td>
+	</tr>
+
+	<tr>
+		<td><img src="icons/launch.png" ALT=""></td>
+		<td>Launch</td>
+		<td>(not visible in space) If you're docked on a planet or space station, you can use this icon to launch your ship into space.</td>
+	</tr>
+	<tr>
+		<td><img src="icons/dock.png" ALT=""></td>
+		<td>Dock</td>
+		<td>(not visible when docked) In space, you can use this icon to dock with the selected planet or station</td>
+	</tr>
+
+	<tr>
+		<td><img src="icons/home.png" ALT=""></td>
+		<td>Home</td>
+		<td>When docked, this icon will return you to the planet or station's main menu</td>
+	</tr>
+
+	<tr>
+		<td><img src="icons/inventory.png" ALT=""></td>
+		<td>Inventory</td>
+		<td>Opens the inventory window</td>
+	</tr>
 
-<div id="controls" class="title">
-	Controls
+	<tr>
+		<td><img src="icons/map.png" ALT=""></td>
+		<td>Map</td>
+		<td>Opens the map window</td>
+	</tr>
+
+	<tr>
+		<td><img src="icons/chat.png" ALT=""></td>
+		<td>Chat</td>
+		<td>Opens the chat window</td>
+	</tr>
+</table>
+<p>
+	<img src="icons/launch.png" ALT=""> Click on the launch icon to leave the station and launch into space. The launch button will change into a dock button.
+</p>
 </div>
 
 <div class="subtitle">
-	Camera
+	Camera controls
 </div>
 
 <div class="text">
diff --git a/doc/icons/chat.png b/doc/icons/chat.png
new file mode 100644
index 0000000..711b4d1
--- /dev/null
+++ b/doc/icons/chat.png
diff --git a/doc/icons/dock.png b/doc/icons/dock.png
new file mode 100644
index 0000000..b460f2c
--- /dev/null
+++ b/doc/icons/dock.png
diff --git a/doc/icons/home.png b/doc/icons/home.png
new file mode 100644
index 0000000..f45c2a3
--- /dev/null
+++ b/doc/icons/home.png
diff --git a/doc/icons/inventory.png b/doc/icons/inventory.png
new file mode 100644
index 0000000..6b52d45
--- /dev/null
+++ b/doc/icons/inventory.png
diff --git a/doc/icons/map.png b/doc/icons/map.png
new file mode 100644
index 0000000..90acb27
--- /dev/null
+++ b/doc/icons/map.png
diff --git a/doc/icons/menu.png b/doc/icons/menu.png
new file mode 100644
index 0000000..c70b7e9
--- /dev/null
+++ b/doc/icons/menu.png
diff --git a/doc/installation.html b/doc/installation.html
index 24e4fa6..81d72db 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -82,7 +82,7 @@
 
 <p>
 	Linux download:<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-linux-latest.zip">osirion-linux-latest.zip</a>(32- and 64-bit)<br>
+	<a href="http://ingar.satgnu.net/osirion/files/osirion-linux-latest.zip">osirion-linux-latest.zip</a> (32- and 64-bit)<br>
 	This package contains the linux version of the client and the server.
 <p>
 	Extract the package, a new subdirectory will be created. The actual directory name will depend on
@@ -235,7 +235,7 @@ autoreconf -fi<br>
 </p>
 
 <div class="code">
-./configure --without-client
+./configure --without-client --with-bullet=/usr
 </div>
 <p>
 	If <span class="fixed">configure</span> finds ncurses or pdcurses, the dedicated server will use this
@@ -243,9 +243,6 @@ autoreconf -fi<br>
 	<span class="fixed">--without-curses</span> option to <span class="fixed">configure</span>.
 </p>
 <p>
-	<b>Important</b>: <span class="fixed">make install</span> is not supported. Results are unpredictable.
-</p>
-<p>
 	Compile the source code:
 </p>
 <div class="code">
@@ -254,6 +251,10 @@ make
 <p>
 	The binaries will be build in the <span class="fixed">src</span> subdirectory of the main distribution.
 </p>
+<p>
+	<b>Important</b>: <span class="fixed">make install</span> is not supported. Results are unpredictable.
+</p>
+
 </div>
 
 <div class="subtitle">
@@ -410,6 +411,8 @@ Organization of the distribution
 
 	index.html		Documentation content
 	installation.html	Installation instructions (this file)
+	guide.html		Player guide
+	manual.html		User manual
 
 /src 	C++ source code
 
@@ -433,7 +436,7 @@ Organization of the distribution
 	/base			game data files
 		/bitmaps	essential bitmaps
 		/ini		game world description files
-		/maps		3D models (.map format)
+		/maps		3D models (map format)
 		/materials	material definitions
 		/models		3D models (ase and other formats)
 		/particles	particle definitions