diff --git a/doc/manual/target.txt b/doc/manual/target.txt
index 26f7708480ff4a375c768412f0f4c1a01eded111..d569711d64f554590036217665e6723a0f984a9e 100644
--- a/doc/manual/target.txt
+++ b/doc/manual/target.txt
@@ -23,12 +23,6 @@ This section needs to describe OpenOCD's ARM target support.
 
  */
 
-/** @page targetnotarm OpenOCD Non-ARM Targets
-
-This section needs to describe OpenOCD's non-ARM target support.
-
- */
-
 /** @page targetregister OpenOCD Target Register API
 
 This section needs to describe OpenOCD's Target Register API, as
diff --git a/src/non-arm-targets.txt b/doc/manual/target/notarm.txt
similarity index 79%
rename from src/non-arm-targets.txt
rename to doc/manual/target/notarm.txt
index 2d49c882184e045707053cf775970e02c93d69ea..c368ed1c87c00604808b493da57f996cc9fae0a3 100644
--- a/src/non-arm-targets.txt
+++ b/doc/manual/target/notarm.txt
@@ -1,15 +1,9 @@
-Some outstanding issues w.r.t. non-ARM32 targets
-================================================
-This file describes outstanding issues w.r.t.
-non-ARM32 targets.
+/** @page targetnotarm OpenOCD Non-ARM Targets
 
-Ideas & patches welcome!
+This page describes outstanding issues w.r.t. non-ARM targets.
 
+@section targetnotarmflash Flash drivers
 
-
-
-Flash drivers
--------------
 The flash drivers contain ARM32 code that is used
 to execute code on the target.
 
@@ -26,23 +20,22 @@ compile the target flash drivers. Perhaps
 using automake?
 
 
-
 eCos has CFI driver that could probably be compiled
 for all targets. The trick is to figure out a
 way to make the compiled flash drivers work
 on all target memory maps + sort out all the
 little details
 
-32 vs. 64 bit
--------------
+@section targetnotarm32v64 32 vs. 64 bit
+
 Currently OpenOCD only supports 32 bit targets.
 
 Adding 64 bit support would be nice but there
 hasn't been any call for it in the openocd development
 mailing list
 
-target support
---------------
+@section targetnotarmsupport Target Support
+
 target.h is relatively CPU agnostic and
 the intention is to move in the direction of less 
 instruction set specific.
@@ -53,8 +46,8 @@ An example is FPGA programming support via JTAG,
 but also flash chips can be programmed directly
 using JTAG.
 
-non-JTAG physical layer
------------------------
+@section targetnotarmphy non-JTAG physical layer
+
 JTAG is not the only physical protocol used to talk to
 CPUs.
 
@@ -64,13 +57,15 @@ The actual physical layer is a relatively modest part
 of the total OpenOCD system.
 
  
-PowerPC
--------
+@section targetnotarmppc PowerPC
+
 there exists open source implementations of powerpc
 target manipulation, but there hasn't been a lot
 of activity in the mailing list.
 
-MIPS
-----
+@section targetnotarmmips MIPS
+
 Currently OpenOCD has a MIPS target defined. This is the
-first non-ARM example of a CPU target
\ No newline at end of file
+first non-ARM example of a CPU target
+
+ */