diff --git a/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.0-Edition/zh-Hans/Links/Thumbs.db b/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.0-Edition/zh-Hans/Links/Thumbs.db deleted file mode 100644 index 0354f4a0..00000000 Binary files a/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.0-Edition/zh-Hans/Links/Thumbs.db and /dev/null differ diff --git a/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.1-Edition/zh-Hans/Links/Thumbs.db b/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.1-Edition/zh-Hans/Links/Thumbs.db deleted file mode 100644 index 0354f4a0..00000000 Binary files a/Education-For-Suppliers/Supplier-Education-Leaflet/supply-chain-education-leaflet-version-1-2019/OpenChain-2.1-Edition/zh-Hans/Links/Thumbs.db and /dev/null differ diff --git a/Policy-Templates/Community/Contribution-Policy-Template/FOSSPolicyTemplate.md b/Policy-Templates/Community/Contribution-Policy-Template/FOSSPolicyTemplate.md index 8e14a6a3..3314685d 100644 --- a/Policy-Templates/Community/Contribution-Policy-Template/FOSSPolicyTemplate.md +++ b/Policy-Templates/Community/Contribution-Policy-Template/FOSSPolicyTemplate.md @@ -12,11 +12,11 @@ PUBLIC_ADMINISTRATION's goals in releasing this policy are: * Foster economic growth -The objective of this policy is to allow PUBLIC_ADMINISTRATION to embrace open source software development without compromising its core interests and information security, following the communities’ best practices and in the respect of all stakeholders. +The objective of this policy is to allow PUBLIC_ADMINISTRATION to embrace open source software development without compromising its core interests and information security, following the communities' best practices and in the respect of all stakeholders. Globally this policy proposes to: -1. Allow civil servants and subcontractors to contribute and release open-source projects +1. Allow civil servants and subcontractors to contribute and release open-source projects 2. Share best practices to collaborate and engage with communities @@ -30,7 +30,7 @@ Entities belonging to ENTITY_NAME may instantiate an inherited version of this p Open-sourcing existing code is another process and requires additional steps that are out of the scope of this policy. Please refer to the ENTITY_SUPPORT_EMAIL for more information. -Note that FOSS projects may include technical and functional documentation, user, administrator and/or programmer manuals, examples, translations, sample data, artwork, and/or configuration files. +Note that FOSS projects may include technical and functional documentation, user, administrator and/or programmer manuals, examples, translations, sample data, artwork, and/or configuration files. ## Definitions @@ -40,7 +40,7 @@ Note that FOSS projects may include technical and functional documentation, user "OSI approved license:" [https://opensource.org/licenses](https://opensource.org/licenses) -"Free Software Foundation approved license": [https://www.gnu.org/licenses/licenses.en.](https://www.gnu.org/licenses/licenses.en.html)[html](https://www.gnu.org/licenses/licenses.en.html) +"Free Software Foundation approved license": [https://www.gnu.org/licenses/licenses.en.](https://www.gnu.org/licenses/licenses.en.html) "Version control system": software product or service designed to store and retrieve several versions of source code and related assets in a consistent way, can be centralised, decentralised or distributed. @@ -52,15 +52,15 @@ From this point forward, code that is developed by or for ENTITY_NAME shall be f * When releasing code, agencies shall ensure that an appropriate FOSS license is applied. -* When procuring the development of code, entities shall ensure that they secure copyright to and delivery of the code in order to facilitate releasing it as open source. +* When procuring the development of code, entities shall ensure that they secure copyright to and delivery of the code in order to facilitate releasing it as open source. -### Participate in the Open Source Community. +### Participate in the Open Source Community -Wherever possible, contributions should be made to existing projects rather than creating independent efforts and all contributions should be given back to the community. +Wherever possible, contributions should be made to existing projects rather than creating independent efforts and all contributions should be given back to the community. ### Accounts -Civil servants are permitted to attach their name to their contributions and be recognized individually, while the copyright remains with ENTITY_NAME and under the license selected for the project. +Civil servants are permitted to attach their name to their contributions and be recognized individually, while the copyright remains with ENTITY_NAME and under the license selected for the project. Civil servants are not prohibited from working on side-projects when off duty, and their professional contributions should be distinguished from personal contributions. Criteria are given in the next section. @@ -74,7 +74,7 @@ This distinction should be made through the email address used to submit code: * Personal contributions should be submitted with the personal email address. -Anonymous / generic email contribution should be avoided: managers with civil servants who do not want to release their code should use their own email address instead. +Anonymous / generic email contribution should be avoided: managers with civil servants who do not want to release their code should use their own email address instead. In addition, civil servants whose employment is sensitive information are to be given cover identities to enable them to contribute to FOSS projects without endangering their safety; equally, contractor employees who have a legal right to keep the fact of their employment non-public and wish to do so must adopt a pseudonym for contributing to ENTITY_NAME projects. In these cases, the same identity must be used by the contributor for all ENTITY_NAME projects to facilitate communications with external developers. @@ -82,11 +82,9 @@ In addition, civil servants whose employment is sensitive information are to be Is presumed to belong to ENTITY_NAME, any software designed / created / developed by a civil servant or subcontractor: - - * during his working period; and/or -* using technical means provided by the Entity ; and/or +* using technical means provided by the Entity ; and/or * designed / created / developed following instructions given by the Entity; and /or @@ -98,7 +96,7 @@ Is presumed to belong to ENTITY_NAME, any software designed / created / develope Works designed / created / developed outside working hours are affected by these rules. -When a collaborator designs / creates / develops a work filling one or more of these conditions, and contributes this work to a project, it is in fact the Entity which designs / creates / develops and contributes said work to the project. +When a collaborator designs / creates / develops a work filling one or more of these conditions, and contributes this work to a project, it is in fact the Entity which designs / creates / develops and contributes said work to the project. ### Personal work @@ -120,37 +118,37 @@ Subcontractors should refer to their employer policy. ### Support -ENTITY_NAME will provide a centralized support for cases not covered by this policy or questions others may have to implement the policy through ENTITY_SUPPORT_EMAIL. +ENTITY_NAME will provide a centralized support for cases not covered by this policy or questions others may have to implement the policy through ENTITY_SUPPORT_EMAIL. ## Contributing to Existing Open Source Projects -ENTITY_NAME’s civil servants and subcontractors are authorized to contribute code and documentation related to FOSS projects that they are using as part of their mission for ENTITY_NAME under the licenses used by these projects, provided that the following conditions are met. +ENTITY_NAME's civil servants and subcontractors are authorized to contribute code and documentation related to FOSS projects that they are using as part of their mission for ENTITY_NAME under the licenses used by these projects, provided that the following conditions are met. ### Evaluate the Project License -ENTITY_NAME’s civil servants and subcontractors can only contribute to projects that have a clearly defined license that is approved by ENTITY_NAME and available at ACCEPTED_LICENSES_URL. +ENTITY_NAME's civil servants and subcontractors can only contribute to projects that have a clearly defined license that is approved by ENTITY_NAME and available at ACCEPTED_LICENSES_URL. This consideration should also apply to the dependencies used by the projects: -Shouldn’t one or more of a project’s dependencies fit these criteria, participation in the project may still be appropriate, but further scrutiny and evaluation is needed. Projects falling under this situation should be treated on a case by case basis. Additional support can be obtained through ENTITY_SUPPORT_EMAIL +Shouldn't one or more of a project's dependencies fit these criteria, participation in the project may still be appropriate, but further scrutiny and evaluation is needed. Projects falling under this situation should be treated on a case by case basis. Additional support can be obtained through ENTITY_SUPPORT_EMAIL ### Verifying the integrity of the contribution -ENTITY_NAME’s civil servants and subcontractors must be the original authors of the contribution that they submit. If the proposed contribution is in part or entirely derived from a third party work, they must ensure that this party’s work has been licenced in a way that makes it allowed for inclusion in the target project. They must also ensure to follow the required modalities attached to the third party work. +ENTITY_NAME's civil servants and subcontractors must be the original authors of the contribution that they submit. If the proposed contribution is in part or entirely derived from a third party work, they must ensure that this party's work has been licenced in a way that makes it allowed for inclusion in the target project. They must also ensure to follow the required modalities attached to the third party work. -### Signing Contributor’s License Agreements +### Signing Contributor's License Agreements -ENTITY_NAME’s civil servants and subcontractors may only contribute to projects that require a Contributor’s License Agreement (CLA) that have been agreed upon by ENTITY_NAME and are available at ENTITY_CLA_URL. +ENTITY_NAME's civil servants and subcontractors may only contribute to projects that require a Contributor's License Agreement (CLA) that have been agreed upon by ENTITY_NAME and are available at ENTITY_CLA_URL. -Similarly, Individual Contributor’s License Agreements need to be approved by ENTITY_SUPPORT_EMAIL. +Similarly, Individual Contributor's License Agreements need to be approved by ENTITY_SUPPORT_EMAIL. -## Releasing and Managing Open Source Projects +## Releasing and Managing Open Source Projects ### Initial check -Before starting a new project, civil servants shall verify that there is no existing FOSS project that more or less suits the needs (functional requirements, license…) of ENTITY_NAME. +Before starting a new project, civil servants shall verify that there is no existing FOSS project that more or less suits the needs (functional requirements, license…) of ENTITY_NAME. -The proposed project name shall be checked against trademark protection by a third party or whether the name is already used by another Open Source project. +The proposed project name shall be checked against trademark protection by a third party or whether the name is already used by another Open Source project. ### Governance @@ -160,7 +158,7 @@ At least two maintainers having full commit rights on a project (preferably from Whenever possible, the new project shall use an outbound license ensuring compatibility with corresponding FOSS projects ecosystem. -Any new FOSS project dependency shall be duly checked against its compatibility between the licenses of the various components of the project, including the target licence of the project’s code base. +Any new FOSS project dependency shall be duly checked against its compatibility between the licenses of the various components of the project, including the target licence of the project's code base. If the ecosystem is completely new, following licenses are recommended depending on the use cases: @@ -170,7 +168,7 @@ If the ecosystem is completely new, following licenses are recommended depending Creating a new license is very strongly discouraged and explicit approval is required from ENTITY_SUPPORT_EMAIL. -Contributions should be accepted under the same license as the project outbound license. A CLA should not be required for the project. Instead, a process like the [Developer’s Certificate of Origin](http://developercertificate.org/) (DCO), can be used to verify that developers agree with the project’s license, if so desired. +Contributions should be accepted under the same license as the project outbound license. A CLA should not be required for the project. Instead, a process like the [Developer's Certificate of Origin](https://developercertificate.org/) (DCO), can be used to verify that developers agree with the project's license, if so desired. ### Version control system @@ -178,7 +176,7 @@ Releasing the source code can be made on any public distributed version control ### Security -ENTITY_NAME’s standard security process should be applied. +ENTITY_NAME's standard security process should be applied. ### Deprecation Policy diff --git a/Policy-Templates/Community/Contribution-Policy-Template/HowToInstantiate.md b/Policy-Templates/Community/Contribution-Policy-Template/HowToInstantiate.md index 90b741ce..d3ae85b3 100644 --- a/Policy-Templates/Community/Contribution-Policy-Template/HowToInstantiate.md +++ b/Policy-Templates/Community/Contribution-Policy-Template/HowToInstantiate.md @@ -28,11 +28,11 @@ Subcontractors contracted to develop parts or the entirety of the contribution o ### Licenses -ENTITY_NAME should maintain and publish a list of accepted FOSS licenses among the FSF / OSI approved ones at the ACCEPTED_LICENSES_URL. +ENTITY_NAME should maintain and publish a list of accepted FOSS licenses among the FSF / OSI approved ones at the ACCEPTED_LICENSES_URL. Another option would be to rely on those institutions and accept all FSF / OSI approved licenses. -Guidance should be provided on ENTITY_NAME use cases and corresponding software developped. +Guidance should be provided on ENTITY_NAME use cases and corresponding software developed. ### Signing Contributor’s License Agreements @@ -60,7 +60,7 @@ There are a number of version control systems available that may be appropriate * Entities should use a distributed version control system wherever possible -* Entities should use a version control system which itself is Free/Open Source software. +* Entities should use a version control system which itself is Free/Open Source software. * Entities should err on the side of adopting a standard platform with the communities they work most closely with as well as their peers. @@ -72,7 +72,7 @@ In order to facilitate contribution from a wide range of developers, repositorie [In addition, some public administrations provide their own platforms, most notably Joinup (https://joinup.ec.europa.eu) by the European Commission and Code.gov (https://code.gov) by the US government.](https://bitbucket.org/) -To engage the open source community your entity may want to consider the social features of the system beyond version control, such as a ticketing system, a wiki or an automated build system. +To engage the open source community your entity may want to consider the social features of the system beyond version control, such as a ticketing system, a wiki or an automated build system. ### Applicability of Legal Principles Reflected in the Policy