Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Pour l'exercice d'ébauche, le format du Standard a été utilisé pour commence

* [Guides](fr/guides)
* [Utilisation de logiciels libres](fr/guides/utilisation-logiciels-libres.md)
* [Contribution aux logiciels libres](fr/guides/contribution-à-des-logiciels-libres.md)
* [Publication de code source libre](fr/guides/publication-code-source-ouvert.md)
* [Contribution aux logiciels libres](fr/guides/contribution-logiciels-libres.md)
* [Publication de code source libre](fr/guides/publication-code-source-libre.md)

## Traduction

Expand Down
8 changes: 4 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ defaults:
ref: "home"
-
scope:
path: "fr/guides/cas-conceptuel-pour-logiciels-libres.md"
path: "fr/guides/importance-cas-conceptuel.md"
values:
ref: "starting"
-
scope:
path: "fr/guides/acquerir-logiciels-libres.md"
path: "fr/guides/acquisition-logiciels-libres.md"
values:
ref: "acquisition"
-
Expand All @@ -109,12 +109,12 @@ defaults:
ref: "using"
-
scope:
path: "fr/guides/contribution-à-des-logiciels-libres.md"
path: "fr/guides/contribution-logiciels-libres.md"
values:
ref: "contributing"
-
scope:
path: "fr/guides/publication-code-source-ouvert.md"
path: "fr/guides/publication-code-source-libre.md"
values:
ref: "publishing"
- scope:
Expand Down
10 changes: 5 additions & 5 deletions _data/i18n/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ nav:
fr: Élaborer un cas conceptuel pour Open Source
link:
en: /en/guides/importance-of-concept-case.html
fr: /fr/guides/cas-conceptuel-pour-logiciels-libres.html
fr: /fr/guides/importance-cas-conceptuel.html
acquisition:
en: Guide for Open Source Software Acquisition
fr: Guide pour l'acquisition des logiciels libres
link:
en: /en/guides/guide-for-acquisition.html
fr: /fr/guides/acquerir-logiciels-libres.html
fr: /fr/guides/acquisition-logiciels-libres.html
using:
en: Use of Open Source Software
fr: Guide sur l'utilisation des logiciels libres
Expand All @@ -70,13 +70,13 @@ nav:
fr: Guide sur la contribution à des logiciels libres
link:
en: /en/guides/contributing-to-open-source-software.html
fr: /fr/guides/contribution-à-des-logiciels-libres.html
fr: /fr/guides/contribution-logiciels-libres.html
publishing:
en: Publication of Open Source Code
fr: Guide sur la publication de code source ouvert
fr: Guide de publication de code source libre
link:
en: /en/guides/publishing-open-source-code.html
fr: /fr/guides/publication-code-source-ouvert.html
fr: /fr/guides/publication-code-source-libre.html
definitions:
en: Definitions
fr: Définitions
Expand Down
135 changes: 83 additions & 52 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,89 @@
{
"version": "0.1",
"language": "en",
"language": "fr",
"words": [
"IMSO",
"framagit",
"agpl",
"lgpl",
"gpl",
"ised",
"pspc",
"bitbucket",
"gccode",
"ccode",
"eupl",
"licenced",
"unilingual",
"auditable",
"markdownlint",
"cddl",
"Québec",
"Réciprocité",
"rplus",
"CILL",
"cecill",
"discoverability",
"cpal",
"affero",
"nposl",
"ogtsl",
"apsl",
"catosl",
"datagrid",
"entessa",
"frameworx",
"lppl",
"motosoto",
"naumen",
"nethack",
"ngpl",
"cnri",
"rpsl",
"oclc",
"rscpl",
"sleepycat",
"sybase",
"watcom",
"vovida",
"xwindows",
"zope",
"sissl",
"oset"
"IMSO",
"framagit",
"agpl",
"lgpl",
"gpl",
"ised",
"pspc",
"bitbucket",
"gccode",
"ccode",
"eupl",
"licenced",
"unilingual",
"auditable",
"markdownlint",
"cddl",
"Québec",
"Réciprocité",
"rplus",
"CILL",
"cecill",
"discoverability",
"cpal",
"affero",
"nposl",
"ogtsl",
"apsl",
"catosl",
"datagrid",
"entessa",
"frameworx",
"lppl",
"motosoto",
"naumen",
"nethack",
"ngpl",
"cnri",
"rpsl",
"oclc",
"rscpl",
"sleepycat",
"sybase",
"watcom",
"vovida",
"xwindows",
"zope",
"sissl",
"oset",
"Canada’s",
"project’s",
"artifact",
"project’s",
"institution’s",
"lacceptation",
"puisqu’il",
"Lorsqu’une",
"sinscrire",
"Lorsqu’on",
"plugiciels",
"contribués",
"lorsqu’il",
"lorsqu’ils",
"ISDE",
"SPAC",
"plugiciels",
"lorsqu’un",
"découvrabilité",
"Queen’s",
"fide",
"endeavor",
"lorsqu’acceptées",
"lintermédiaire",
"léchange"
],
"flagWords": [],
"import": ["./node_modules/cspell-dict-fr-fr/cspell-ext.json"],
"dictionaries": [
"en-gb"
"fr-fr",
"en-gb",
"en_US",
"typescript",
"softwareterms",
"html",
"css"
]
}
}
24 changes: 12 additions & 12 deletions en/guides/contributing-to-open-source-software.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ Even simply supporting the contributions of others, or expressing interest in an

The steps for GC to contribute code to open source software communities are:

1. [Verify Open Source Software Licence](#verify-open-source-software-licence)
2. [Verify Contributing Process and Policies](#verify-contributing-process-and-policies)
3. [Additional Approvals](#additional-approvals)
4. [Contribute to the project](#contribute-to-the-project)
5. [Contribute through professional services](#contribute-through-professional-services)
6. [Publish contributions regardless of upstream acceptance](#publish-contributions-regardless-of-upstream-acceptance)
1. [Verify Open Source Software Licence](#1-verify-open-source-software-licence)
2. [Verify Contributing Process and Policies](#2-verify-contributing-process-and-policies)
3. [Additional Approvals](#3-additional-approvals)
4. [Contribute to the project](#4-contribute-to-the-project)
5. [Contribute through professional services](#5-contribute-through-professional-services)
6. [Publish contributions regardless of upstream acceptance](#6-publish-contributions-regardless-of-upstream-acceptance)

## Verify Open Source Software Licence
## 1. Verify Open Source Software Licence

The GC can contribute to all software licensed under an [Open Source Initiative approved license](https://opensource.org/licenses) or a [Free Software Foundation free software licence](https://www.gnu.org/licenses/license-list.html).

If a licence for software developed in the open is under another licence, seek legal counsel to clarify if contributions are recommended.

## Verify Contributing Process and Policies
## 2. Verify Contributing Process and Policies

Certain projects may have specific policies for code contribution (Contributor Licence Agreement, Developer's Certificate of Origin) as well as processes (templates, platform, etc.).
Before going forward with submitting a contribution, employees should properly understand the project contribution processes and policies.
Expand Down Expand Up @@ -55,7 +55,7 @@ It usually consist of adding a "Signed by: [email protected]" in the commit
Unlike for a CLA, if you do have the right to submit a contribution, a DCO should not cause a problem as you should have already acquired the proper approvals to contribute to the project.
See [Additional Approvals](#additional-approvals)

## Additional Approvals
## 3. Additional Approvals

If for some reason the departmental delegated approvals are not meeting the third-party contribution's requirements, employees should contact their supervisor to see how they can obtain the additional approvals required.
Departments should define specific criteria for approval of open-source contributions, and describe them clearly to employees.
Expand All @@ -71,7 +71,7 @@ Similar to open data or information covered by the [Directive on Open Government

That person may vary according to your department and delegation should be encouraged to the lowest level possible to encourage contribution to 3rd party OSS projects.

## Contribute to the project
## 4. Contribute to the project

### Identify as an employee of the Government of Canada

Expand All @@ -92,11 +92,11 @@ This way, your changes will help improve the software for everyone that uses it

Contributing to a 3rd party should be done in accordance to the project governance model, if such a model is present.

## Contribute through professional services
## 5. Contribute through professional services

If your department would like to leverage professional services to contribute to third party projects, see [Obtain Rights to Custom Code in Contracts](publishing-open-source-code.md#obtain-rights-to-custom-code-in-contracts)

## Publish contributions regardless of upstream acceptance
## 6. Publish contributions regardless of upstream acceptance

Whether or not a given set of changes is accepted upstream as a contribution, the changes should still be published in accordance with the [Guide for Publishing Open Source Code](https://github.com/canada-ca/open-source-logiciel-libre/blob/master/en/guides/publishing-open-source-code.md).

Expand Down
6 changes: 3 additions & 3 deletions en/guides/importance-of-concept-case.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ The Directive on [Policy on the Planning and Management of Investments, Appendix

<h4>The Use of International or Canadian Standards</h4>

<p>Business Requirements may dictate that the underlying application should conform to International or Canadian Standards, such as but not limited to requirement that the official languages requiring Software be available in both official languages.</p>
<p>Business Requirements may dictate that the underlying application should conform to International or Canadian Standards, such as but not limited to the requirement that the Software be available in both official languages.</p>

<h4>Flexibility of the License</h4>

<p>Open Source Software licenses can provide more flexibility than a proprietary license for a digital project’s deliverables.</p>

<p>Where the Business Requirement would benefit from the reuse of Software, the GC may acquire Software such that it may be used in subsequent projects in the GC. A Proprietary Software licensor can grant such right of re-use upon request, but by its nature, all Open Source Software is reusable and therefore compliant with this request by default.</p>
<p>Where the Business Requirement would benefit from the reuse of Software, the GC may acquire Software such that it may be used in subsequent projects. A Proprietary Software licensor can grant such right of re-use upon request, but by its nature, all Open Source Software is reusable and therefore compliant with this request by default.</p>

<h4>Ability to use for any Purpose</h4>

Expand All @@ -38,7 +38,7 @@ The Directive on [Policy on the Planning and Management of Investments, Appendix

<h4>The Alignment with Open Government</h4>

<p>In addition the GC may set its requirements such that the source code be provided to the public to enable greater transparency and align with <a href="https://www.canada.ca/en/government/system/digital-government/improving-digital-services/digital9charter.html">Open Government principles of the D9</a>. </p>
<p>In addition the GC may set its requirements such that the source code be provided to the public to enable greater transparency and align with <a href="https://www.canada.ca/en/government/system/digital-government/improving-digital-services/digital9charter.html">Open Government principles of the D9</a>.</p>

<h4>The Ability to Distribute the Software</h4>

Expand Down
32 changes: 16 additions & 16 deletions en/guides/publishing-open-source-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ When releasing the code at large is not appropriate, or possible, it is recommen

The steps to publish GC source code are:

1. [Seek Approvals](#seek-approvals)
2. [Obtain Rights to Custom Code in Contracts](#obtain-rights-to-custom-code-in-contracts)
3. [Consider Security Implications](#consider-security-implications)
4. [Select Open Source Software Licence](#select-open-source-software-licence)
5. [Select Source Code Repository](#select-source-code-repository)
6. [Add Recommended Files](#add-recommended-files)
7. [Publishing a Legacy Application](#publishing-a-legacy-application)
8. [Work in the Open](#work-in-the-open)
1. [Seek Approvals](#1-seek-approvals)
2. [Obtain Rights to Custom Code in Contracts](#2-obtain-rights-to-custom-code-in-contracts)
3. [Consider Security Implications](#3-consider-security-implications)
4. [Select Open Source Software Licence](#4-select-open-source-software-licence)
5. [Select Source Code Repository](#5-select-source-code-repository)
6. [Add Recommended Files](#6-add-recommended-files)
7. [Publishing a Legacy Application](#7-publishing-a-legacy-application)
8. [Work in the Open](#8-work-in-the-open)

## Seek Approvals
## 1. Seek Approvals

### Team

Expand All @@ -37,7 +37,7 @@ Similar to open data or information covered by the [Directive on Open Government

That person may vary according to your department and delegation should be encouraged to the lowest level possible to encourage the release of open source code.

## Obtain Rights to Custom Code in Contracts
## 2. Obtain Rights to Custom Code in Contracts

The ISED [Policy on Title to Intellectual Property Arising Under Crown Procurement Contracts](https://www.ic.gc.ca/eic/site/068.nsf/eng/00005.html) provides that the contractor is to own the rights to foreground intellectual property (IP) created as a result of a Crown procurement contract.
But when the Crown's intended use of the IP can be met through licence arrangements, it has the opportunity to seek the needed licence(s) whether broad or narrow.
Expand All @@ -46,7 +46,7 @@ As part of the discussion with the institution’s legal services unit and the c

Departments or agencies are able to release code developed as a result of a Crown procurement contract under an open source software licence where such rights have been granted to Canada. The procurement contract could also require that the contracting body be responsible for publishing the source code under an acceptable open source software licence or contribute directly to existing open source software using that project's licence, and such clauses would be effective where agreed to by the supplier.

## Consider Security Implications
## 3. Consider Security Implications

### Developing Software in the Open

Expand All @@ -58,7 +58,7 @@ Departments or agencies are able to release code developed as a result of a Crow
- Embed security practices in your daily processes and methodologies.
- Leverage tools and services to automate finding known security vulnerabilities, possible secret keys and personally identifiable information.

## Select Open Source Software Licence
## 4. Select Open Source Software Licence

When the project is part of a larger open source software community, like plugins, modules, extensions, or derivative works of existing open source software, it is highly recommended to use the license which is usually used by the community.

Expand Down Expand Up @@ -181,7 +181,7 @@ Replace the **(legal departmental name)** and **(year of publication)** with the

This notice should be added to the `LICENCE` file in your project. See [Add Recommended Files](#add-recommended-files)

## Select Source Code Repository
## 5. Select Source Code Repository

Recommended public source code repositories for Government of Canada open source code are:

Expand All @@ -204,7 +204,7 @@ This would help discoverability of your projects but also help increase collabor
The recommended version control system for GC open source code is Git.
Departments are also encouraged to use Git to manage their source code internally.

## Add Recommended Files
## 6. Add Recommended Files

Before publishing, source code should include the following file:

Expand All @@ -224,7 +224,7 @@ Additionally, the following are recommended as best practice:

Examples of these files are available in the [Template Repository](https://github.com/canada-ca/template-gabarit).

## Publishing a Legacy Application
## 7. Publishing a Legacy Application

Publishing a legacy application can seem like a lot of work but it is feasible and actually a good investment if the application will continue to be used in the future.
Documentation could be improved during the release project to help increase community contributions.
Expand All @@ -237,7 +237,7 @@ One way of limiting those risks is to not provide the configurations of the prod

Scanning tools with advanced functionalities and security tests should be considered to help the development teams speed up the review and clean up process.

## Work in the Open
## 8. Work in the Open

### Release Early, Release Often

Expand Down
Loading