Merge pull request #914 from MartinNowak/std_container_package

move std_container_package.html to std_container.html
dlang · Feb 28, 2015 · 8895541 · 8895541
1 parent b522d5a
commit 8895541
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.htaccess b/.htaccess
@@ -16,8 +16,4 @@ RewriteBase /
 # However, we need redirects for packages in
 # previous stable releases (namely, std.container).
 
-# TODO: Make the rule apply to the phobos directory
-# (additionally to the phobos-prerelease directory)
-# when 2.067 is released.
-
-RewriteRule ^(phobos-prerelease/std_container)_package\.html $1.html [R=301,L]
+RewriteRule ^(phobos(-prerelease)?/std_container)_package\.html $1.html [R=301,L]
diff --git a/posix.mak b/posix.mak
@@ -361,6 +361,8 @@ ${DOC_OUTPUT_DIR}/phobos/index.html : $(DMD_REL) $(STD_DDOC) \
 	  DRUNTIME_PATH=${DRUNTIME_DIR}-${LATEST} \
 	  DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos \
 	  STDDOC="$(addprefix `pwd`/, $(STD_DDOC))"
+# temporary hack for 2.066.1
+	mv ${DOC_OUTPUT_DIR}/phobos/std_container_package.html ${DOC_OUTPUT_DIR}/phobos/std_container.html
 
 phobos-prerelease-verbatim : ${PHOBOS_DIR}/.cloned ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim
 ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim : verbatim.ddoc \