Skip to content

Commit 8bc666e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents d5798c6 + e4060dc commit 8bc666e

39 files changed

+1435
-607
lines changed

articles/lazy-evaluation.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ need to do this need to be broken up into multiple statements,
254254
and extra variables are introduced.
255255
(For a thorough treatment of this issue, see Andrei Alexandrescu and
256256
Petru Marginean's paper
257-
$(LINK2 http://erdani.org/publications/cuj-06-2003.html, Enforcements)).
257+
$(LINK2 https://erdani.org/publications/cuj-06-2003.php.html, Enforcements)).
258258
With lazy evaluation, this can all be encapsulated into a single
259259
function:
260260
)

changelog/pending.ddoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION=
22
$(DIVC version,
33
$(P
4-
$(B $(LARGE $(LINK2 http://nightlies.dlang.org, Download D nightlies)))$(BR)
4+
$(B $(LARGE $(LINK2 https://github.com/dlang/dmd/releases/tag/nightly, Download D nightlies)))$(BR)
55
$(SMALL $1)
66

77
)

changelog/release-schedule.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(UL
88
$(LI Point releases are published unscheduled when important issues or regressions get fixed.)
99
)
1010

11-
$(P The release schedule for 2020 is as follows:)
11+
$(P The release schedule for 2021 is as follows:)
1212

1313
$(DIVC release-schedule,
1414
$(TABLE

deprecate.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ $(H3 $(DEPNAME Floating point NCEG operators))
440440
(!<>=, <>, <>=, !>, !>=, !<, !<=, !<>) for comparisons involving NaNs.
441441
)
442442
$(H4 Corrective Action)
443-
$(P Use the normal operators and $(REF isNaN, std,math).
443+
$(P Use the normal operators and $(REF isNaN, std,math,traits).
444444
)
445445
$(H4 Rationale)
446446
$(P These operators are too specialized to be a part of the core language.

dlang.org.ddoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ FOOTNOTE=$(SPANC footnote, $0)
173173
FULL_TITLE=$(TITLE) - D Programming Language
174174
_=
175175

176+
GDEPRECATED=<del title="deprecated">$0</del>
177+
GRESERVED=<ins title="reserved">$0</ins>
176178
GEN_DATETIME=$(DATETIME)
177179
GLINK=$(RELATIVE_LINK2 $0, $(I $0))
178180
GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
@@ -182,7 +184,10 @@ GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
182184
GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
183185
GNAME=<a id="$0">$(SPANC gname, $0)</a>
184186
GRAMMAR=$(TC pre, bnf notranslate, $0)
187+
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
188+
GRAMMAR_LEX=$(GRAMMAR $0)
185189
GREEN=$(SPANC green, $0)
190+
GSELF=$(I $0)
186191
GT=&gt;
187192
_=
188193

@@ -261,7 +266,7 @@ $(SUBMENU_MANUAL
261266
$(SUBMENU_LINK https://twitter.com/search?q=%23dlang, Twitter)
262267
$(SUBMENU_LINK $(ROOT_DIR)calendar.html, Calendar)
263268
$(SUBMENU_LINK_DIVIDER https://forum.dlang.org, Forums)
264-
$(SUBMENU_LINK irc://irc.freenode.net/d, IRC)
269+
$(SUBMENU_LINK irc://irc.libera.chat/d, IRC)
265270
$(SUBMENU_LINK https://discord.gg/bMZk9Q4, Community Discord)
266271
$(SUBMENU_LINK https://wiki.dlang.org, Wiki)
267272
$(SUBMENU_LINK_DIVIDER https://github.com/dlang, GitHub)

download.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ $(DOWNLOAD_OTHER $(GENTOO), $(LINK2 https://wiki.gentoo.org/wiki/Dlang, Gentoo),
149149

150150
$(DOWNLOAD_OTHER $(HOMEBREW), $(LINK2 https://formulae.brew.sh/formula/dmd, Homebrew), $(CONSOLE brew install dmd))
151151

152-
$(DOWNLOAD_OTHER $(NIX), Nix/NixOS, $(CONSOLE nix-env -i dmd))
152+
$(DOWNLOAD_OTHER $(NIX), $(LINK2 https://search.nixos.org/packages?show=dmd&query=dmd, Nix/NixOS), $(CONSOLE nix-env -iA nixpkgs.dmd))
153153

154154
$(DOWNLOAD_OTHER $(UBUNTU) $(DEBIAN), Ubuntu/Debian, $(LINK2 http://d-apt.sourceforge.net/, APT repository)
155155
$(CONSOLE sudo wget https://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list

dpl-docs/views/layout.dt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ html(lang='en-US')
8383
li.menu-divider
8484
a(href="https://forum.dlang.org") Forums
8585
li
86-
a(href="irc://irc.freenode.net/d") IRC
86+
a(href="irc://irc.libera.chat/d") IRC
8787
li
8888
a(href="https://wiki.dlang.org") Wiki
8989
li.menu-divider

foundation/donate.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ mailto:foundation@dlang.org, contact the D Language Foundation).)
8888

8989
$(H3 How can I donate?)
9090

91-
$(P Among the follow methods of donating to the D Language Foundation, Flipcause
91+
$(P Of the following methods of donating to the D Language Foundation, Flipcause
9292
is the only one that allows you to directly target your donation at any of our
9393
specific funds or initiatives. But you can still do so with any of the other
9494
approaches by either leaving us a note in the provided comment field or, where

index.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ $(DIVC boxes,
404404
$(DIVC row,
405405
$(TOUR comments, Community,
406406
$(P Discuss D on the $(LINK2 https://forum.dlang.org/, forums), join
407-
the $(LINK2 irc://irc.freenode.net/d, IRC channel), read our
407+
the $(LINK2 irc://irc.libera.chat/d, IRC channel), read our
408408
$(LINK2 https://dlang.org/blog, official Blog), or follow us
409409
on $(LINK2 https://twitter.com/D_Programming, Twitter).
410410
Browse the $(LINK2 https://wiki.dlang.org/, wiki), where among

posix.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ SPEC_ROOT=$(addprefix spec/, \
321321
const3 function operatoroverloading template template-mixin contracts \
322322
version traits errors unittest garbage float iasm ddoc \
323323
interfaceToC cpp_interface objc_interface portability entity memory-safe-d \
324-
abi simd betterc ob)
324+
abi simd betterc importc ob)
325325
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
326326

327327
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd)))

0 commit comments

Comments
 (0)