diff --git a/32-64-portability.dd b/32-64-portability.dd
index 21fbf55769..b8446a1c49 100644
--- a/32-64-portability.dd
+++ b/32-64-portability.dd
@@ -6,3 +6,6 @@ This page has been moved to
 $(LINK2 http://wiki.dlang.org/Porting_32_Bit_Code_to_64_Bits, http://wiki.dlang.org/Porting_32_Bit_Code_to_64_Bits)
 
 )
+
+Macros:
+WIKI=Porting_32_Bit_Code_to_64_Bits
diff --git a/COM.dd b/COM.dd
index 084128b22d..c708940851 100644
--- a/COM.dd
+++ b/COM.dd
@@ -6,3 +6,6 @@ This page has been moved to
 $(LINK2 http://wiki.dlang.org/COM_Programming, http://wiki.dlang.org/COM_Programming)
 
 )
+
+Macros:
+WIKI=COM_Programming
diff --git a/bugstats.php.dd b/bugstats.php.dd
index bb74b191c8..ed1e13e243 100644
--- a/bugstats.php.dd
+++ b/bugstats.php.dd
@@ -45,3 +45,4 @@ Macros:
   PHP=<?php $0 ?>
   BOOKTABLE = <center><table cellspacing=0 cellpadding=5 valign=top class=book><caption>$1</caption>$2</table></center>
   DISPLAY=$(TR $(TD <font color=$3>$(LINK2 https://issues.dlang.org/buglist.cgi?$2, $1)</font>) $(TD <iframe scrolling=no frameborder=0 width="4.8em" height="1.4em" style="width:4.8em;height:1.4em;" vspace="0" hspace="0" marginwidth="0" marginheight="0" src=fetch-issue-cnt.php?$2&format=table&action=wrap&ctype=csv></iframe>))
+  WIKI=BugStats
diff --git a/builtin.dd b/builtin.dd
index 1e35cab3b4..b2df6de2ec 100644
--- a/builtin.dd
+++ b/builtin.dd
@@ -112,9 +112,6 @@ $(SECTION2 Dynamic Arrays,
 
 $(SECTION2 Strings,
 
-	$(REDO $(P A <a href="cppstrings.html">detailed comparison with C++'s std::string</a>.
-	))
-
 	$(P C++ has, of course, builtin string support in the form of string
 	literals and char arrays. It's just that they suffer from all
 	the weaknesses of C++ builtin arrays.
diff --git a/comparison.dd b/comparison.dd
index c511a5c62d..ca1a61f441 100644
--- a/comparison.dd
+++ b/comparison.dd
@@ -460,9 +460,7 @@ $(SECTION2 Notes,
 	$(DD Part of the standard library for C++ implements strings,
 	however, they are not part of the core language.
 	A conforming freestanding implementation of C++ (C++98 17.4.1.3) does
-	not need to provide these libraries.
-	$(REDO Here's a <a href="cppstrings.html">comparison</a> of C++ strings
-	and D built-in strings.)))
+	not need to provide these libraries.))
 
 	$(P $(DT <a name="debuggers">Use existing debuggers</a>)
 	$(DD By this is meant using common debuggers that can operate
diff --git a/d-array-article.dd b/d-array-article.dd
index b0b6982cbb..6324cc7729 100644
--- a/d-array-article.dd
+++ b/d-array-article.dd
@@ -247,3 +247,5 @@ Macros:
 	CATEGORY_ARTICLES=$0
     STDREF = <a href="phobos/std_$1.html#$2">$(D $2)</a>
     OBJREF = <a href="phobos/object.html#$1">$(D $2)</a>
+    WIKI =
+    _=
diff --git a/dll-linux.dd b/dll-linux.dd
index ab726f6ec3..2fec9c1402 100644
--- a/dll-linux.dd
+++ b/dll-linux.dd
@@ -550,4 +550,3 @@ and the static destructors are called by dlclose().
 Macros:
         TITLE=Writing Shared Libraries With D On Linux
         WIKI=DLLs
-        CATEGORY_HOWTOS=$0
diff --git a/dll.dd b/dll.dd
index a46ffb687d..ee8686609e 100644
--- a/dll.dd
+++ b/dll.dd
@@ -6,3 +6,6 @@ This page has been moved to
 $(LINK2 http://wiki.dlang.org/Win32_DLLs_in_D, http://wiki.dlang.org/Win32_DLLs_in_D)
 
 )
+
+Macros:
+WIKI=Win32_DLLs_in_D
diff --git a/doc.ddoc b/doc.ddoc
index b935652d33..7915d6f114 100644
--- a/doc.ddoc
+++ b/doc.ddoc
@@ -75,10 +75,7 @@ $(DIVC navblock,
     $(TOCENTRY ctod.html,       Converting C to D)
     $(TOCENTRY cpptod.html,     Converting C++ to D)
     $(TOCENTRY pretod.html, The C Preprocessor vs D)
-    $(REDO $(TOCENTRY template-comparison.html, D templates compared))
-    $(REDO $(TOCENTRY cppstrings.html, D strings vs C++ std::string))
     $(TOCENTRY cppcontracts.html,     D Contract Programming vs C++)
-    $(REDO $(TOCENTRY cpp0x.html, D and C++0x))
     )
 )
 $(BOOKS)
@@ -106,7 +103,7 @@ $(NAVBLOCK_HEADER $(TOCHEADER Documentation),
     $(TOCENTRY phobos/index.html, Library Reference)
     $(TOCENTRY library/index.html, &nbsp;<font size=-1><span style="visibility: hidden">3</span>Preview new Layout</font>)
 
-    $(TOCENTRYTH howtos.html, Helps for using D, How-tos, $(CATEGORY_HOWTOS $(SUBNAV_HOWTOS)))
+    $(TOCENTRYTH howtos.html, Helps for using D, How-tos)
     $(TOCENTRYH articles.html, Articles, $(CATEGORY_ARTICLES $(SUBNAV_ARTICLES)))
 )
 $(NAVBLOCK_HEADER $(TOCHEADER $(LINK2 $(VISUALD), Visual D)),
@@ -119,7 +116,6 @@ $(NAVBLOCK_HEADER $(TOCHEADER Community),
     $(TOCENTRYT http://code.dlang.org, Third party packages written in D, Third Party Packages)
     $(TOCENTRYT http://twitter.com/#search?q=%23d_lang, #d_lang on twitter.com, Twitter)
     $(TOCENTRYT http://digitalmars.com/d/dlinks.html, External D related links, Links)
-    $(TOCENTRYX http://d.puremagic.com/conference2008/, D Programming Language Conference, Conference)
 )
 _=
 
@@ -131,10 +127,6 @@ $(NAVBLOCK
     $(TOCENTRY ctod.html,       Converting C to D)
     $(TOCENTRY cpptod.html,     Converting C++ to D)
     $(TOCENTRY pretod.html, The C Preprocessor vs D)
-    $(REDO $(TOCENTRY template-comparison.html, D templates compared))
-    $(REDO $(TOCENTRY cppstrings.html, D strings vs C++ std::string))
-    $(REDO $(TOCENTRY cppcontracts.html, D Contract Programming vs C++))
-    $(REDO $(TOCENTRY cpp0x.html, D and C++0x))
 )
 _=
 
@@ -270,3 +262,15 @@ _=
 TRANSLATIONS=
 <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/translatemypage.xml&up_source_language=en&w=160&h=60&title=&border=&output=js"></script>
 _=
+
+CATEGORY_APPENDICES=
+CATEGORY_ARTICLES=
+CATEGORY_FAQ=
+CATEGORY_FEATURES=
+CATEGORY_OVERVIEW=
+CATEGORY_DOWNLOAD=
+CATEGORY_SPEC=
+_=
+
+MIDRULE=
+_=
diff --git a/dstyle.dd b/dstyle.dd
index c73e4bfc85..e076f41f05 100644
--- a/dstyle.dd
+++ b/dstyle.dd
@@ -136,7 +136,7 @@ ubyte asciiChar;
 
 )
 
-$(Type Aliases)
+$(H3 Type Aliases)
 
    $(P The D programming languages offers two functionally equivalent syntaxes for type aliases, but ...)
    
diff --git a/faq.dd b/faq.dd
index 6acbfbafe2..c8d5387583 100644
--- a/faq.dd
+++ b/faq.dd
@@ -15,8 +15,6 @@ $(H2 D 2.0 FAQ)
 
 	$(LI Where is my simple language?)
 
-	$(REDO $(LI $(LINK2 cpp0x.html, What's D 2.0's answer to C++0x's proposed new features?)))
-
 	$(LI What other cool features are in the plans for D 2.0?)
 
 	$(LI I suggested a great feature. Why was the suggestion ignored?)
diff --git a/htomodule.dd b/htomodule.dd
index 072dc8e81e..29701f3c04 100644
--- a/htomodule.dd
+++ b/htomodule.dd
@@ -6,3 +6,6 @@ This page has been moved to
 $(LINK2 http://wiki.dlang.org/Converting_C_.h_Files_to_D_Modules, http://wiki.dlang.org/Converting_C_.h_Files_to_D_Modules)
 
 )
+
+Macros:
+WIKI=Converting_C_.h_Files_to_D_Modules
diff --git a/intro-to-datetime.dd b/intro-to-datetime.dd
index 875565e67c..d5d9b49a1b 100644
--- a/intro-to-datetime.dd
+++ b/intro-to-datetime.dd
@@ -791,3 +791,5 @@ Macros:
     TIMEZONE=$(XREF datetime, TimeZone)
     UTC=$(XREF datetime, UTC)
     WINDOWSTZ=$(XREF datetime, WindowsTimeZone)
+    WIKI=
+    _=
diff --git a/macros.ddoc b/macros.ddoc
index ab876f7ded..71975da815 100644
--- a/macros.ddoc
+++ b/macros.ddoc
@@ -5,4 +5,5 @@ COMMA = ,
 ARGS = $0
 RPAREN = )
 LPAREN = (
+COMMENT = 
 _=
diff --git a/overview.dd b/overview.dd
index 223d07c7bb..631176223d 100644
--- a/overview.dd
+++ b/overview.dd
@@ -55,8 +55,7 @@ $(SECTION2 Why D?,
 
 	$(P C++ implements things like resizable arrays and string
 	concatenation as part of the standard library, not as part of the
-	core language.  $(REDO Not being part of the core language has
-	several $(LINK2 cppstrings.html, suboptimal consequences).))
+	core language.)
 
 	$(P Can the power and capability of C++ be extracted, redesigned,
 	and recast into a language that is simple, orthogonal,
diff --git a/regular-expression.dd b/regular-expression.dd
index 8d662ce0e9..b7325aaf9b 100644
--- a/regular-expression.dd
+++ b/regular-expression.dd
@@ -271,4 +271,6 @@ TITLE=Regular expressions
 CATEGORY_ARTICLES=$0
 H3 = <h3>$0</h3>
 DOLLAR = $
-STD = $(LINK2 phobos/std_$0.html, std.$0)
\ No newline at end of file
+STD = $(LINK2 phobos/std_$0.html, std.$0)
+WIKI =
+_=
diff --git a/windbg.dd b/windbg.dd
index f060f795a9..83cac67235 100644
--- a/windbg.dd
+++ b/windbg.dd
@@ -180,4 +180,5 @@ Macros:
 	TITLE=windbg Debugger
 	WIKI=Windbg
 	CATEGORY_DOWNLOAD=$0
-
+    DMDDIR=\dmd2
+    _=
diff --git a/windows.dd b/windows.dd
index 93f902f186..da9c823a4c 100644
--- a/windows.dd
+++ b/windows.dd
@@ -6,3 +6,6 @@ This page has been moved to
 $(LINK2 http://wiki.dlang.org/D_for_Win32, http://wiki.dlang.org/D_for_Win32)
 
 )
+
+Macros:
+WIKI=D_for_Win32
diff --git a/windows.ddoc b/windows.ddoc
index b86a293a60..ce02165d34 100644
--- a/windows.ddoc
+++ b/windows.ddoc
@@ -3,6 +3,8 @@ OS=windows
 WINDOWS=$0
 LINUX=
 FREEBSD=
+OSX=
+UNIX=
 SEP=\
 OBJEXT=obj
 LIBEXT=lib