Skip to content

Commit 7d09c60

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 6e36597 + b5ba4bb commit 7d09c60

35 files changed

+1395
-442
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.htaccess

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,130 @@ Redirect 301 /rationale.html /articles/rationale.html
9797

9898
# Error pages
9999
ErrorDocument 404 /404.html
100+
101+
# Permanent links to DIPs
102+
Redirect 301 /dips/1 https://wiki.dlang.org/DIP1
103+
Redirect 301 /dips/2 https://wiki.dlang.org/DIP2
104+
Redirect 301 /dips/3 https://wiki.dlang.org/DIP3
105+
Redirect 301 /dips/4 https://wiki.dlang.org/DIP4
106+
Redirect 301 /dips/5 https://wiki.dlang.org/DIP5
107+
Redirect 301 /dips/6 https://wiki.dlang.org/DIP6
108+
Redirect 301 /dips/7 https://wiki.dlang.org/DIP7
109+
Redirect 301 /dips/8 https://wiki.dlang.org/DIP8
110+
Redirect 301 /dips/9 https://wiki.dlang.org/DIP9
111+
Redirect 301 /dips/10 https://wiki.dlang.org/DIP10
112+
Redirect 301 /dips/11 https://wiki.dlang.org/DIP11
113+
Redirect 301 /dips/12 https://wiki.dlang.org/DIP12
114+
Redirect 301 /dips/13 https://wiki.dlang.org/DIP13
115+
Redirect 301 /dips/14 https://wiki.dlang.org/DIP14
116+
Redirect 301 /dips/15 https://wiki.dlang.org/DIP15
117+
Redirect 301 /dips/16 https://wiki.dlang.org/DIP16
118+
Redirect 301 /dips/17 https://wiki.dlang.org/DIP17
119+
Redirect 301 /dips/18 https://wiki.dlang.org/DIP18
120+
Redirect 301 /dips/19 https://wiki.dlang.org/DIP19
121+
Redirect 301 /dips/20 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP20.md
122+
Redirect 301 /dips/21 https://wiki.dlang.org/DIP21
123+
Redirect 301 /dips/22 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP22.md
124+
Redirect 301 /dips/23 https://wiki.dlang.org/DIP23
125+
Redirect 301 /dips/24 https://wiki.dlang.org/DIP24
126+
Redirect 301 /dips/25 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP25.md
127+
Redirect 301 /dips/26 https://wiki.dlang.org/DIP26
128+
Redirect 301 /dips/27 https://wiki.dlang.org/DIP27
129+
Redirect 301 /dips/28 https://wiki.dlang.org/DIP28
130+
Redirect 301 /dips/29 https://wiki.dlang.org/DIP29
131+
Redirect 301 /dips/30 https://wiki.dlang.org/DIP30
132+
Redirect 301 /dips/31 https://wiki.dlang.org/DIP31
133+
Redirect 301 /dips/32 https://wiki.dlang.org/DIP32
134+
Redirect 301 /dips/33 https://wiki.dlang.org/DIP33
135+
Redirect 301 /dips/34 https://wiki.dlang.org/DIP34
136+
Redirect 301 /dips/35 https://wiki.dlang.org/DIP35
137+
Redirect 301 /dips/36 https://wiki.dlang.org/DIP36
138+
Redirect 301 /dips/37 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP37.md
139+
Redirect 301 /dips/38 https://wiki.dlang.org/DIP38
140+
Redirect 301 /dips/39 https://wiki.dlang.org/DIP39
141+
Redirect 301 /dips/40 https://wiki.dlang.org/DIP40
142+
Redirect 301 /dips/41 https://wiki.dlang.org/DIP41
143+
Redirect 301 /dips/42 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP42.md
144+
Redirect 301 /dips/43 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP43.md
145+
Redirect 301 /dips/44 https://wiki.dlang.org/DIP44
146+
Redirect 301 /dips/45 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP45.md
147+
Redirect 301 /dips/46 https://wiki.dlang.org/DIP46
148+
Redirect 301 /dips/47 https://wiki.dlang.org/DIP47
149+
Redirect 301 /dips/48 https://wiki.dlang.org/DIP48
150+
Redirect 301 /dips/49 https://wiki.dlang.org/DIP49
151+
Redirect 301 /dips/50 https://wiki.dlang.org/DIP50
152+
Redirect 301 /dips/51 https://wiki.dlang.org/DIP51
153+
Redirect 301 /dips/52 https://wiki.dlang.org/DIP52
154+
Redirect 301 /dips/53 https://wiki.dlang.org/DIP53
155+
Redirect 301 /dips/54 https://wiki.dlang.org/DIP54
156+
Redirect 301 /dips/55 https://wiki.dlang.org/DIP55
157+
Redirect 301 /dips/56 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP56.md
158+
Redirect 301 /dips/57 https://wiki.dlang.org/DIP57
159+
Redirect 301 /dips/58 https://wiki.dlang.org/DIP58
160+
Redirect 301 /dips/59 https://wiki.dlang.org/DIP59
161+
Redirect 301 /dips/60 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP60.md
162+
Redirect 301 /dips/61 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP61.md
163+
Redirect 301 /dips/62 https://wiki.dlang.org/DIP62
164+
Redirect 301 /dips/63 https://wiki.dlang.org/DIP63
165+
Redirect 301 /dips/64 https://wiki.dlang.org/DIP64
166+
Redirect 301 /dips/65 https://wiki.dlang.org/DIP65
167+
Redirect 301 /dips/66 https://wiki.dlang.org/DIP66
168+
Redirect 301 /dips/67 https://wiki.dlang.org/DIP67
169+
Redirect 301 /dips/68 https://wiki.dlang.org/DIP68
170+
Redirect 301 /dips/69 https://wiki.dlang.org/DIP69
171+
Redirect 301 /dips/70 https://wiki.dlang.org/DIP70
172+
Redirect 301 /dips/71 https://wiki.dlang.org/DIP71
173+
Redirect 301 /dips/72 https://wiki.dlang.org/DIP72
174+
Redirect 301 /dips/73 https://wiki.dlang.org/DIP73
175+
Redirect 301 /dips/74 https://wiki.dlang.org/DIP74
176+
Redirect 301 /dips/75 https://github.com/dlang/DIPs/blob/master/DIPs/archive/DIP75.md
177+
Redirect 301 /dips/76 https://wiki.dlang.org/DIP76
178+
Redirect 301 /dips/77 https://wiki.dlang.org/DIP77
179+
Redirect 301 /dips/78 https://wiki.dlang.org/DIP78
180+
Redirect 301 /dips/79 https://wiki.dlang.org/DIP79
181+
Redirect 301 /dips/80 https://wiki.dlang.org/DIP80
182+
Redirect 301 /dips/81 https://wiki.dlang.org/DIP81
183+
Redirect 301 /dips/82 https://wiki.dlang.org/DIP82
184+
Redirect 301 /dips/83 https://wiki.dlang.org/DIP83
185+
Redirect 301 /dips/84 https://wiki.dlang.org/DIP84
186+
Redirect 301 /dips/85 https://wiki.dlang.org/DIP85
187+
Redirect 301 /dips/86 https://wiki.dlang.org/DIP86
188+
Redirect 301 /dips/87 https://wiki.dlang.org/DIP87
189+
Redirect 301 /dips/88 https://wiki.dlang.org/DIP88
190+
Redirect 301 /dips/89 https://wiki.dlang.org/DIP89
191+
Redirect 301 /dips/90 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1000.md
192+
Redirect 301 /dips/1000 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1000.md
193+
Redirect 301 /dips/1001 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1001.md
194+
Redirect 301 /dips/1002 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1002.md
195+
Redirect 301 /dips/1003 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1003.md
196+
Redirect 301 /dips/1004 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1004.md
197+
Redirect 301 /dips/1005 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1005.md
198+
Redirect 301 /dips/1006 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1006.md
199+
Redirect 301 /dips/1007 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1007.md
200+
Redirect 301 /dips/1008 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1008.md
201+
Redirect 301 /dips/1009 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1009.md
202+
Redirect 301 /dips/1010 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1010.md
203+
Redirect 301 /dips/1011 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1011.md
204+
Redirect 301 /dips/1012 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1012.md
205+
Redirect 301 /dips/1013 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1013.md
206+
Redirect 301 /dips/1014 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1014.md
207+
Redirect 301 /dips/1015 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1015.md
208+
Redirect 301 /dips/1016 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1016.md
209+
Redirect 301 /dips/1017 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1017.md
210+
Redirect 301 /dips/1018 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1018.md
211+
Redirect 301 /dips/1019 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1019.md
212+
Redirect 301 /dips/1020 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1020.md
213+
Redirect 301 /dips/1021 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1021.md
214+
Redirect 301 /dips/1022 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1022.md
215+
Redirect 301 /dips/1023 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1023.md
216+
Redirect 301 /dips/1024 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1024.md
217+
Redirect 301 /dips/1025 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1025.md
218+
Redirect 301 /dips/1026 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1026.md
219+
Redirect 301 /dips/1027 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1027.md
220+
Redirect 301 /dips/1028 https://github.com/dlang/DIPs/tree/master/DIPs/rejected/DIP1028.md
221+
Redirect 301 /dips/1029 https://github.com/dlang/DIPs/tree/master/DIPs/DIP1029.md
222+
Redirect 301 /dips/1030 https://github.com/dlang/DIPs/tree/master/DIPs/DIP1030.md
223+
Redirect 301 /dips/1031 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1031.md
224+
Redirect 301 /dips/1032 https://github.com/dlang/DIPs/tree/master/DIPs/DIP1032.md
225+
Redirect 301 /dips/1033 https://github.com/dlang/DIPs/tree/master/DIPs/DIP1033.md
226+
Redirect 301 /dips/1034 https://github.com/dlang/DIPs/tree/master/DIPs/DIP1034.md

.travis.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
[![GitHub tag](https://img.shields.io/github/tag/dlang/dlang.org.svg?maxAge=86400)](https://github.com/dlang/dlang.org/releases)
55
[![Bugzilla Issues](https://img.shields.io/badge/issues-Bugzilla-green.svg)](https://issues.dlang.org/buglist.cgi?component=dlang.org&list_id=220150&product=D&resolution=---)
6-
[![Issue Stats](https://img.shields.io/issuestats/p/github/dlang/dlang.org.svg?maxAge=2592000)](http://www.issuestats.com/github/dlang/dlang.org)
76
[![license](https://img.shields.io/github/license/dlang/dlang.org.svg)](https://github.com/dlang/dlang.org/blob/master/LICENSE.txt)
87

98
This repository contains the source files for the [D Language

dcompiler.dd

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ $(H2 $(LNAME2 files, Files))
378378
$(DD D source code minimizer)
379379
)
380380

381-
$(DT $(D $(DMDDIR)\windows\bin\$(LINK2 http://www.digitalmars.com/ctg/optlink.html, link.exe))
381+
$(DT $(D $(DMDDIR)\windows\bin\$(OPTLINK))
382382
$(DD OPTLINK)
383383
)
384384

@@ -394,18 +394,14 @@ $(H2 $(LNAME2 files, Files))
394394
$(DD D build tool for script-like D code execution)
395395
)
396396

397-
$(DT $(D $(DMDDIR)\windows\bin\$(SC_INI))
397+
$(DT $(D $(SC_INI))
398398
$(DD Global compiler settings)
399399
)
400400

401401
$(DT $(D $(DMDDIR)\windows\bin\$(LINK2 http://www.digitalmars.com/ctg/shell.html, shell.exe))
402402
$(DD Simple command line shell)
403403
)
404404

405-
$(DT $(D $(DMDDIR)\windows\bin\$(LINK2 http://www.digitalmars.com/d/2.0/windbg.html, windbg.exe))
406-
$(DD Microsoft debugger)
407-
)
408-
409405
$(DT $(D $(DMDDIR)\windows\lib\$(LIB))
410406
$(DD D runtime library)
411407
)
@@ -948,7 +944,7 @@ Macros:
948944
DMD_CONF=$(RELATIVE_LINK2 dmd-conf, dmd.conf)
949945
SC_INI=$(RELATIVE_LINK2 sc-ini, $(DMDDIR)\windows\bin\sc.ini)
950946
DMC=$(LINK2 http://www.digitalmars.com/ctg/sc.html, dmc)
951-
OPTLINK=$(LINK2 http://www.digitalmars.com/ctg/optlink.html, link.exe)
947+
OPTLINK=$(LINK2 http://www.digitalmars.com/ctg/optlink.html, optlink.exe)
952948
DUB=$(LINK2 https://github.com/dlang/dub, dub$(BINEXT))
953949
RDMD=$(LINK2 $(ROOT_DIR)rdmd.html, rdmd$(BINEXT))
954950
DUSTMITE=$(LINK2 https://github.com/CyberShadow/DustMite, dustmite$(BINEXT))

download.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ $(DOWNLOAD_OTHER $(ARCHLINUX), $(LINK2 https://wiki.archlinux.org/index.php/D_(p
176176

177177
$(DOWNLOAD_OTHER $(GENTOO), $(LINK2 https://wiki.gentoo.org/wiki/Dlang, Gentoo), $(CONSOLE layman -f -a dlang))
178178

179-
$(DOWNLOAD_OTHER $(HOMEBREW), $(LINK2 http://brewformulas.org/Dmd, Homebrew), $(CONSOLE brew install dmd))
179+
$(DOWNLOAD_OTHER $(HOMEBREW), $(LINK2 https://formulae.brew.sh/formula/dmd, Homebrew), $(CONSOLE brew install dmd))
180180

181181
$(DOWNLOAD_OTHER $(NIX), Nix/NixOS, $(CONSOLE nix-env -i dmd))
182182

foundation/about.dd

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ $(UL
3333
$(LI pays for hardware costs
3434
(e.g. this website, $(LINK2 http://dlang.org/download.html, dmd downloads),
3535
the $(LINK2 https://tour.dlang.org, D tour) and more))
36-
$(LI is an accepted
37-
$(HTTPS summerofcode.withgoogle.com/organizations/5078256051027968/,
38-
Google Summer of Code organization) and hosted four projects during
39-
the summer of 2016.
36+
$(LI is an accepted Google Summer of Code (GSOC) organization, with projects hosted during
37+
$(HTTPS summerofcode.withgoogle.com/archive/2016/organizations/4688223091556352/, GSOC 2016) and
38+
$(HTTPS summerofcode.withgoogle.com/archive/2019/organizations/6223494952517632/, GSOC 2019).
4039
)
4140
)
4241

0 commit comments

Comments
 (0)