diff --git a/website/content/docs/server-config b/website/content/docs/server-config
index c6b06d759..ae9805b4e 100644
--- a/website/content/docs/server-config
+++ b/website/content/docs/server-config
@@ -39,7 +39,7 @@ web browser and restart the server.</p>
 <li><b><code>sourceRoot</code></b>: Optional. If non-empty, it specifies the path to an alternative Camlistore source tree, in order to override the embedded UI and/or Closure resources. The UI files will be expected in <code><b>&lt;sourceRoot&gt;</b>/server/camlistored/ui</code> and the Closure library in <code><b>&lt;sourceRoot&gt;</b>/third_party/closure/lib</code>.</li>
 </ul>
 
-<h2>Storage options</h2>
+<h2 id="storage">Storage options</h2>
 <p>At least one of these must be set:</p>
 <ul>
 <li><b><code>blobPath</code></b>: local disk path to store blobs</li>
@@ -49,7 +49,7 @@ web browser and restart the server.</p>
 <p>Others aren't yet supported by the simple config mode. Patches
 to <code>pkg/genconfig</code> welcome.</p>
 
-<h2>Indexing options</h2>
+<h2 id="indexing">Indexing options</h2>
 <p>Unless <b><code>runIndex</code></b> is set to <code>false</code>, exactly one of these must be set:</p>
 <ul>
 <li><b><code>sqlite</code></b>: path to SQLite database file to use for indexing</li>
@@ -63,7 +63,7 @@ to <code>pkg/genconfig</code> welcome.</p>
 <p>There's also an in-memory index type, but only in the low-level
 config, as used by <code>devcam server</code>.</p>
 
-<h2>Publishing options</h2>
+<h2 id="publishing">Publishing options</h2>
 <p>Although limited, publishing can be configured through the <b><code>publish</code></b> key. There is only support for an image gallery view (even though it will display thumbnails for other kinds of items), which is not really customizable. Here is an example of a value if one wanted to publish some items under <code>/pics/</code>:</p>
 <pre>
 {
@@ -100,7 +100,7 @@ The following steps should get you started with MySQL:
 Setting up MongoDB is even simpler, but the MongoDB indexer is not as well tested as the MySQL one.
 </p>
 
-<h2>App Engine</h2>
+<h2 id="appengine">App Engine</h2>
 
 <p>
 Most configuration doesn't apply on App Engine as it's pre-configured