Merge pull request #544 from qchikara/ReviveIntroPage

Issue 12535: Fix link to the Introduction page
dlang · Apr 22, 2014 · 47999c9 · 47999c9
2 parents 652b96b + 0310776
commit 47999c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/doc.ddoc b/doc.ddoc
@@ -263,6 +263,7 @@ $(NAVBLOCK
 
 SUBNAV_SPEC=
 $(NAVBLOCK
+	$(TOCENTRY intro.html, Introduction)
 	$(TOCENTRY lex.html, Lexical)
 	$(TOCENTRY grammar.html, Grammar)
 	$(TOCENTRY module.html, Modules)

diff --git a/posix.mak b/posix.mak
@@ -103,7 +103,7 @@ howtos.html language-reference.html robots.txt process.php
 # Language spec root filenames. They have extension .dd in the source
 # and .html in the generated HTML. These are also used for the mobi
 # book generation, for which reason the list is sorted by chapter.
-SPEC_ROOT=spec lex grammar module declaration type property attribute pragma	\
+SPEC_ROOT=spec intro lex grammar module declaration type property attribute pragma	\
 	expression statement arrays hash-map struct class interface enum	\
 	const3 function operatoroverloading template template-mixin contracts		\
 	version traits errors unittest garbage float iasm ddoc				\

diff --git a/spec.dd b/spec.dd
@@ -13,6 +13,7 @@ $(TOC Table of Contents,
         $(AMAZONLINK B005CCQPKK, Kindle ebook).))
 
     $(UL
+	$(TOCENTRY intro, Introduction)
 	$(TOCENTRY lex, Lexical)
 	$(TOCENTRY grammar, Grammar)
 	$(TOCENTRY module, Modules)

diff --git a/win32.mak b/win32.mak
@@ -16,7 +16,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
 
-SPECSRC=spec.dd lex.dd grammar.dd module.dd declaration.dd type.dd property.dd	\
+SPECSRC=spec.dd intro.dd lex.dd grammar.dd module.dd declaration.dd type.dd property.dd	\
 	attribute.dd pragma.dd expression.dd statement.dd arrays.dd			\
 	hash-map.dd struct.dd class.dd interface.dd enum.dd const3.dd		\
 	function.dd operatoroverloading.dd template.dd template-mixin.dd	\
@@ -32,7 +32,7 @@ IMG=dmlogo.gif cpp1.gif d002.ico c1.gif d3.png d4.gif d5.gif favicon.gif
 PREMADE=dcompiler.html language-reference.html appendices.html howtos.html articles.html
 
 TARGETS=cpptod.html ctod.html pretod.html cppcontracts.html index.html overview.html	\
-	lex.html grammar.html module.html declaration.html type.html		\
+	intro.html lex.html grammar.html module.html declaration.html type.html		\
 	property.html attribute.html pragma.html expression.html statement.html	\
 	arrays.html struct.html class.html enum.html function.html		\
 	operatoroverloading.html template.html mixin.html contracts.html version.html	\
@@ -176,6 +176,8 @@ interfaceToC.html : $(DDOC) interfaceToC.dd
 
 index.html : $(DDOC) index.dd
 
+intro.html : $(DDOC) intro.dd
+
 intro-to-datetime.html : $(DDOC) intro-to-datetime.dd
 
 lazy-evaluation.html : $(DDOC) lazy-evaluation.dd