Merge pull request #2178 from wilzbach/fix-18379

Fix Issue 18379 - [404 Not Found] Foundation Donate page not found
merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>

Author: dlang-bot

.htaccess

@@ -65,6 +65,7 @@ Redirect 301 /foundation.html https://dlang.org/foundation/about.html
 Redirect 301 /contributors.html https://dlang.org/foundation/contributors.html
 Redirect 301 /sponsors.html https://dlang.org/foundation/sponsors.html
 Redirect 301 /dlangupb-scholarship.html https://dlang.org/foundation/updscholarship.html
+Redirect 301 /donate.html https://dlang.org/foundation/donate.html
 
 # Error pages
 ErrorDocument 404 /404.html

foundation/about.dd

@@ -8,7 +8,7 @@ $(H4 The D Language Foundation is a
 )
 
 <p class="center">
-<a href="$(ROOT_DIR)donate.html" class="btn donate-large">Donate</a>
+<a href="$(ROOT_DIR)foundation/donate.html" class="btn donate-large">Donate</a>
 </p>
 
 $(H3 History)
@@ -56,7 +56,7 @@ $(P There are many ways to help the D programming language to grow further and
     $(LINK2 https://wiki.dlang.org/Get_involved, get involved).)
 
 $(P If you don't have the time to work on the source code,
-you can also $(LINK2 $(ROOT_DIR)donate.html, donate) to the D Language Foundation.)
+you can also $(LINK2 $(ROOT_DIR)foundation/donate.html, donate) to the D Language Foundation.)
 
 $(H3 The D Language Foundation is a non-profit organization)
 

donate.dd renamed to foundation/donate.dd

@@ -16,7 +16,7 @@ members of the community keep the wheels rolling through their generous contribu
 )
 
 $(P On this page, we recognize some of those who have made monetary donations to the D Language Foundation.
-Each $(LINK2 donate.html, donation), big and small, enables us to keep working toward our goals. The
+Each $(LINK2 $(ROOT_DIR)foundation/donate.html, donation), big and small, enables us to keep working toward our goals. The
 list is ordered by total donation amount, descending, and is far from exhaustive. If you have donated to
 the D Language Foundation and want to see your name in the list, please let us know at
 $(LINK2 mailto:social@dlang.org, social@dlang.org).

foundation/sponsors.dd

@@ -354,7 +354,7 @@ MAN_PAGE=docs/man/man1/dmd.1
 PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \
 	articles ascii-table bugstats builtin \
 	$(CHANGELOG_FILES) code_coverage community comparison concepts \
-	const-faq cppcontracts cpptod ctarguments ctod donate \
+	const-faq cppcontracts cpptod ctarguments ctod \
 	D1toD2 d-array-article d-floating-point deprecate dll-linux dmd \
 	dmd-freebsd dmd-linux dmd-osx dmd-windows documentation download dstyle \
 	exception-safe faq forum-template gpg_keys glossary \
@@ -363,7 +363,7 @@ PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \
 	orgs-using-d overview pretod rationale rdmd regular-expression resources safed \
 	search template-comparison templates-revisited tuple \
 	variadic-function-templates warnings wc windbg \
-	$(addprefix foundation/, index about sponsors upb-scholarship)
+	$(addprefix foundation/, index about donate sponsors upb-scholarship)
 
 # The contributors listing is dynamically generated
 ifneq (1,$(DIFFABLE))