Merge pull request dlang#3612 from WalterBright/mvGlossary

move glossary to spec

Author: WalterBright

.htaccess

@@ -28,6 +28,7 @@ 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
+Redirect 301 /glossary.html http://wiki.dlang.org/spec/glossary.html
 
 Redirect 301 /bugstats.php /bugstats.html
 Redirect 301 /bugstats.php.html /bugstats.html

articles/migrate-to-shared.dd

@@ -8,7 +8,7 @@ $(HEADERNAV_TOC)
         $(DDLINK changelog/2.030, Change Log: 2.030, dmd version 2.030),
         the default storage class
         for statics and globals will be
-        $(DDSUBLINK glossary, tls, thread local storage (TLS)), rather
+        $(DDSUBLINK spec/glossary, tls, thread local storage (TLS)), rather
         than the classic global data segment.
         While most D code should just compile and run successfully without
         change, there can be some issues.

book/dlang.org.ddoc

@@ -180,8 +180,8 @@ GLINK=$(RELATIVE_LINK2 $0, $(I $0))
 GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
 GLINK2_ALTTEXT=$(DDSUBLINK spec/$1,$2,$(I $3))
 GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
-GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
-GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
+GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
+GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
 GNAME=<a id="$0">$(SPANC gname, $0)</a>
 GRAMMAR=$(TC pre, bnf notranslate, $0)
 GRAMMAR_INFORMATIVE=$(GRAMMAR $0)

dlang.org.ddoc

@@ -181,8 +181,8 @@ GLINK=$(RELATIVE_LINK2 $0, $(I $0))
 GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
 GLINK2_ALTTEXT=$(DDSUBLINK spec/$1,$2,$(I $3))
 GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
-GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
-GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
+GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
+GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
 GNAME=<a id="$0">$(SPANC gname, $0)</a>
 GRAMMAR=$(TC pre, bnf notranslate, $0)
 GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
@@ -298,7 +298,7 @@ $(SUBMENU_MANUAL
     $(SUBMENU_LINK $(VISUALD), Visual D)
     $(SUBMENU_LINK_DIVIDER $(ROOT_DIR)acknowledgements.html, Acknowledgments)
     $(SUBMENU_LINK $(ROOT_DIR)dstyle.html, D Style)
-    $(SUBMENU_LINK $(ROOT_DIR)glossary.html, Glossary)
+    $(SUBMENU_LINK $(ROOT_DIR)spec/glossary.html, Glossary)
     $(SUBMENU_LINK $(ROOT_DIR)sitemap.html, Sitemap)
 )
 _=

dpl-docs/views/layout.dt

@@ -121,7 +121,7 @@ html(lang='en-US')
                   li
                     a(href="#{root_dir}dstyle.html") D Style
                   li
-                    a(href="#{root_dir}glossary.html") Glossary
+                    a(href="#{root_dir}spec/glossary.html") Glossary
                   li
                     a(href="#{root_dir}sitemap.html") Sitemap
           .search-container.expand-container

posix.mak

@@ -322,7 +322,7 @@ SPEC_ROOT=$(addprefix spec/, \
 	const3 function operatoroverloading template template-mixin contracts \
 	version traits errors unittest garbage float iasm ddoc \
 	interfaceToC cpp_interface objc_interface portability entity memory-safe-d \
-	abi simd betterc importc ob windows)
+	abi simd betterc importc ob windows glossary)
 SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
 
 CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd)))
@@ -347,7 +347,7 @@ ARTICLE_FILES=$(addprefix articles/, index builtin code_coverage const-faq \
 PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage $(ARTICLE_FILES) \
 	ascii-table bugstats $(CHANGELOG_FILES) community comparison \
 	deprecate dmd dmd-freebsd dmd-linux dmd-osx dmd-windows \
-	documentation download dstyle forum-template gpg_keys glossary \
+	documentation download dstyle forum-template gpg_keys \
 	howto-promote htod index install \
 	menu orgs-using-d overview rdmd resources search security tuple wc windbg \
 	$(addprefix foundation/, index about donate prman sponsors upb-scholarship) \

spec/function.dd

@@ -3826,7 +3826,7 @@ $(H3 $(LNAME2 safe-interfaces, Safe Interfaces))
         function has a safe interface when:)
         $(OL
             $(LI it cannot exhibit
-                $(DDSUBLINK glossary, undefined_behavior, undefined behavior),
+                $(DDSUBLINK spec/glossary, undefined_behavior, undefined behavior),
                 and)
             $(LI it cannot create unsafe values that are accessible from other
                 parts of the program (e.g., via return values, global variables,

glossary.dd renamed to spec/glossary.dd

@@ -1,6 +1,8 @@
 Ddoc
 
-$(D_S Glossary,
+$(SPEC_S Glossary,
+
+$(HEADERNAV_TOC)
 
 $(DL
         $(DT $(LNAME2 acc, $(ACRONYM ACC, Associated C Compiler)))
@@ -271,5 +273,6 @@ void test()
 )
 
 Macros:
+        CHAPTER=43
         TITLE=Glossary
     D=<span class="d_inlinecode">$0</span>

spec/spec.ddoc

@@ -105,7 +105,8 @@ $(SUBNAV_TEMPLATE
             $(ROOT_DIR)spec/simd.html, Vector Extensions,
             $(ROOT_DIR)spec/betterc.html, Better C,
             $(ROOT_DIR)spec/importc.html, ImportC,
-            $(ROOT_DIR)spec/ob.html, Live Functions
+            $(ROOT_DIR)spec/ob.html, Live Functions,
+            $(ROOT_DIR)spec/glossary.html, Glossary
         )
     )
 )

spec/traits.dd

@@ -346,7 +346,7 @@ static assert(!__traits(isCopyable, T));
 $(H3 $(GNAME isPOD))
 
         $(P Takes one argument, which must be a type. It returns
-        $(D true) if the type is a $(DDSUBLINK glossary, pod, POD) type, otherwise $(D false).)
+        $(D true) if the type is a $(DDSUBLINK spec/glossary, pod, POD) type, otherwise $(D false).)
 
 $(H3 $(GNAME toType))
 
@@ -647,7 +647,7 @@ $(H3 $(GNAME initSymbol))
         )
 
         $(P
-            This traits is not available during $(DDSUBLINK glossary, ctfe, CTFE) because the actual address
+            This traits is not available during $(DDSUBLINK spec/glossary, ctfe, CTFE) because the actual address
             of the initializer symbol will be set by the linker and hence is not available at compile time.
         )
 
@@ -1507,7 +1507,7 @@ $(H3 $(GNAME getUnitTests))
                 Takes one argument, a symbol of an aggregate (e.g. struct/class/module).
                 The result is a symbol sequence of all the unit test functions of that aggregate.
                 The functions returned are like normal nested static functions,
-                $(DDSUBLINK glossary, ctfe, CTFE) will work and
+                $(DDSUBLINK spec/glossary, ctfe, CTFE) will work and
                 $(DDSUBLINK spec/attribute, uda, UDAs) will be accessible.
         )