Merge pull request #2989 from andralex/posix.mak

Fix name of package documentation: std_xyz_package.html -> std_xyz.html

index.d

@@ -21,8 +21,8 @@ $(BOOKTABLE ,
     $(LEADINGROW Algorithms & ranges)
     $(TR
         $(TD
-            $(LINK2 std_algorithm_package.html, std.algorithm)$(BR)
+            $(LINK2 std_algorithm.html, std.algorithm)$(BR)
-            $(LINK2 std_range_package.html, std.range)$(BR)
+            $(LINK2 std_range.html, std.range)$(BR)
             $(LINK2 std_range_primitives.html, std.range.primitives)$(BR)
             $(LINK2 std_range_interfaces.html, std.range.interfaces)
         )
@@ -36,7 +36,7 @@ $(BOOKTABLE ,
     $(TR
         $(TD
             $(LINK2 std_array.html, std.array)$(BR)
-            $(LINK2 std_algorithm_package.html, std.algorithm)
+            $(LINK2 std_algorithm.html, std.algorithm)
         )
         $(TD Convenient operations commonly used with built-in arrays.
             Note that many common array operations are subsets of more generic
@@ -53,7 +53,7 @@ $(BOOKTABLE ,
             $(LINK2 std_container_rbtree.html, std.container.rbtree)$(BR)
             $(LINK2 std_container_slist.html, std.container.slist)
         )
-        $(TD See $(LINK2 std_container_package.html, std.container.*) for an
+        $(TD See $(LINK2 std_container.html, std.container.*) for an
             overview.
         )
     )
@@ -217,7 +217,7 @@ $(BOOKTABLE ,
     $(TR
         $(TD
             $(LINK2 std_functional, std.functional)$(BR)
-            $(LINK2 std_algorithm_package, std.algorithm)$(BR)
+            $(LINK2 std_algorithm, std.algorithm)$(BR)
             $(LINK2 std_signals, std.signals)
         )
         $(TD $(D std.functional), along with the lazy algorithms of
@@ -255,7 +255,7 @@ $(BOOKTABLE ,
         $(TD
             $(LINK2 std_string.html, std.string)$(BR)
             $(LINK2 std_array.html, std.array)$(BR)
-            $(LINK2 std_algorithm_package.html, std.algorithm)$(BR)
+            $(LINK2 std_algorithm.html, std.algorithm)$(BR)
             $(LINK2 std_uni, std.uni)$(BR)
             $(LINK2 std_utf, std.utf)$(BR)
             $(LINK2 std_format.html, std.format)$(BR)

posix.mak

@@ -96,7 +96,8 @@ DOCSRC = ../dlang.org
 WEBSITE_DIR = ../web
 DOC_OUTPUT_DIR = $(WEBSITE_DIR)/phobos-prerelease
 BIGDOC_OUTPUT_DIR = /tmp
-SRC_DOCUMENTABLES = index.d $(addsuffix .d,$(STD_MODULES) $(STD_NET_MODULES) $(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_RANGE_MODULES) $(STD_ALGO_MODULES) std/regex/package $(EXTRA_DOCUMENTABLES) $(STD_LOGGER_MODULES))
+SRC_DOCUMENTABLES = index.d $(addsuffix .d,$(STD_MODULES) \
+	$(EXTRA_DOCUMENTABLES))
 STDDOC = $(DOCSRC)/html.ddoc $(DOCSRC)/dlang.org.ddoc $(DOCSRC)/std_navbar-prerelease.ddoc $(DOCSRC)/std.ddoc $(DOCSRC)/macros.ddoc
 BIGSTDDOC = $(DOCSRC)/std_consolidated.ddoc $(DOCSRC)/macros.ddoc
 # Set DDOC, the documentation generator
@@ -186,33 +187,29 @@ LINKCURL:=$(if $(LIBCURL_STUB),-L$(LIBCURL_STUB),-L-lcurl)
 ################################################################################
 MAIN = $(ROOT)/emptymain.d
 
-# Stuff in std/
+# Packages in std. Just mention the package name here and the actual files in
-STD_MODULES = $(addprefix std/, array ascii base64 bigint \
+# the package in STD_MODULES.
-		bitmanip compiler complex concurrency conv		\
+STD_PACKAGES = $(addprefix std/, algorithm container experimental/logger \
-		cstream csv datetime demangle encoding exception	\
+	range regex)
+
+# Modules in std (including those in packages), in alphabetical order.
+STD_MODULES = $(addprefix std/, \
+  array ascii base64 bigint bitmanip compiler complex concurrency \
+  $(addprefix container/, array binaryheap dlist rbtree slist util) \
+  conv cstream csv datetime demangle \
+  $(addprefix digest/, digest crc md ripemd sha) \
+  encoding exception \
+  $(addprefix experimental/logger/, core filelogger nulllogger multilogger) \
   file format functional getopt json math mathspecial \
-		metastrings mmfile numeric outbuffer parallelism path	\
+  metastrings mmfile net/isemail net/curl numeric outbuffer parallelism path \
-		process random signals socket socketstream	\
+  process random \
-		stdint stdio stdiobase stream string syserror system traits		\
+  $(addprefix range/, primitives interfaces) \
-		typecons typetuple uni uri utf uuid variant xml zip zlib)
+  $(addprefix regex/, $(addprefix internal/,generator ir parser backtracking \
-
+  	kickstart tests thompson)) \
-STD_NET_MODULES = $(addprefix std/net/, isemail curl)
+  signals socket socketstream stdint stdio stdiobase stream \
-
+  string syserror system traits typecons typetuple uni uri utf uuid variant \
-STD_LOGGER_MODULES = $(addprefix std/experimental/logger/, package core \
+  xml zip zlib $(addprefix algorithm/,comparison iteration \
-        filelogger nulllogger multilogger)
+    mutation searching setops sorting))
-
-STD_REGEX_MODULES = $(addprefix std/regex/, package $(addprefix internal/, \
-	generator ir parser backtracking kickstart tests thompson))
-
-STD_ALGO_MODULES = $(addprefix std/algorithm/, package comparison iteration \
-	mutation searching setops sorting)
-
-STD_RANGE_MODULES = $(addprefix std/range/, package primitives interfaces)
-
-STD_DIGEST_MODULES = $(addprefix std/digest/, digest crc md ripemd sha)
-
-STD_CONTAINER_MODULES = $(addprefix std/container/, package array \
-		binaryheap dlist rbtree slist util)
 
 # OS-specific D modules
 EXTRA_MODULES_LINUX := $(addprefix std/c/linux/, linux socket)
@@ -240,18 +237,17 @@ EXTRA_MODULES += $(EXTRA_DOCUMENTABLES) $(addprefix			\
 	$(addprefix std/algorithm/, internal)
 
 # Aggregate all D modules relevant to this build
-D_MODULES = $(STD_MODULES) $(EXTRA_MODULES) $(STD_NET_MODULES) \
+D_MODULES = $(STD_MODULES) $(EXTRA_MODULES) \
-	$(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_REGEX_MODULES) \
+  $(addsuffix /package,$(STD_PACKAGES))
-	$(STD_RANGE_MODULES) $(STD_ALGO_MODULES) $(STD_LOGGER_MODULES)
 
 # Add the .d suffix to the module names
 D_FILES = $(addsuffix .d,$(D_MODULES))
 # Aggregate all D modules over all OSs (this is for the zip file)
 ALL_D_FILES = $(addsuffix .d, $(D_MODULES) \
-$(EXTRA_MODULES_LINUX) $(EXTRA_MODULES_OSX) $(EXTRA_MODULES_FREEBSD) $(EXTRA_MODULES_WIN32)) \
+  $(EXTRA_MODULES_LINUX) $(EXTRA_MODULES_OSX) $(EXTRA_MODULES_FREEBSD) \
-	std/internal/windows/advapi32.d \
+  $(EXTRA_MODULES_WIN32)) std/internal/windows/advapi32.d \
   std/windows/registry.d std/c/linux/pthread.d std/c/linux/termios.d \
-	std/c/linux/tipc.d std/net/isemail.d std/net/curl.d
+  std/c/linux/tipc.d
 
 # C files to be part of the build
 C_MODULES = $(addprefix etc/c/zlib/, adler32 compress crc32 deflate	\
@@ -426,57 +422,36 @@ endif
 ###########################################################
 # html documentation
 
-HTMLS=$(addprefix $(DOC_OUTPUT_DIR)/, $(subst /,_,$(subst .d,.html,	\
+# Package to html, e.g. std/algorithm -> std_algorithm.html
-	$(SRC_DOCUMENTABLES))))
+P2HTML=$(addsuffix .html,$(subst /,_,$1))
-BIGHTMLS=$(addprefix $(BIGDOC_OUTPUT_DIR)/, $(subst /,_,$(subst	\
+# D file to html, e.g. std/conv.d -> std_conv.html
-	.d,.html, $(SRC_DOCUMENTABLES))))
+D2HTML=$(subst /,_,$(subst .d,.html,$1))
+
+HTMLS=$(addprefix $(DOC_OUTPUT_DIR)/, \
+	$(call D2HTML, $(SRC_DOCUMENTABLES)) \
+	$(call P2HTML, $(STD_PACKAGES)))
+BIGHTMLS=$(addprefix $(BIGDOC_OUTPUT_DIR)/, \
+	$(call D2HTML, $(SRC_DOCUMENTABLES)))
 
 $(DOC_OUTPUT_DIR)/. :
 	mkdir -p $@
 
-$(DOC_OUTPUT_DIR)/std_%.html : std/%.d $(STDDOC)
+# For each module, define a rule e.g.:
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
+# ../web/phobos/std_conv.html : std/conv.d $(STDDOC) ; ...
+$(foreach p,$(SRC_DOCUMENTABLES),$(eval \
+$(DOC_OUTPUT_DIR)/$(call D2HTML,$p) : $p $(STDDOC) ;\
+  $(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))
 
-$(DOC_OUTPUT_DIR)/std_c_%.html : std/c/%.d $(STDDOC)
+# For each package, define a rule e.g.:
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
+# ../web/phobos/std_algorithm.html : std/algorithm/package.d $(STDDOC) ; ...
-
+$(foreach p,$(STD_PACKAGES),$(eval \
-$(DOC_OUTPUT_DIR)/std_c_linux_%.html : std/c/linux/%.d $(STDDOC)
+$(DOC_OUTPUT_DIR)/$(call P2HTML,$p) : $p/package.d $(STDDOC) ;\
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
+  $(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))
-
-$(DOC_OUTPUT_DIR)/std_c_windows_%.html : std/c/windows/%.d $(STDDOC)
-	$(DDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_container_%.html : std/container/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_algorithm_%.html : std/algorithm/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_range_%.html : std/range/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_regex_%.html : std/regex/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_net_%.html : std/net/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_experimental_logger_%.html : std/experimental/logger/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/std_digest_%.html : std/digest/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/etc_c_%.html : etc/c/%.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
-
-$(DOC_OUTPUT_DIR)/%.html : %.d $(STDDOC)
-	$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
 
 html : $(DOC_OUTPUT_DIR)/. $(HTMLS) $(STYLECSS_TGT)
 
 allmod :
-	echo $(SRC_DOCUMENTABLES)
+	@echo $(SRC_DOCUMENTABLES) $(addsuffix /package.d,$(STD_PACKAGES))
 
 rsync-prerelease : html
 	rsync -avz $(DOC_OUTPUT_DIR)/ d-programming@digitalmars.com:data/phobos-prerelease/

std/algorithm/comparison.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic _comparison algorithms.
 
 $(BOOKTABLE Cheat Sheet,

std/algorithm/iteration.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic _iteration algorithms.
 
 $(BOOKTABLE Cheat Sheet,

std/algorithm/mutation.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic _mutation algorithms.
 
 $(BOOKTABLE Cheat Sheet,

std/algorithm/searching.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic _searching algorithms.
 
 $(BOOKTABLE Cheat Sheet,

std/algorithm/setops.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic algorithms that implement set operations.
 
 $(BOOKTABLE Cheat Sheet,

std/algorithm/sorting.d

@@ -1,6 +1,6 @@
 // Written in the D programming language.
 /**
-This is a submodule of $(LINK2 std_algorithm_package.html, std.algorithm).
+This is a submodule of $(LINK2 std_algorithm.html, std.algorithm).
 It contains generic _sorting algorithms.
 
 $(BOOKTABLE Cheat Sheet,

std/container/array.d

@@ -2,7 +2,7 @@
 This module provides an $(D Array) type with deterministic memory usage not
 reliant on the GC, as an alternative to the built-in arrays.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_array.d)
 Macros:

std/container/binaryheap.d

@@ -2,7 +2,7 @@
 This module provides a $(D BinaryHeap) adaptor that makes a binary heap out of
 any user-provided random-access range.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_binaryheap.d)
 Macros:

std/container/dlist.d

@@ -1,7 +1,7 @@
 /**
 This module implements a generic doubly-linked list container.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_dlist.d)
 Macros:

std/container/package.d

@@ -136,7 +136,7 @@ The_primary_range_of_a_container:
 While some _containers offer direct access to their elements e.g. via
 $(D opIndex), $(D c.front) or $(D c.back), access
 and modification of a _container's contents is generally done through
-its primary $(LINK2 std_range_package.html, range) type,
+its primary $(LINK2 std_range.html, range) type,
 which is aliased as $(D C.Range). For example, the primary range type of
 $(D Array!int) is $(D Array!int.Range).
 
@@ -169,7 +169,7 @@ array.linearRemove(array[].find(2).takeOne());
 assert(array[].equal([1, 3]));
 ---
 
-When any $(LINK2 std_range_package.html, range) can be passed as an argument to
+When any $(LINK2 std_range.html, range) can be passed as an argument to
 a member function, the documention usually refers to the parameter's templated
 type as $(D Stuff).
 

std/container/rbtree.d

@@ -1,7 +1,7 @@
 /**
 This module implements a red-black tree container.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_rbtree.d)
 Macros:

std/container/slist.d

@@ -1,7 +1,7 @@
 /**
 This module implements a singly-linked list container.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_slist.d)
 Macros:

std/container/util.d

@@ -1,7 +1,7 @@
 /**
 This module contains some common utilities used by containers.
 
-This module is a submodule of $(LINK2 std_container_package.html, std.container).
+This module is a submodule of $(LINK2 std_container.html, std.container).
 
 Source: $(PHOBOSSRC std/container/_util.d)
 Macros:

std/exception.d

@@ -1663,7 +1663,7 @@ Returns: A wrapper $(D struct) that preserves the range interface of $(D input).
 
 opSlice:
 Infinite ranges with slicing support must return an instance of
-$(XREF range_package, Take) when sliced with a specific lower and upper
+$(XREF range, Take) when sliced with a specific lower and upper
 bound (see $(XREF range_primitives, hasSlicing)); $(D handle) deals with this
 by $(D take)ing 0 from the return value of the handler function and returning
 that when an exception is caught.

std/range/interfaces.d

@@ -1,5 +1,5 @@
 /**
-This module is a submodule of $(LINK2 std_range_package.html, std.range).
+This module is a submodule of $(LINK2 std_range.html, std.range).
 
 The main $(D std.range) module provides template-based tools for working with
 ranges, but sometimes an object-based interface for ranges is needed, such as

std/range/primitives.d

@@ -1,5 +1,5 @@
 /**
-This module is a submodule of $(LINK2 std_range_package.html, std.range).
+This module is a submodule of $(LINK2 std_range.html, std.range).
 
 It provides basic range functionality by defining several templates for testing
 whether a given object is a _range, and what kind of _range it is:

win32.mak

@@ -300,7 +300,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\core_sync_mutex.html \
 	$(DOC)\core_sync_rwmutex.html \
 	$(DOC)\core_sync_semaphore.html \
-	$(DOC)\std_algorithm_package.html \
+	$(DOC)\std_algorithm.html \
 	$(DOC)\std_algorithm_comparison.html \
 	$(DOC)\std_algorithm_iteration.html \
 	$(DOC)\std_algorithm_mutation.html \
@@ -320,7 +320,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_container_dlist.html \
 	$(DOC)\std_container_rbtree.html \
 	$(DOC)\std_container_slist.html \
-	$(DOC)\std_container_package.html \
+	$(DOC)\std_container.html \
 	$(DOC)\std_container_util.html \
 	$(DOC)\std_conv.html \
 	$(DOC)\std_digest_crc.html \
@@ -348,7 +348,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_path.html \
 	$(DOC)\std_process.html \
 	$(DOC)\std_random.html \
-	$(DOC)\std_range_package.html \
+	$(DOC)\std_range.html \
 	$(DOC)\std_range_primitives.html \
 	$(DOC)\std_range_interfaces.html \
 	$(DOC)\std_regex.html \
@@ -377,7 +377,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_experimental_logger_filelogger.html \
 	$(DOC)\std_experimental_logger_multilogger.html \
 	$(DOC)\std_experimental_logger_nulllogger.html \
-	$(DOC)\std_experimental_logger_package.html \
+	$(DOC)\std_experimental_logger.html \
 	$(DOC)\std_windows_charset.html \
 	$(DOC)\std_windows_registry.html \
 	$(DOC)\std_c_fenv.html \
@@ -588,8 +588,8 @@ $(DOC)\core_sync_rwmutex.html : $(STDDOC) $(DRUNTIME)\src\core\sync\rwmutex.d
 $(DOC)\core_sync_semaphore.html : $(STDDOC) $(DRUNTIME)\src\core\sync\semaphore.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\core_sync_semaphore.html $(STDDOC) $(DRUNTIME)\src\core\sync\semaphore.d -I$(DRUNTIME)\src\
 
-$(DOC)\std_algorithm_package.html : $(STDDOC) std\algorithm\package.d
+$(DOC)\std_algorithm.html : $(STDDOC) std\algorithm\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm_package.html $(STDDOC) std\algorithm\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm.html $(STDDOC) std\algorithm\package.d
 
 $(DOC)\std_algorithm_comparison.html : $(STDDOC) std\algorithm\comparison.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm_comparison.html $(STDDOC) std\algorithm\comparison.d
@@ -654,11 +654,11 @@ $(DOC)\std_container_slist.html : $(STDDOC) std\container\slist.d
 $(DOC)\std_container_util.html : $(STDDOC) std\container\util.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container_util.html $(STDDOC) std\container\util.d
 
-$(DOC)\std_container_package.html : $(STDDOC) std\container\package.d
+$(DOC)\std_container.html : $(STDDOC) std\container\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container_package.html $(STDDOC) std\container\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container.html $(STDDOC) std\container\package.d
 
-$(DOC)\std_range_package.html : $(STDDOC) std\range\package.d
+$(DOC)\std_range.html : $(STDDOC) std\range\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range_package.html $(STDDOC) std\range\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range.html $(STDDOC) std\range\package.d
 
 $(DOC)\std_range_primitives.html : $(STDDOC) std\range\primitives.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range_primitives.html $(STDDOC) std\range\primitives.d
@@ -807,8 +807,8 @@ $(DOC)\std_experimental_logger_filelogger.html : $(STDDOC) std\experimental\logg
 $(DOC)\std_experimental_logger_nulllogger.html : $(STDDOC) std\experimental\logger\nulllogger.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger_nulllogger.html $(STDDOC) std\experimental\logger\nulllogger.d
 
-$(DOC)\std_experimental_logger_package.html : $(STDDOC) std\experimental\logger\package.d
+$(DOC)\std_experimental_logger.html : $(STDDOC) std\experimental\logger\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger_package.html $(STDDOC) std\experimental\logger\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger.html $(STDDOC) std\experimental\logger\package.d
 
 $(DOC)\std_digest_crc.html : $(STDDOC) std\digest\crc.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_digest_crc.html $(STDDOC) std\digest\crc.d

win64.mak

@@ -317,7 +317,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\core_sync_mutex.html \
 	$(DOC)\core_sync_rwmutex.html \
 	$(DOC)\core_sync_semaphore.html \
-	$(DOC)\std_algorithm_package.html \
+	$(DOC)\std_algorithm.html \
 	$(DOC)\std_algorithm_comparison.html \
 	$(DOC)\std_algorithm_iteration.html \
 	$(DOC)\std_algorithm_mutation.html \
@@ -337,7 +337,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_container_dlist.html \
 	$(DOC)\std_container_rbtree.html \
 	$(DOC)\std_container_slist.html \
-	$(DOC)\std_container_package.html \
+	$(DOC)\std_container.html \
 	$(DOC)\std_container_util.html \
 	$(DOC)\std_conv.html \
 	$(DOC)\std_digest_crc.html \
@@ -365,7 +365,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_path.html \
 	$(DOC)\std_process.html \
 	$(DOC)\std_random.html \
-	$(DOC)\std_range_package.html \
+	$(DOC)\std_range.html \
 	$(DOC)\std_range_primitives.html \
 	$(DOC)\std_range_interfaces.html \
 	$(DOC)\std_regex.html \
@@ -394,7 +394,7 @@ DOCS=	$(DOC)\object.html \
 	$(DOC)\std_experimental_logger_filelogger.html \
 	$(DOC)\std_experimental_logger_multilogger.html \
 	$(DOC)\std_experimental_logger_nulllogger.html \
-	$(DOC)\std_experimental_logger_package.html \
+	$(DOC)\std_experimental_logger.html \
 	$(DOC)\std_windows_charset.html \
 	$(DOC)\std_windows_registry.html \
 	$(DOC)\std_c_fenv.html \
@@ -546,8 +546,8 @@ $(DOC)\core_sync_rwmutex.html : $(STDDOC) $(DRUNTIME)\src\core\sync\rwmutex.d
 $(DOC)\core_sync_semaphore.html : $(STDDOC) $(DRUNTIME)\src\core\sync\semaphore.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\core_sync_semaphore.html $(STDDOC) $(DRUNTIME)\src\core\sync\semaphore.d -I$(DRUNTIME)\src\
 
-$(DOC)\std_algorithm_package.html : $(STDDOC) std\algorithm\package.d
+$(DOC)\std_algorithm.html : $(STDDOC) std\algorithm\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm_package.html $(STDDOC) std\algorithm\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm.html $(STDDOC) std\algorithm\package.d
 
 $(DOC)\std_algorithm_comparison.html : $(STDDOC) std\algorithm\comparison.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_algorithm_comparison.html $(STDDOC) std\algorithm\comparison.d
@@ -612,11 +612,11 @@ $(DOC)\std_container_slist.html : $(STDDOC) std\container\slist.d
 $(DOC)\std_container_util.html : $(STDDOC) std\container\util.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container_util.html $(STDDOC) std\container\util.d
 
-$(DOC)\std_container_package.html : $(STDDOC) std\container\package.d
+$(DOC)\std_container.html : $(STDDOC) std\container\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container_package.html $(STDDOC) std\container\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_container.html $(STDDOC) std\container\package.d
 
-$(DOC)\std_range_package.html : $(STDDOC) std\range\package.d
+$(DOC)\std_range.html : $(STDDOC) std\range\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range_package.html $(STDDOC) std\range\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range.html $(STDDOC) std\range\package.d
 
 $(DOC)\std_range_primitives.html : $(STDDOC) std\range\primitives.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_range_primitives.html $(STDDOC) std\range\primitives.d
@@ -765,8 +765,8 @@ $(DOC)\std_experimental_logger_filelogger.html : $(STDDOC) std\experimental\logg
 $(DOC)\std_experimental_logger_nulllogger.html : $(STDDOC) std\experimental\logger\nulllogger.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger_nulllogger.html $(STDDOC) std\experimental\logger\nulllogger.d
 
-$(DOC)\std_experimental_logger_package.html : $(STDDOC) std\experimental\logger\package.d
+$(DOC)\std_experimental_logger.html : $(STDDOC) std\experimental\logger\package.d
-	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger_package.html $(STDDOC) std\experimental\logger\package.d
+	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger.html $(STDDOC) std\experimental\logger\package.d
 
 $(DOC)\std_digest_crc.html : $(STDDOC) std\digest\crc.d
 	$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_digest_crc.html $(STDDOC) std\digest\crc.d