Merge pull request #1365 from wilzbach/dmd_cli_ref

Rename tools to CLI-reference and add DMD

.htaccess

@@ -24,9 +24,26 @@ Redirect 301 /htomodule.html http://wiki.dlang.org/Converting_C_.h_Files_to_D_Mo
 Redirect 301 /memory.html http://wiki.dlang.org/Memory_Management
 Redirect 301 /windows.html http://wiki.dlang.org/D_for_Win32
 Redirect 301 /getstarted.html http://wiki.dlang.org/Getting_Started
+Redirect 301 /tools.html http://wiki.dlang.org/Development_tools
 
 RewriteRule ^changelog(.html)?$ changelog/index.html [R=301,L]
 
+# OS detection for CLI manual
+RewriteCond %{HTTP_USER_AGENT} Windows
+RewriteRule dmd.html dmd-windows.html [R]
+
+RewriteCond %{HTTP_USER_AGENT} Mac
+RewriteRule dmd.html dmd-osx.html [R]
+
+RewriteCond %{HTTP_USER_AGENT} Linux
+RewriteRule dmd.html dmd-linux.html [R]
+
+RewriteCond %{HTTP_USER_AGENT} FreeBSD
+RewriteRule dmd.html dmd-freebsd.html [R]
+
+# soft-fail to windows
+RewriteRule dmd.html dmd-windows.html [L,R]
+
 # legacy URLs of /spec/ pages
 RewriteRule ^(spec|intro|lex|grammar|module|declaration|type|property|\
 attribute|pragma|expression|statement|arrays|hash-map|struct|class|interface|\

dcompiler.dd

@@ -3,18 +3,6 @@ Ddoc
 $(D_S dmd - $(WINDOWS Windows)$(LINUX Linux)$(OSX Mac OS X)$(FREEBSD FreeBSD) D Compiler,
 
     $(UL
-    $(WINDOWS $(LI dmd for $(LINK2 dmd-linux.html,   Linux)))
-    $(WINDOWS $(LI dmd for $(LINK2 dmd-osx.html,     OSX)))
-    $(WINDOWS $(LI dmd for $(LINK2 dmd-freebsd.html, FreeBSD)))
-    $(LINUX   $(LI dmd for $(LINK2 dmd-windows.html, Windows)))
-    $(LINUX   $(LI dmd for $(LINK2 dmd-osx.html,     OSX)))
-    $(LINUX   $(LI dmd for $(LINK2 dmd-freebsd.html, FreeBSD)))
-    $(OSX     $(LI dmd for $(LINK2 dmd-windows.html, Windows)))
-    $(OSX     $(LI dmd for $(LINK2 dmd-linux.html,   Linux)))
-    $(OSX     $(LI dmd for $(LINK2 dmd-freebsd.html, FreeBSD)))
-    $(FREEBSD $(LI dmd for $(LINK2 dmd-windows.html, Windows)))
-    $(FREEBSD $(LI dmd for $(LINK2 dmd-linux.html,   Linux)))
-    $(FREEBSD $(LI dmd for $(LINK2 dmd-osx.html,     OSX)))
     $(LI $(RELATIVE_LINK2 requirements, Requirements and Downloads))
     $(LI $(RELATIVE_LINK2 files, Files))
     $(LI $(RELATIVE_LINK2 installation, Installation))
@@ -1188,4 +1176,4 @@ Macros:
     DMC=$(LINK2 http://www.digitalmars.com/ctg/sc.html, dmc)
     LIB=$(LINK2 http://www.digitalmars.com/ctg/lib.html, lib)
     OPTLINK=$(LINK2 http://www.digitalmars.com/ctg/optlink.html, link.exe)
-
+	SUBNAV=$(SUBNAV_CLI_REFERENCE)

dlang.org.ddoc

@@ -237,7 +237,7 @@ $(SUBMENU_MANUAL
     $(SUBMENU_LINK $(ROOT_DIR)spec/spec.html, Language Reference)
     $(SUBMENU_LINK $(ROOT_DIR)phobos/index.html, Library Reference)
     $(SUBMENU_LINK $(ROOT_DIR)library/index.html, Library Reference Preview)
-    $(SUBMENU_LINK $(ROOT_DIR)dmd-windows.html, Command-line Reference)
+    $(SUBMENU_LINK $(ROOT_DIR)dmd.html, Command-line Reference)
     $(SUBMENU_LINK_DIVIDER $(ROOT_DIR)comparison.html, Feature Overview)
     $(SUBMENU_LINK $(ROOT_DIR)articles.html, Articles)
 )
@@ -436,12 +436,14 @@ SUBNAV_HEAD=
 SUBNAV_TEMPLATE=$(DIVC subnav-helper) $(DIVC subnav, $0)
 _=
 
-SUBNAV_TOOLS=
+SUBNAV_CLI_REFERENCE=
 $(SUBNAV_TEMPLATE
-    $(SUBNAV_HEAD D-Specific Tools, $(ROOT_DIR)tools.html, overview)
+    $(SUBNAV_HEAD Command-line Reference, http://wiki.dlang.org/Development_tools, overview)
     $(UL $(SUBMENU2
-        https://github.com/Hackerpilot/dfix, dfix,
-        https://github.com/Hackerpilot/dfmt, dfmt,
+        $(ROOT_DIR)dmd-windows.html, dmd (Windows),
+        $(ROOT_DIR)dmd-linux.html, dmd (Linux),
+        $(ROOT_DIR)dmd-osx.html, dmd (OSX),
+        $(ROOT_DIR)dmd-freebsd.html, dmd (FreeBSD),
         $(ROOT_DIR)rdmd.html, rdmd,
         $(ROOT_DIR)htod.html, htod
     ))

htod.dd

@@ -230,4 +230,4 @@ $(OL
 
 Macros:
 	TITLE=htod
-	SUBNAV=$(SUBNAV_TOOLS)
+	SUBNAV=$(SUBNAV_CLI_REFERENCE)

posix.mak

@@ -170,7 +170,7 @@ PAGES_ROOT=$(SPEC_ROOT) 32-64-portability acknowledgements articles ascii-table
 	gsoc2011 gsoc2012 gsoc2012-template hijack howto-promote htod htomodule index \
 	intro-to-datetime lazy-evaluation memory menu migrate-to-shared mixin	\
 	orgs-using-d overview pretod rationale rdmd regular-expression resources safed \
-	search template-comparison templates-revisited tools tuple	\
+	search template-comparison templates-revisited tuple	\
 	variadic-function-templates warnings wc windbg windows
 
 TARGETS=$(addsuffix .html,$(PAGES_ROOT))

rdmd.dd

@@ -129,5 +129,4 @@ $(LINK2 http://erdani.org/, Andrei Alexandrescu)
 
 Macros:
 	TITLE=rdmd
-	SUBNAV=$(SUBNAV_TOOLS)
-
+	SUBNAV=$(SUBNAV_CLI_REFERENCE)

win32.mak

@@ -48,7 +48,7 @@ SRC= $(SPECSRC) cpptod.dd ctod.dd pretod.dd cppcontracts.dd index.dd overview.dd
 	D1toD2.dd intro-to-datetime.dd simd.dd deprecate.dd download.dd		\
 	32-64-portability.dd dll-linux.dd bugstats.php.dd \
 	ctarguments.dd articles.dd community.dd documentation.dd menu.dd \
-	resources.dd search.dd tools.dd
+	resources.dd search.dd
 
 SPECSRC=spec\spec.dd spec\intro.dd spec\lex.dd \
 	spec\grammar.dd spec\module.dd spec\declaration.dd \
@@ -140,7 +140,6 @@ TARGETS= $(SPECTARGETS) cpptod.html ctod.html pretod.html cppcontracts.html inde
 	d-array-article.html dll-linux.html bugstats.php.html \
 	gpg_keys.html forum-template.html ctarguments.html articles.html \
 	community.html documentation.html menu.html resources.html search.html \
-	tools.html
 
 # exclude list
 MOD_EXCLUDES_RELEASE=--ex=gc. --ex=rt. --ex=core.internal. --ex=core.stdc.config --ex=core.sys. \
@@ -555,8 +554,6 @@ template-comparison.html : $(DDOC) template-comparison.dd
 
 templates-revisited.html : $(DDOC) templates-revisited.dd
 
-tools.html : $(DDOC) tools.dd
-
 tuple.html : $(DDOC) tuple.dd
 
 variadic-function-templates.html : $(DDOC) variadic-function-templates.dd