diff --git a/Manual.md b/Manual.md
index 616654a..3054e3d 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1,8 +1,5 @@
 *Attention: this page is for Tahoe-LAFS developers. If you are not a Tahoe-LAFS developer, then the page you want is [quickstart.rst]source:docs/quickstart.rst.*
 
-see also [Installation](Installation), [OSPackages](OSPackages), [Manual](Manual), [Packaging](Packaging), [NewbieDeveloperSetup](NewbieDeveloperSetup), and [CompileError](CompileError)
-
-
 RE: [//pipermail/tahoe-dev/2012-March/007149.html], work in progress...
 
 
@@ -15,10 +12,20 @@ RE: [//pipermail/tahoe-dev/2012-March/007149.html], work in progress...
 [What is Tahoe-LAFS?]source:docs/about.rst
 
 [Why use Tahoe-LAFS?](UseCases)
+FAQ
+### Installation
 
-### [Installation]source:docs/quickstart.rst
+[Quickstart]source:docs/quickstart.rst
 
-### [Configuration]source:docs/configuration.rst
+[Installation](Installation)
+
+[Operating System Packages](OSPackages)
+
+[CompileError](CompileError)
+
+### Configuration
+
+[Configuration file]source:docs/configuration.rst
 
 ### Usage
 
@@ -30,8 +37,6 @@ RE: [//pipermail/tahoe-dev/2012-March/007149.html], work in progress...
 
 [(S)FTP]source:docs/frontends/FTP-and-SFTP.rst
 
-***
-
 [Statistics]source:docs/stats.rst
 
 [Upload Helper]source:docs/helper.rst
@@ -60,6 +65,10 @@ RE: [//pipermail/tahoe-dev/2012-March/007149.html], work in progress...
 
 [Logging]source:docs/logging.rst
 
+### Development
+
+[Developer set-up](NewbieDeveloperSetup)
+
 [Coding standards](CodingStandards)
 
 [Writing tests](HowToWriteTests)
@@ -76,9 +85,11 @@ RE: [//pipermail/tahoe-dev/2012-March/007149.html], work in progress...
 
 ### Packaging
 
+[Packaging](Packaging)
+
 ### The Future
 
-Ostrom
+[Ostrom](Ostrom)
 
 [NewAccountingDesign](NewAccountingDesign)
 
@@ -86,12 +97,11 @@ Ostrom
 
 [NewCapDesign](NewCapDesign)
 
-GSoCIdeas
+[GSoCIdeas](GSoCIdeas)
+
+[Bibliography](Bibliography)
 
 </td>
 
-Useful pages which should be in the manual (but where?):
-FAQ, [TipsTricks](TipsTricks), Bibliography
-
 Useful resources which don't necessarily belong in the manual:
 [The story of a file](http://bigasterisk.com/tahoe-playground), [TestGrid](TestGrid), [PresentationsPapers](Dev#PresentationsPapers)
\ No newline at end of file