diff --git a/posix.mak b/posix.mak index 688a5ec94e..d653e47777 100644 --- a/posix.mak +++ b/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 glossary legacy) + abi simd betterc importc ob windows glossary legacy editions) SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT)) CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) diff --git a/spec/editions.dd b/spec/editions.dd index 7c87f29a6a..a7ec40d589 100644 --- a/spec/editions.dd +++ b/spec/editions.dd @@ -10,12 +10,12 @@ features. Editions are a module level feature, i.e. various sections of a module cannot be set to different editions. ) -$(P The edition is set by default, by putting it in the $(GLINK2 module, ModuleDeclartion), +$(P The edition is set either by default, by putting it in the $(GLINK2 module, ModuleDeclaration), or with the $(TT -edition) command line switch. ) $(P -Editions are meant to be backwards and forwards compatible; it makes possible a D +Editions are meant to be backwards and forwards compatible; it makes it possible for a D module targeting one edition to import a D module targeting any other edition. A template must obey the rules of the edition targeted by the module in which it is defined, not the module in which it is instantiated. Compatibility is at the @@ -31,7 +31,7 @@ $(GNAME Edition): $(GLINK2 lex, DecimalInteger) ) -$(H2 WWhat can editions do?) +$(H2 What can editions do?) $(UL $(LI Deleting existing features - @@ -71,9 +71,9 @@ $(P An edition level is determined by:) $(OL $(LI an explicit 4 digit number corresponding to the year in which the desired edition was released) -$(LI if no edition is specified, and there is no $(GLINK2 ModuleDeclaration) in the source code, +$(LI if no edition is specified, and there is no $(GLINK2 module, ModuleDeclaration) in the source code, the edition used is the $(B Baseline Edition), which corresponds to 2023.) -$(LI if no edition is specified, and there is a $(GLINK2 ModuleDeclaration) in the source code, +$(LI if no edition is specified, and there is a $(GLINK2 module, ModuleDeclaration) in the source code, the edition used is the year the compiler was released.) ) diff --git a/spec/spec.ddoc b/spec/spec.ddoc index 77dcba7155..05fd4a37ad 100644 --- a/spec/spec.ddoc +++ b/spec/spec.ddoc @@ -109,7 +109,8 @@ $(SUBNAV_TEMPLATE $(ROOT_DIR)spec/ob.html, Live Functions, $(ROOT_DIR)spec/windows.html, Windows Programming, $(ROOT_DIR)spec/glossary.html, Glossary, - $(ROOT_DIR)spec/legacy.html, Legacy Code + $(ROOT_DIR)spec/legacy.html, Legacy Code, + $(ROOT_DIR)spec/editions.html, Editions ) ) )