Skip to content

Commit 32cb91b

Browse files
committed
move glossary to spec
1 parent 578b55f commit 32cb91b

File tree

11 files changed

+21
-16
lines changed

11 files changed

+21
-16
lines changed

.htaccess

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Redirect 301 /memory.html http://wiki.dlang.org/Memory_Management
2828
Redirect 301 /windows.html http://wiki.dlang.org/D_for_Win32
2929
Redirect 301 /getstarted.html http://wiki.dlang.org/Getting_Started
3030
Redirect 301 /tools.html http://wiki.dlang.org/Development_tools
31+
Redirect 301 /glossary.html http://wiki.dlang.org/spec/glossary.html
3132

3233
Redirect 301 /bugstats.php /bugstats.html
3334
Redirect 301 /bugstats.php.html /bugstats.html

articles/migrate-to-shared.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(HEADERNAV_TOC)
88
$(DDLINK changelog/2.030, Change Log: 2.030, dmd version 2.030),
99
the default storage class
1010
for statics and globals will be
11-
$(DDSUBLINK glossary, tls, thread local storage (TLS)), rather
11+
$(DDSUBLINK spec/glossary, tls, thread local storage (TLS)), rather
1212
than the classic global data segment.
1313
While most D code should just compile and run successfully without
1414
change, there can be some issues.

book/dlang.org.ddoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ GLINK=$(RELATIVE_LINK2 $0, $(I $0))
180180
GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
181181
GLINK2_ALTTEXT=$(DDSUBLINK spec/$1,$2,$(I $3))
182182
GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
183-
GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
184-
GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
183+
GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
184+
GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
185185
GNAME=<a id="$0">$(SPANC gname, $0)</a>
186186
GRAMMAR=$(TC pre, bnf notranslate, $0)
187187
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)

dlang.org.ddoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ GLINK=$(RELATIVE_LINK2 $0, $(I $0))
181181
GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
182182
GLINK2_ALTTEXT=$(DDSUBLINK spec/$1,$2,$(I $3))
183183
GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
184-
GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
185-
GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
184+
GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
185+
GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
186186
GNAME=<a id="$0">$(SPANC gname, $0)</a>
187187
GRAMMAR=$(TC pre, bnf notranslate, $0)
188188
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
@@ -298,7 +298,7 @@ $(SUBMENU_MANUAL
298298
$(SUBMENU_LINK $(VISUALD), Visual D)
299299
$(SUBMENU_LINK_DIVIDER $(ROOT_DIR)acknowledgements.html, Acknowledgments)
300300
$(SUBMENU_LINK $(ROOT_DIR)dstyle.html, D Style)
301-
$(SUBMENU_LINK $(ROOT_DIR)glossary.html, Glossary)
301+
$(SUBMENU_LINK $(ROOT_DIR)spec/glossary.html, Glossary)
302302
$(SUBMENU_LINK $(ROOT_DIR)sitemap.html, Sitemap)
303303
)
304304
_=

dpl-docs/views/layout.dt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ html(lang='en-US')
121121
li
122122
a(href="#{root_dir}dstyle.html") D Style
123123
li
124-
a(href="#{root_dir}glossary.html") Glossary
124+
a(href="#{root_dir}spec/glossary.html") Glossary
125125
li
126126
a(href="#{root_dir}sitemap.html") Sitemap
127127
.search-container.expand-container

posix.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ SPEC_ROOT=$(addprefix spec/, \
322322
const3 function operatoroverloading template template-mixin contracts \
323323
version traits errors unittest garbage float iasm ddoc \
324324
interfaceToC cpp_interface objc_interface portability entity memory-safe-d \
325-
abi simd betterc importc ob windows)
325+
abi simd betterc importc ob windows glossary)
326326
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
327327

328328
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd)))
@@ -346,7 +346,7 @@ ARTICLE_FILES=$(addprefix articles/, index builtin code_coverage const-faq \
346346
PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage $(ARTICLE_FILES) \
347347
ascii-table bugstats $(CHANGELOG_FILES) community comparison \
348348
deprecate dmd dmd-freebsd dmd-linux dmd-osx dmd-windows \
349-
documentation download dstyle forum-template gpg_keys glossary \
349+
documentation download dstyle forum-template gpg_keys \
350350
howto-promote htod index install \
351351
menu orgs-using-d overview rdmd resources search security tuple wc windbg \
352352
$(addprefix foundation/, index about donate prman sponsors upb-scholarship) \

spec/function.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3826,7 +3826,7 @@ $(H3 $(LNAME2 safe-interfaces, Safe Interfaces))
38263826
function has a safe interface when:)
38273827
$(OL
38283828
$(LI it cannot exhibit
3829-
$(DDSUBLINK glossary, undefined_behavior, undefined behavior),
3829+
$(DDSUBLINK spec/glossary, undefined_behavior, undefined behavior),
38303830
and)
38313831
$(LI it cannot create unsafe values that are accessible from other
38323832
parts of the program (e.g., via return values, global variables,

glossary.dd renamed to spec/glossary.dd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Ddoc
22

3-
$(D_S Glossary,
3+
$(SPEC_S Glossary,
4+
5+
$(HEADERNAV_TOC)
46

57
$(DL
68
$(DT $(LNAME2 acc, $(ACRONYM ACC, Associated C Compiler)))
@@ -271,5 +273,6 @@ void test()
271273
)
272274

273275
Macros:
276+
CHAPTER=43
274277
TITLE=Glossary
275278
D=<span class="d_inlinecode">$0</span>

spec/spec.ddoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ $(SUBNAV_TEMPLATE
105105
$(ROOT_DIR)spec/simd.html, Vector Extensions,
106106
$(ROOT_DIR)spec/betterc.html, Better C,
107107
$(ROOT_DIR)spec/importc.html, ImportC,
108-
$(ROOT_DIR)spec/ob.html, Live Functions
108+
$(ROOT_DIR)spec/ob.html, Live Functions,
109+
$(ROOT_DIR)spec/glossary.html, Glossary
109110
)
110111
)
111112
)

spec/traits.dd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ static assert(!__traits(isCopyable, T));
346346
$(H3 $(GNAME isPOD))
347347

348348
$(P Takes one argument, which must be a type. It returns
349-
$(D true) if the type is a $(DDSUBLINK glossary, pod, POD) type, otherwise $(D false).)
349+
$(D true) if the type is a $(DDSUBLINK spec/glossary, pod, POD) type, otherwise $(D false).)
350350

351351
$(H3 $(GNAME toType))
352352

@@ -647,7 +647,7 @@ $(H3 $(GNAME initSymbol))
647647
)
648648

649649
$(P
650-
This traits is not available during $(DDSUBLINK glossary, ctfe, CTFE) because the actual address
650+
This traits is not available during $(DDSUBLINK spec/glossary, ctfe, CTFE) because the actual address
651651
of the initializer symbol will be set by the linker and hence is not available at compile time.
652652
)
653653

@@ -1507,7 +1507,7 @@ $(H3 $(GNAME getUnitTests))
15071507
Takes one argument, a symbol of an aggregate (e.g. struct/class/module).
15081508
The result is a symbol sequence of all the unit test functions of that aggregate.
15091509
The functions returned are like normal nested static functions,
1510-
$(DDSUBLINK glossary, ctfe, CTFE) will work and
1510+
$(DDSUBLINK spec/glossary, ctfe, CTFE) will work and
15111511
$(DDSUBLINK spec/attribute, uda, UDAs) will be accessible.
15121512
)
15131513

0 commit comments

Comments
 (0)