updates after feedback from Pete

Author: mondus

download/cla-individual.md

@@ -1,21 +1,19 @@
 ---
 title: "Contributor Licence Agreement"
-permalink: "download/cla"
+permalink: "cla"
 ---
 
 # Contributor Licence Agreement
 
 ## Individual Contributor Exclusive License Agreement
 
-## (including the Traditional Patent License OPTION)
-
 Thank you for your interest in contributing to University of Sheffield's FLAME GPU Software ("We" or "Us").
 
-The purpose of this contributor agreement ("Agreement") is to clarify and document the rights granted by contributors to Us. To make this document effective, please follow the instructions at https://github.com/FLAMEGPU.
+The purpose of this contributor agreement ("Agreement") is to clarify and document the rights granted by contributors to Us. To make this document effective, please follow the instructions via our CLA Bot when submitting a pull request via https://github.com/FLAMEGPU/FLAMEGPU2/compare.
 
 ### How to use this Contributor Agreement
 
-If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document. If You do not own the Copyright in the entire work of authorship, any other author of the Contribution should also sign this – in any event, please contact Us at p.richmond@sheffield.ac.uk
+If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document by contacting p.richmond@sheffield.ac.uk. Entity contributions can not be processed via the CLA bot. If You do not own the Copyright in the entire work of authorship, any other author of the Contribution should also sign this – in any event, please contact Us at p.richmond@sheffield.ac.uk
 
 ### 1\. Definitions
 
@@ -93,7 +91,7 @@ IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 4. AND SECTION 5. CANNO
 
 ### 8 Miscellaneous
 
-8.1 This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of Worldwide excluding its private international law provisions.
+8.1 This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of the United Kingdom of Great Britain and Northern Ireland excluding its private international law provisions.
 
 8.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
 

download/licence.md download/license.mddownload/licence.md renamed to download/license.md

@@ -1,43 +1,43 @@
 ---
-title: "FLAME GPU 2 Licence"
+title: "FLAME GPU 2 License"
 ---
 
-The most recent (and future) versions of FLAME GPU 2 are available under a dual licence (AGPL v3.0 and commercial). Previous versions of FLAME GPU were distributed under MIT.
+The most recent (and future) versions of FLAME GPU 2 are available under a dual license (AGPL v3.0 and commercial). Previous versions of FLAME GPU were distributed under MIT.
 
-## Why a dual licence model for FLAME GPU 2
+## Why a dual license model for FLAME GPU 2
 
 Developing and maintaining research software is hard, especially software like FLAME GPU which requires highly skilled GPU developers. Very little funding exists for development or maintenance. FLAME GPU 2 was extremely fortunate to receive a large chunk of funding for its initial development via a Research Software Engineering Fellowship. Funding to support new features is often sought through collaborative research projects with partners wishing to apply FLAME GPU to a new domain. As the software has become mature and stable it is becoming harder to seek research grants which look to add novel new features (constituting software engineering research). Instead funding is required to maintain what we already have.
 
 ## Commitment to Open Source
 
 First and foremost FLAME GPU is committed to open source, in particular in ensuring that the results of FLAME GPU simulations are FAIR and that the software itself remains open and accessible, preventing it from becoming proprietary. If you use FLAME GPU as part of your research and want to publish the resulting model and outputs you can do so under the AGPL v3.0 terms.
 
-## A Commercial Licence
+## A Commercial License
 
-The move towards a dual licence allows us to pursue commercial routes for FLAME GPU to generate revenue to support the software and to help understand its industrial impact. As a FLAME GPU user, this means that if you do not want to comply with the AGPL terms then a commercial licence would be required. I.e. If you want to build a model or product using FLAME GPU and distribute this without releasing the source code then a commercial would eb needed. There is not a fixed licence fee, instead this is negotiable depending on your use case and may require terms to help us understand and demonstrate the impact of the software. If you would like to find out more then please [contact us](../../contact).
+The move towards a dual license allows us to pursue commercial routes for FLAME GPU to generate revenue to support the software and to help understand its industrial impact. As a FLAME GPU user, this means that if you do not want to comply with the AGPL terms then a commercial license would be required. I.e. If you want to build a model or product using FLAME GPU and distribute this without releasing the source code then a commercial would eb needed. There is not a fixed license fee, instead this is negotiable depending on your use case and may require terms to help us understand and demonstrate the impact of the software. If you would like to find out more then please [contact us](../../contact).
 
 ## FAQ
 
 **Q: Why are you changing it now?**  
 A: The software is reaching a mature and stable point where alternative sources of income are required to support its maintenance.
 
 **Q: Can I use the old MIT version?**  
-A: Of course but updates to the software will only be issued under the new licence terms.
+A: Of course but updates to the software will only be issued under the new license terms.
 
-**Q: Can I have a commercial licence?**  
+**Q: Can I have a commercial license?**  
 A: Yes. Speak to us.
 
-**Q: Can I have a free commercial licence?**  
+**Q: Can I have a free commercial license?**  
 A: Possibly. Speak to us.
 
-**Q: Can I fund FLAME GPUs development without a commercial licence?**  
+**Q: Can I fund FLAME GPUs development without a commercial license?**  
 A: Yes of course. Speak to us.
 
 **Q: MIT was much better. Don't you agree?**  
 A: MIT is great but we need to find ways to fund FLAME GPUs development or it will lose support.
 
 **Q: Can I contribute to the software?**  
-A: Yes. See our contribution guidelines. We will require a contributor licence agreement which allows us permission to distribute any contribution under the dual licence terms.
+A: Yes. See our [contribution guidelines](https://github.com/FLAMEGPU/FLAMEGPU2/blob/master/CONTRIBUTING.md). We will require a contributor license agreement which allows us permission to distribute any contribution under the dual license terms.
 
 **Q: Can you tell me if my software is compliant with AGPL?**  
 We can not. You should seek specialist advice.