cleanups

3 files changed, 46 insertions, 10 deletions

diff --git a/doc/TODO b/doc/TODO
index e8893bf..dfd3253 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -60,6 +60,7 @@ client:
 	gui concept artwork
 
 gui:
+	fix chat while docked
 
 render:
 	star light strenght
diff --git a/doc/guide.html b/doc/guide.html
index b923c5e..100ee3c 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -37,6 +37,7 @@
 <p>
 	This is the default joystick configuration:
 </p>
+
 <h2 class="navigate">
 	<a href="index.html">back</a>
 </h2>
diff --git a/doc/world.html b/doc/world.html
index 82908dd..0f127dc 100644
--- a/doc/world.html
+++ b/doc/world.html
@@ -302,29 +302,58 @@ direction=45
 </pre>
 
 <h3>
-	[jumpgate]
+	[navpoint]
 </h3>
 <p>
-		TODO
+	Space is huge and barren wasteland.  Navigation points are an easy way to provide players
+	with landmarks. The default navigation point is a diamond-shaped entity.
 </p>
+<pre>
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=716 -1008 20
+</pre>
+
 <h3>
 	[jumppoint]
 </h3>
 <p>
-		TODO
+	Jumppoints are the key to interstellar travel. A ship equiped with a hyperspace
+	jump drive can use it to travel to other starsystems. A jumppoint looks like a
+	navigation point, but needs the <i>target</i> key to indicate where it is leading to.
 </p>
+
+<table>
+	<tr>
+		<td class="wide"><i>target =</i></td>
+		<td class="narrow"><strong>[string]:[string]</strong></td>
+		<td><i>zone</i>:<i>entity</i><br>
+				the label of a the target zone and the target jumppoint.
+		<td>
+	</tr>
+</table>
+
 <h3>
-	[navpoint]
+	[jumpgate]
 </h3>
 <p>
-	Space is huge and barren wastland.  Navigation points are an easy way to provide players
-	with landmarks. The default navigation point is a diamond-shaped entity.
+	Jumpgates are build on top of jumppoints and can be docked by smaller ships
+	to travel to other starsystems. Just like the jumppoint section, the <i>jumpgate</i>
+	section needs a <i>target</i> to indicate where it is leading to.
+<p>
+	Jumppoints and jumpgates can target each other and ships equiped with a hyperspace
+	jumpdrive can still use the jumpgate to jump as usual.
 </p>
 <pre>
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=716 -1008 20
+[jumpgate]
+label=jumpgate_brogha
+name=Jumpgate Ghant -> Brogha
+model=satellites/jumpgate
+target=brogha:jumpgate_ghant
+location=716 -1024 24
+direction=90
+color=222 192 145
 </pre>
 
 <h3>
@@ -402,5 +431,10 @@ radius=96
 	The engine supports textures in the TGA, PNG and JPG file formats. The filename extension
 	should be lowercase and the texture should be in 24bit RGB or 32bit RGBA format.
 </p>
+
+<h2 class="navigate">
+	<a href="index.html">back</a>
+</h2>
+
 </body>
 </html>