From 856e901e24965ae178c1dc57fcbf5579c0bf9a87 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 15 Dec 2016 08:16:36 +0100 Subject: [PATCH 1/2] remove article view from scholarship page --- dlangupb-scholarship.dd | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlangupb-scholarship.dd b/dlangupb-scholarship.dd index 19744aa887..220603f1dd 100644 --- a/dlangupb-scholarship.dd +++ b/dlangupb-scholarship.dd @@ -75,5 +75,3 @@ you. Feel free to direct any related questions to foundation@dlang.org.) Macros: TITLE=The DLang UPB Languages and Systems Research Scholarship - WIKI=DLangUPBScholarship - SUBNAV=$(SUBNAV_ARTICLES) From eb50b9e16471b801eb2e7c7bb2642381a1d19d87 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 15 Dec 2016 08:17:02 +0100 Subject: [PATCH 2/2] add donate page --- dlang.org.ddoc | 2 ++ donate.dd | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ foundation.dd | 50 ++++++++++++++++----------- index.dd | 2 +- posix.mak | 2 +- win32.mak | 5 ++- 6 files changed, 130 insertions(+), 23 deletions(-) create mode 100644 donate.dd diff --git a/dlang.org.ddoc b/dlang.org.ddoc index 1d54a73e5c..e168eb2790 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -232,6 +232,8 @@ $(SUBMENU_MANUAL $(SUBMENU_LINK https://wiki.dlang.org, Wiki) $(SUBMENU_LINK_DIVIDER https://github.com/dlang, GitHub) $(SUBMENU_LINK $(ROOT_DIR)bugstats.php, Issues) + $(SUBMENU_LINK_DIVIDER $(ROOT_DIR)foundation.html, Foundation) + $(SUBMENU_LINK $(ROOT_DIR)donate.html, Donate) ) NAVIGATION_DOCUMENTATION= $(SUBMENU_MANUAL diff --git a/donate.dd b/donate.dd new file mode 100644 index 0000000000..c15a18afb1 --- /dev/null +++ b/donate.dd @@ -0,0 +1,92 @@ +Ddoc + +$(D_S $(TITLE), + +$(H4 The D Language Foundation is a + $(HTTPS en.wikipedia.org/wiki/501(c)_organization, 501(c) non-profit public charity) + devoted to advancing open source technology related to the D programming language. +) + +The D Language Foundation: + +$(COMMENT keep this list in sync with foundation.dd) +$(UL + $(LI holds and defends the copyright and other intellectual property rights for the D programming language.) + $(LI provides resources for furthering the development and adoption of the D programming language.) + $(LI awards $(LINK2 http://dlang.org/blog/2016/12/05/the-d-language-foundations-scholarship-program, scholarships) + to highly skilled students.) + $(LI organizes the yearly $(HTTP dconf.org, DConf), the international annual conference of D Language developers and users.) + $(LI pays for hardware costs + (e.g. this website, $(LINK2 http://dlang.org/download.html, dmd downloads), + the $(LINK2 https://tour.dlang.org, D tour) and more)) + $(LI is an accepted + $(HTTPS summerofcode.withgoogle.com/organizations/5078256051027968/, + Google Summer of Code organization) and hosted four projects during + the summer of 2016. + ) +) + +$(H3 How can I donate?) + +We welcome contributions from both organizations and individuals. Your help is highly appreciated. + +$(DONATE_ITEM Donate through PayPal, paypal, + + Click the PayPal button to make a donation to the D Language Foundation via PayPal: + $(BR) $(BR) + +
+ + + + +
+) + +$(DONATE_ITEM Donate by credit card, credit-card, + Please use the PayPal button above to donate by credit card. You don't need a PayPal account to use the donation button. +) + +$(DONATE_ITEM Electronic wire transfers or bank check, money, + Wire transfer information will be announced soon. In the meantime please use PayPal or $(LINK2 mailto:foundation@dlang.org, contact the D Language Foundation). +) + +$(H3 If I donate financially, where do my donations go?) + +$(P The D Languages Foundation awards $(LINK2 http://dlang.org/blog/2016/12/05/the-d-language-foundations-scholarship-program, scholarships) to highly skilled students. +Each $(DOLLAR)5 you donate contributes to approximately one hour of work by a talented graduate student, and +these hours add quickly toward important projects that further the state of the art in the D +programming language.) + +$(P If you have a specific target or project that you wish to directly support, please $(LINK2 mailto:foundation@dlang.org, contact the D Language Foundation).) + +$(P By the Foundation bylaws, its officers (Walter Bright, Andrei Alexandrescu and Ali Çehreli) + cannot get income from the Foundation, which preempts a variety of conflicts of interest.) + +$(H3 The D Language Foundation is a non-profit organization) + +$(P For US taxpayers, contributions to the D Language Foundation are tax-deductible. +The D Language Foundation is a $(HTTPS en.wikipedia.org/wiki/501(c)_organization, 501(c) non-profit public charity) registered in the state of Washington, USA. +You should consult your tax adviser for rules as they apply to your situation.) + +$(P Donations to the D Language Foundation are currently not tax-deductible in most other countries as they require an organisation to be incorporated in that country and the D Language Foundation does currently not have the resources to do so.) + +$(P If you have a question about donations, please write to the D Language Foundation at $(LINK2 mailto:foundation@dlang.org, foundation@dlang.org).) + +) + +Macros: + TITLE=Contribute to the D Language Foundation + NOSPAM_FOUNDATION=$1 + FA_ICON= + REMOVE_FIRST=$+ + DONATE_ITEM= + EXTRA_HEADERS=$(T style, + .donate-item { + padding-left: 30px; + } + .donate-item div { + padding-left: 30px; + } + ) + _= diff --git a/foundation.dd b/foundation.dd index 1a4f865d76..d7a39abcd7 100644 --- a/foundation.dd +++ b/foundation.dd @@ -2,9 +2,11 @@ Ddoc $(D_S $(TITLE), -$(H4 The D Language Foundation is an organization devoted to advancing - open source technology related to the D programming language. +$(H4 The D Language Foundation is a + $(HTTPS en.wikipedia.org/wiki/501(c)_organization, 501(c) non-profit public charity) + devoted to advancing open source technology related to the D programming language. ) + $(H3 History) $(P The D programming language was started by Walter Bright, as a 'better C++' @@ -15,18 +17,23 @@ future development of the D programming language.) $(H3 Current projects) -The D foundation +The D Language Foundation: +$(COMMENT keep this list in sync with donate.dd) $(UL - - $(LI is providing the various resources for the D community - (e.g. this website, dmd downloads, the D tour and more)) + $(LI holds and defends the copyright and other intellectual property rights for the D programming language.) + $(LI provides resources for furthering the development and adoption of the D programming language.) + $(LI awards $(LINK2 http://dlang.org/blog/2016/12/05/the-d-language-foundations-scholarship-program, scholarships) + to highly skilled students.) + $(LI organizes the yearly $(HTTP dconf.org, DConf), the international annual conference of D Language developers and users.) + $(LI pays for hardware costs + (e.g. this website, $(LINK2 http://dlang.org/download.html, dmd downloads), + the $(LINK2 https://tour.dlang.org, D tour) and more)) $(LI is an accepted $(HTTPS summerofcode.withgoogle.com/organizations/5078256051027968/, - Google Summer of Code organization) and hosts four projects during + Google Summer of Code organization) and hosted four projects during the summer of 2016. ) - $(LI is organizing the yearly $(HTTP dconf.org, D conference)) ) $(H3 Committee) @@ -39,29 +46,32 @@ $(UL $(LI $(HTTP acehreli.org, Ali Çehreli), Secretary) ) -$(H3 Becoming a member) +$(H3 How can I contribute?) -Individual and corporate membership packages will be announced in the future. +$(P There are many ways to help the D programming language to grow further and + $(LINK2 https://wiki.dlang.org/Get_involved, get involved).) -$(H3 Sponsoring D) +$(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.) -$(P If you want to help the D Language to advance further and have resources - that you can spend, don't hesitate to contact - $(HTTPS erdani.com/index.php/contact, Andrei) and - $(HTTP www.walterbright.com, Walter). - $(BR) - Your help is highly appreciated! -) +$(H3 The D Language Foundation is a non-profit organization) -$(P We are pleased to announce that the D Language Foundation is now a 501(c)(3) tax exempt organization, and as such, - donations may be tax-deductible) +The D Language Foundation has been recognized as a public charity under section 501(c)(3) of the Internal Revenue Code. $(H3 Official contacts) $(P The D Language Foundation has been incorporated with the state of Washington, USA. The employer ID is 47-5352856.) +$(P If you want to get in touch with the D Language Foundation, please feel free to write to $(LINK2 mailto:foundation@dlang.org, foundation@dlang.org).) + ) Macros: TITLE=The D Language Foundation + EXTRA_HEADERS=$(T style, + .dlang-address { + padding-left: 30px; + } + ) + _= diff --git a/index.dd b/index.dd index 85ca8b3fe2..a904ffcedd 100644 --- a/index.dd +++ b/index.dd @@ -123,7 +123,7 @@ $(DIVC boxes, Browse the $(LINK2 https://wiki.dlang.org/, wiki) where among other things you can find the $(LINK2 https://wiki.dlang.org/Vision/2016H2, high-level vision) - of the D foundation. + of the $(LINK2 $(ROOT_DIR)foundation.html, D foundation). ) ) $(TOUR book, Documentation, diff --git a/posix.mak b/posix.mak index 588a34d3e9..06e5b010a4 100644 --- a/posix.mak +++ b/posix.mak @@ -164,7 +164,7 @@ CHANGELOG_FILES=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \ articles ascii-table bugstats.php builtin \ $(CHANGELOG_FILES) code_coverage community comparison concepts \ - const-faq cpptod ctarguments ctod \ + const-faq cpptod ctarguments ctod donate \ D1toD2 d-array-article d-floating-point deprecate dlangupb-scholarship dll-linux dmd \ dmd-freebsd dmd-linux dmd-osx dmd-windows documentation download dstyle \ exception-safe faq forum-template foundation gpg_keys glossary \ diff --git a/win32.mak b/win32.mak index 6a413bae73..b8ddafb15b 100644 --- a/win32.mak +++ b/win32.mak @@ -49,7 +49,7 @@ SRC= $(SPECSRC) 404.dd cpptod.dd ctod.dd pretod.dd cppcontracts.dd index.dd over D1toD2.dd intro-to-datetime.dd simd.dd deprecate.dd download.dd \ dll-linux.dd bugstats.php.dd \ ctarguments.dd articles.dd community.dd documentation.dd menu.dd \ - resources.dd search.dd dlangupb-scholarship.dd + resources.dd search.dd dlangupb-scholarship.dd donate SPECSRC=spec\spec.dd spec\intro.dd spec\lex.dd \ spec\grammar.dd spec\module.dd spec\declaration.dd \ @@ -142,6 +142,7 @@ TARGETS= $(SPECTARGETS) cpptod.html ctod.html pretod.html cppcontracts.html 404. d-array-article.html dll-linux.html bugstats.php.html \ gpg_keys.html forum-template.html ctarguments.html articles.html \ community.html documentation.html menu.html resources.html search.html \ + donate.html \ # exclude list MOD_EXCLUDES_RELEASE=--ex=gc. --ex=rt. --ex=core.internal. --ex=core.stdc.config --ex=core.sys. \ @@ -373,6 +374,8 @@ ctarguments.html : $(DDOC) ctarguments.dd ctod.html : $(DDOC) ctod.dd +donate: $(DDOC) donate.dd + D1toD2.html : $(DDOC) D1toD2.dd d-floating-point.html : $(DDOC) d-floating-point.dd