Update README + other minor changes

.github/pull_request_template.md

@@ -1,8 +1,9 @@
 # Grant Application Checklist
 
-- [ ] The [application-template.md](https://github.com/w3f/Open-Grants-Program/blob/master/applications/application-template.md) has been copied, renamed ( "project_name.md") and updated.
+- [ ] The [application template](https://github.com/w3f/Open-Grants-Program/blob/master/applications/application-template.md) has been copied, renamed ( `project_name.md`) and updated.
 - [ ] A BTC or Ethereum (DAI) address for the payment of the milestones is provided inside the application.  
-- [ ] The software of the project will be released under the Apache license version 2.0 as specified in the [terms and conditions](https://gist.github.com/Noc2/75bc58e8ce9b5d419ff883b0cf2b8c19).
+- [ ] I have read and acknowledged the [Terms and Conditions](https://github.com/w3f/Open-Grants-Program/blob/master/src/T&Cs.md).
+- [ ] The software delivered for this grant will be released under an open-source license specified in the application.
 - [ ] The total funding amount of the project is below USD $30k for initial grant applications and $100k for follow-up grants.
 - [ ] The initial PR contains only one commit (squash if needed before submitting your PR).
-- [ ] The grant will only be announced once we've successfully [delivered](https://github.com/w3f/Grant-Milestone-Delivery) the first milestone.
+- [ ] The grant will only be announced once the first milestone [has been accepted](https://github.com/w3f/Grant-Milestone-Delivery).

README.md

@@ -5,7 +5,7 @@
 </p>
 
 > **:loudspeaker:** The Web3 Foundation _Open Grants_ Program focuses on technology grants of up to **$30,000 for initial grants** and **$100,000 for follow-up grants**, which are tracked **transparently** on GitHub and disbursed in **Bitcoin or DAI**. For larger grants, payments in fiat and private submissions, please see our [_General Grants_ Program](https://github.com/w3f/General-Grants-Program).
-
+>
 > :earth_asia: **_This page is also available in [Chinese (中文)](README_CN.md)._**
 
 ---
@@ -25,6 +25,7 @@
 - [:rocket: Alternative Funding Sources](#rocket-alternative-funding-sources)
   - [Treasury](#treasury)
   - [General Grants Program](#general-grants-program)
+  - [Hackathons](#hackathons)
   - [Other Grant Programs](#other-grant-programs)
 
 ## :wave: Introduction
@@ -51,24 +52,32 @@ Generally, your project will have better chances to get accepted if:
 
 Additionally, it must fulfill the following requirements:
 
-- All code produced as part of a grant must be **open-sourced**, and it must also not rely on closed-source software for full funcionality. We prefer Apache 2.0, but GPLv3 or Unlicense are also acceptable.
+- All code produced as part of a grant must be **open-sourced**, and it must also not rely on closed-source software for full funcionality. We prefer Apache 2.0, but GPLv3, MIT or Unlicense are also acceptable.
 - We do not award grants for projects that have been the object of a successful token sale.
 - Lastly, we do not fund projects that actively encourage gambling, illicit trade, money laundering or criminal activities in general.
 
 In addition to the information provided on your application, note that your project will need to comply with our [Guidelines for Milestone Deliverables](https://github.com/w3f/General-Grants-Program/blob/master/grants/milestone-deliverables-guidelines.md). In particular, we require all projects to create documentation that explains how their project works. At a minimum, _written_ documentation is required for funding. Tutorials or videos are also helpful for new users to understand how to use your product. If your team's background is purely technical, consider hiring a freelance or part-time technical writer as part of the grant.
 
+We also have [Announcement Guidelines](https://github.com/w3f/General-Grants-Program/blob/master/grants/announcement-guidelines.md) for grant-related communications.
+
+Finally, we take licensing and the right of all teams in and outside the ecosystem to be recognised for their work very seriously. Using others' work with no attribution or indication that this was not your own work as part of a milestone delivery **will lead to immediate termination**. Please reach out to us before submitting if you have any doubts on how to comply with a specific license and we'll be happy to help.
+
 ### Project ideas
 
-[Requests for Proposals](https://github.com/w3f/General-Grants-Program/tree/master/rfps) (RFPs) are currently stored on the General Grants repository and represent ideas for projects that we would like to see implemented. Several teams may apply for the same RFP, out of which one or more strong applications will be selected. So even if another team has already applied to implement a certain RFP, we encourage you to still apply if you are interested.
+An overview of existing projects in the Web 3.0 Technology Stack along with broad project ideas we would potentially be interested in funding can be found [here](grants/polkadot_stack.md), as well as a list of previously accepted applications [here](grants/accepted_grant_applications.md). Additionally, the Substrate Builders [feedback board](https://feedback.parity.io/) may contain some useful ideas for grant projects.
 
-An overview of existing projects in the Web 3.0 Technology Stack along with broad project ideas we would potentially be interested in funding can be found [here](https://github.com/w3f/General-Grants-Program/blob/master/grants/polkadot_stack.md), as well as a list of previously accepted applications [here](https://github.com/w3f/General-Grants-Program/blob/master/grants/accepted_grant_applications.md). Additionally, the Substrate Builders [feedback board](https://feedback.parity.io/) may contain some useful ideas for grant projects.
+[Requests For Proposals](rfps) (RFPs) represent concrete ideas for projects that we would like to see implemented. Several teams may apply for the same RFP, so even if another team has already applied to implement a certain RFP, we invite you to do the same if you're interested.
+
+Finally, you don't need to start your own project in order to be elligible for a grant. Instead, some teams choose to port existing work to Substrate, where the pertinent licenses allow, or even to contribute to an existing open-source project. In the latter case, you should check in advance that the maintainers of the project are interested in your contribution, and the acceptance of the milestones will generally be tied to the inclusion of your work in said project.
 
 If you have a **good concept of the technical challenges** that your idea entails and would like feedback before applying, you can send us an [email](mailto:[email protected]) and tell us about it.
 
 ### Support
 
 The scope of our Grants Programs consists of funding and feedback on delivered milestones. This means that we do not provide hands-on support as part of a grant, but if you face specific issues during development, we will do our best and try to direct you to the correct resources. If this sounds like something you would like however, you may also want to apply to Parity's [Substrate Builders Program](https://www.substrate.io/builders-program/), which provides hands-on technical, ecosystem and strategical long-term support and access to extensive resources.
 
+For questions about the grants program itself, see our [FAQ](https://github.com/w3f/General-Grants-Program/blob/master/grants/faq.md#frequently-asked-questions).
+
 ### Team
 
 #### W3F Grants Committee
@@ -111,13 +120,15 @@ The Operations Team takes care of legal documents, invoicing and remittances.
    1. [Fork](https://github.com/w3f/Open-Grants-Program/fork) this repository.
    2. In the newly created fork, create a copy of the application template ([`applications/application-template.md`](applications/application-template.md)). If you're using the GitHub web interface, you will need to create a new file and copy the [contents](https://raw.githubusercontent.com/w3f/Open-Grants-Program/master/applications/application-template.md) of the template inside the new one. Make sure you **do not modify the template file directly**.
    3. Name the new file after your project: `project_name.md`.
-   4. Fill out the template with the details of your project. The more information you provide, the faster the review.
+   4. Fill out the template with the details of your project. The more information you provide, the faster the review. To get an idea of what a strong application looks like, you can have a look at the following examples:  [1](https://github.com/w3f/Open-Grants-Program/blob/master/applications/project_aurras_mvp_phase_1.md), [2](https://github.com/w3f/Open-Grants-Program/blob/master/applications/project_bodhi.md), [3](https://github.com/w3f/Open-Grants-Program/blob/master/applications/pontem.md), [4](https://github.com/w3f/Open-Grants-Program/blob/master/applications/spartan_poc_consensus_module.md). Naturally, if you're only applying for a smaller grant that only consists of, say, UI work, you don't need to provide as much detail.
    5. Once you're done, create a pull request. The pull request should only contain _one new file_—the Markdown file you created from the template.
-   6. Sign off on the [terms and conditions](src/T&Cs.md) presented by the [CLA assistant](https://github.com/claassistantio) bot as a Contributor License Agreement. You might need to reload the pull request to see its comment.
+   6. You will see a comment template that contains a checklist. You can leave it as is and tick the checkboxes once the pull request has been created. Please read through these items and check all of them.
+   7. Sign off on the [terms and conditions](src/T&Cs.md) presented by the [CLA assistant](https://github.com/claassistantio) bot as a Contributor License Agreement. You might need to reload the pull request to see its comment.
 2. **Application Review**
    1. The [committee](#w3f-grants-committee) can (and usually does) issue comments and request changes on the pull request.
-   2. Clarifications and amendments made in the comments _need to be included in the application_. You may address feedback by modifying your application directly and leaving a comment once you're done.
-   3. The application is accepted when all requested changes are addressed, the terms and conditions have been agreed upon and one third of the committee approves your pull request.
+   2. Clarifications and amendments made in the comments _need to be included in the application_. You may address feedback by directly modifying your application and leaving a comment once you're done. Generally, if you don't reply within 2 weeks, the application will be closed due to inactivity, but you're always free to reopen it as long as it hasn't been rejected.
+   3. When all requested changes are addressed and the terms and conditions have been signed, someone will mark your application as `ready for review` and share it internally with the rest of the committee.
+   4. The application will be accepted and merged as soon as it receives the approval of one third of the committee (currently 3 members), or closed after two weeks of inactivity. Unless specified otherwise, the day on which it is accepted will be considered the starting date of the project, and will be used to estimate delivery dates.
 3. **Milestone Delivery and Payment**
    1. Milestones are to be delivered on the [Grant Milestone Delivery](https://github.com/w3f/Grant-Milestone-Delivery/) repository. You can find the delivery process [here](https://github.com/w3f/Grant-Milestone-Delivery#mailbox-milestone-delivery-process).
 
@@ -158,14 +169,13 @@ For larger grants, payments in fiat or partially private submissions, please see
 
 ### Hackathons
 
-From time to time, Web3 Foundation and/or Parity organise hackathons to promote quick prototyping of your Polkadot related ideas.
-We highly encourage you to participate in these hackathons. Bear in mind, however, that you cannot submit the **same work** for a hackathon and the Grants Program. If you have worked on a project for a hackathon, your grant application should either propose a new set of features or otherwise build on top of your previous work. The same applies in reverse, although that will likely be less common.
+From time to time, Web3 Foundation and/or Parity organise hackathons to promote quick prototyping of Polkadot related ideas. We highly encourage you to participate in these hackathons. Bear in mind, however, that you cannot submit the **same work** for a hackathon and the Grants Program. If you have worked on a project for a hackathon, your grant application should either propose a new set of features or otherwise build on top of your previous work. The same applies in reverse, although that will likely be less common.
 
 The best way to find out about upcoming hackathons is by following Polkadot on the various channels, such as Element or Twitter.
 
 ### Other Grant Programs
 
-Below is a list of other grant programs in the polkadot/substrate ecosystem:
+Below is a list of other grant programs in the Polkadot/Substrate ecosystem:
 
 - [Darwinia Grants Program](https://docs.darwinia.network/docs/en/dev-bounty#grant-program)
 - [Moonbeam Grants Program](https://moonbeam.network/community/grants/)
@@ -174,4 +184,4 @@ Below is a list of other grant programs in the polkadot/substrate ecosystem:
 
 ## :information_source: License <!-- omit in toc -->
 
-[Apache License 2.0](LICENSE) © Web3 Foundation.
+[Apache License 2.0](LICENSE) © Web3 Foundation