Skip to content

Commit 79184c6

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents d36c91b + c0a395b commit 79184c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+742
-235
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,15 @@ should be the same for all three directories.
9696

9797
The output is in `web/phobos` and `web/library`.
9898

99+
### Avoid building dmd
100+
101+
By default, the dlang.org build downloads a stable DMD compiler which is used to build the documentation pages.
102+
If you prefer to use an installed `dmd` binary, set `STABLE_DMD` and `STABLE_DMD_CONF`:
103+
104+
```
105+
make -f posix.mak html -j4 STABLE_DMD=dmd STABLE_DMD_CONF=/etc/dmd.conf
106+
```
107+
99108
### Learning more about DDoc
100109

101110
Please see the [Ddoc fundamentals](https://wiki.dlang.org/Contributing_to_dlang.org).

articles/code_coverage.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ is creating a test suite for it. Without some sort of test suite,
77
it is impossible to know if the software works at all.
88
The D language has
99
many features to aid in the creation of test suites, such as
10-
$(LINK2 spec/unittest.html, unit tests) and
11-
$(LINK2 spec/contracts.html, contract programming).
10+
$(DDLINK spec/unittest, Unit Tests, unit tests) and
11+
$(DDLINK spec/contracts, Contract Programming, contract programming).
1212
But there's the issue of how thoroughly the test suite tests
1313
the code.
1414
The $(LINK2 http://www.digitalmars.com/ctg/trace.html, profiler)

articles/ctarguments.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $(H2 $(LNAME2 available-operations, Available operations))
113113

114114
$(H3 $(LNAME2 loops, Loops))
115115

116-
$(P D's $(LINK2 spec/statement.html#ForeachStatement, foreach statement) has special
116+
$(P D's $(DDSUBLINK spec/statement, ForeachStatement, foreach statement) has special
117117
semantics when iterating over compile-time sequences. It repeats the body of the loop
118118
for each of the sequence elements, with the loop iteration symbol being an alias
119119
for each compile-time sequence element in turn.

articles/exception-safe.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ solution separates the unwinding code from the setup, and it can often be
9797
a visually large separation. Closely related code should be grouped together.
9898
)
9999

100-
$(P The $(LINK2 spec/statement.html#ScopeGuardStatement, scope guard statement) is a
101-
better approach:
100+
$(P The $(DDSUBLINK spec/statement, ScopeGuardStatement, scope guard statement)
101+
is a better approach:
102102
)
103103

104104
---

articles/faq.dd

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ $(H2 General D FAQ)
9191
$(ITEM case_range, Why doesn't the case range statement
9292
use the $(D case X..Y:) syntax?)
9393

94-
$(P See the $(LINK2 spec/statement.html#CaseRangeStatement, case range statement).)
94+
$(P See the $(DDSUBLINK spec/statement, CaseRangeStatement, case range statement).)
9595

9696
$(P The usages of .. would then be:
9797
$(OL
@@ -189,7 +189,8 @@ $(ITEM q1_1, Could you change the name? D is kind of hard to search for on searc
189189

190190
$(ITEM q1_2, Is there a linux port of D?)
191191

192-
$(P Yes, the D compiler includes a $(LINK2 dmd-linux.html, linux version).
192+
$(P Yes, the D compiler includes a $(DDLINK dmd-linux,
193+
DMD Compiler for Linux, linux version).
193194
)
194195

195196
$(ITEM gdc, Is there a GNU version of D?)
@@ -261,7 +262,7 @@ $(ITEM q6, Why $(I no) fall through on switch statements?)
261262
)
262263

263264
$(P In D2, implicit fall through is disallowed. You have to add a
264-
$(LINK2 spec/statement.html#GotoStatement, goto case;) statement to explicitly
265+
$(DDSUBLINK spec/statement, GotoStatement, goto case;) statement to explicitly
265266
state the intention of falling through.
266267
)
267268

@@ -624,7 +625,8 @@ the termination condition on the fly.)
624625
$(ITEM cpp_interface, Why doesn't D have an interface to C++ as well as C?)
625626

626627
$(P D 2.0 does have a
627-
$(LINK2 spec/cpp_interface.html, limited interface to C++ code.)
628+
$(DDLINK spec/cpp_interface, Interfacing to C++,
629+
limited interface to C++ code.)
628630
) Here are some reasons why it isn't a full interface:
629631

630632

@@ -775,7 +777,7 @@ $(ITEM reference-counting, Why doesn't D use reference counting for garbage coll
775777
counting, as rc is better for managing scarce resources like file
776778
handles.
777779
Furthermore, if ref counting is a must, Phobos has the
778-
$(LINK2 phobos/std_typecons.html#RefCounted, std.typecons.RefCounted) type
780+
$(REF RefCounted, std,typecons) type
779781
which implements it as a library, similar to C++'s shared_ptr<>.
780782
)
781783

articles/migrate-to-shared.dd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ $(D_S $(TITLE),
44

55
$(HEADERNAV_TOC)
66

7-
$(P Starting with $(LINK2 changelog/2.030.html, dmd version 2.030),
7+
$(P Starting with
8+
$(DDLINK changelog/2.030, Change Log: 2.030, dmd version 2.030),
89
the default storage class
910
for statics and globals will be
10-
$(LINK2 glossary.html#tls, thread local storage (TLS)), rather
11+
$(DDSUBLINK glossary, tls, thread local storage (TLS)), rather
1112
than the classic global data segment.
1213
While most D code should just compile and run successfully without
1314
change, there can be some issues.

articles/mixin.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Ddoc
33
$(D_S Mixins,
44

55
$(P Mixins (not to be confused with
6-
$(LINK2 spec/template-mixin.html, template mixins))
6+
$(DDLINK spec/template-mixin, Template Mixins, template mixins))
77
enable string constants to be compiled as regular D code
88
and inserted into the program.
99
Combining this with compile time manipulation of strings

articles/pretod.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ void foo(T t)
615615

616616
$(DWAY
617617

618-
$(P D has the <a href="spec/version.html#StaticAssert">static assert</a>,
618+
$(P D has the $(DDSUBLINK spec/version, StaticAssert, static assert),
619619
which can be used anywhere a declaration
620620
or a statement can be used. For example:
621621
)
@@ -649,7 +649,7 @@ else
649649
<hr><!-- -------------------------------------------- -->
650650
$(H2 $(LNAME2 mixins, Template Mixins))
651651

652-
$(P D $(LINK2 spec/template-mixin.html, template mixins)
652+
$(P D $(DDLINK spec/template-mixin, Template Mixins, template mixins)
653653
superficially look just
654654
like using C's preprocessor to insert blocks of code and
655655
parse them in the scope of where they are instantiated.

articles/regular-expression.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ $(D_S $(TITLE),
143143
auto replaced = replaceAll(text, r"([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})".regex, "$3-$1-$2");
144144
---
145145
$(P $(D r"pattern".regex) is just another notation of writing $(D regex("pattern")) called
146-
$(LINK2 spec/function.html#pseudo-member, UFCS) that some may find more
146+
$(DDSUBLINK spec/function, pseudo-member, UFCS) that some may find more
147147
slick.
148148
As can be seen the replacement is controlled by a format string not unlike one in C's famous printf.
149149
The &#36;1, &#36;2, &#36;3 substituted with content of sub-expressions.

articles/template-comparison.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ void foo()
349349
$(TR
350350
$(TD Pointer to Member Parameters)
351351
$(TD No, D does not have pointers to members, it has
352-
$(LINK2 spec/type.html#delegates, delegates),
352+
$(DDSUBLINK spec/type, delegates, delegates),
353353
which can be used as parameters)
354354
$(TD Yes)
355355
$(TD No change)
@@ -639,7 +639,7 @@ struct Bar(T1, T2) { }
639639
alias BarInst = Bar!(int, float);
640640
Foo!(BarInst) f;
641641
---
642-
See $(LINK2 spec/expression.html#IsExpression, is expressions).
642+
See $(DDSUBLINK spec/expression, IsExpression, is expressions).
643643
)
644644
$(TD No)
645645
$(TD No change)

0 commit comments

Comments
 (0)