Skip to content

Commit 891ab92

Browse files
authored
Merge branch 'main' into translation-fr
Signed-off-by: Russell Trow <[email protected]>
2 parents 6e9e99d + 8014033 commit 891ab92

File tree

97 files changed

+4073
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4073
-7
lines changed

docs/carbon-efficiency.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Carbon is often used as a broad term to refer to the impact of all types of emis
4949

5050
As a result of the effects of climate change and an ever-increasing number of destructive weather events, efforts have been made by the global community to address these issues and take steps to control and limit global warming in order to mitigate and reverse the effects of climate change.
5151

52-
The [**Paris Climate Agreement**](https://unfccc.int/process-and-meetings/the-paris-agreement/the-paris-agreement) is an international treaty agreed in 2015 by 196 parties and the UN to reduce the Earth's temperature increase. The agreement is to keep the rise in global mean temperature to 2°C compared to pre-industrial levels, with a preferable lower limit of 1.5°C. The agreement is reviewed every five years and mobilizes finance to developing nations to mitigate the impacts of climate change and prepare for and adapt to the environmental effects caused by climate change. In addition, each party is expected to update its progress through a Nationally Determined Contribution (NDC). The agreement is currently signed by 193 parties.
52+
The [**Paris Climate Agreement**](https://unfccc.int/process-and-meetings/the-paris-agreement/the-paris-agreement) is an international treaty agreed in 2015 by 196 parties and the UN to reduce the Earth's temperature increase. The agreement is to keep the rise in global mean temperature to 2°C compared to pre-industrial levels, with a preferable lower limit of 1.5°C. The agreement is reviewed every five years and mobilizes finance to developing nations to mitigate the impacts of climate change and prepare for and adapt to the environmental effects caused by climate change. In addition, each party is expected to update its progress through a Nationally Determined Contribution (NDC). As of October 2024, [195 parties](https://www.un.org/en/climatechange/paris-agreement), including the European Union, have joined the agreement.
5353

5454
The [**United Nations Framework Convention on Climate Change (UNFCCC)**](https://unfccc.int/process-and-meetings/the-convention/what-is-the-united-nations-framework-convention-on-climate-change) is a group created to achieve the stabilization of greenhouse gas concentrations in the atmosphere at a level that would prevent dangerous interference with the climate system.
5555

docs/climate-commitments.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Any net-zero strategy needs to have plans for how to both eliminate as well as n
115115

116116
When organizations set a target of 100% renewable power, they might distinguish between being **matched by** vs. **powered by** renewables.
117117

118-
**Powered by** means you are directly powered by a renewable power source, say a hydro dam. In that scenario, the electrons flowing into your device can only come from that source, so you can confidently say that you are 100% powered by renewables.
118+
**Powered by** means you are directly powered by a renewable power source, say a hydro dam. In that scenario, the energy the device receives only originates from that source, so you can confidently say that you are 100% powered by renewables.
119119

120120
![alt_text](./images/26-27_100_renewable.png "image_tooltip")
121121

@@ -194,7 +194,7 @@ Carbon aware computing helps organizations increase their CFE percentage.
194194
- An organization can call itself Carbon Neutral when its total emissions are matched by the total of its emissions offsets through carbon reduction projects
195195
- Net zero aims to eliminate emissions and only offset the residual emissions that you cannot eliminate to reach the 1.5°C target set by the Paris Climate Agreement.
196196
- The SCI is carefully designed so that eliminating emissions, through energy efficiency, hardware efficiency and carbon awareness is the only way to reduce the score. Together with a separate neutralization strategy, it can form the basis of a net-zero strategy for an organization.
197-
- When organizations set a target of 100% renewable power, they can either be “matched by” vs. “powered by” renewables, where “powered by” means the electrons flowing into your device can only come from renewable sources. This can be achieved by purchasing RECs as part of a PPA.
197+
- When organizations set a target of 100% renewable power, they can either be “matched by” vs. “powered by” renewables, where “powered by” means the energy the device receives only originates from renewable sources. This can be achieved by purchasing RECs as part of a PPA.
198198
- 24/7 hourly matching is one of the many strategies we need to employ to help accelerate the transition to a 100% renewable-powered grid.
199199

200200
## Quiz
@@ -254,7 +254,7 @@ Carbon aware computing helps organizations increase their CFE percentage.
254254
],
255255
},
256256
{
257-
question: "What is responsible for setting the standard for net zero?",
257+
question: "Who is responsible for setting the standard for net zero?",
258258
answers: [
259259
{
260260
text: "SBTi",

docs/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: "If you want to make your software applications more sustainable an
77

88
Do you want to be a part of the green software movement?
99

10-
If you want to make your software applications more sustainable and build a career in green software, then this training is for you. It will teach you how to build, maintain and run greener applications irrespective of the application domain, industry, organization size or type, programming language, or framework.
10+
If you want to make your software applications more sustainable and build a career in green software, then this training is for you. It will teach you how to build, maintain, and run greener applications regardless of the application domain, industry, organization size or type, programming language, or framework.
1111

1212
If you pass the [associated exam](https://grnsft.org/practitioner/lf-exam), it comes with a certificate of completion from the Linux Foundation. Some employers have created forms to facilitate the administration of credits for completing this course. If your employer is [in this list](https://docs.google.com/document/d/1Jv-f7wGyODzEySQFfVk6Vo_OAHWjf-jAdFmyfDQUgvU/edit?usp=sharing), please click on your organization name to register your credits. If your organization would like to add their form to the list, please get in touch with our team at [email protected].
1313

docs/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Each of these chapters will introduce some new concepts and explain in detail wh
3535

3636
## Principles, Patterns, and Practices.
3737

38-
This course's key areas and content describe the **principles** of green software, a core set of competencies needed to define, run and build green software.
38+
This course's key areas and content describe the **principles** of green software, a core set of competencies needed to define, build and run green software.
3939

4040
A green software [**pattern**](https://patterns.greensoftware.foundation/) is a specific example of how to apply one or more principles in a real-world example. Whereas principles describe the theory that underpins green software, patterns are the practical advice software practitioners can use in their software applications today. Patterns are vendor-neutral.
4141

docs/measurement.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Imagine a scenario where you are the leader of an organization and charged with
7171

7272
Not necessarily. We know that a total by itself doesn't tell the whole story and must look at other metrics to find out if an emissions-reduction project has been successful. For example, if you measured the carbon intensity as well as the carbon total, you might come out with a different perspective. In the same project, if the carbon intensity was 3.3g CO2eq/user in Q1, and 2.9g CO2eq/user in Q2, you might consider the project a success and continue to invest further.
7373

74-
While the total informed you that your organization's carbon emissions had increased overall, the intensity gave a more complete perspective that would help you to make a more informed decision on how to proceed.
74+
While the total showed you that your organization's carbon emissions had increased overall, the intensity gave a more complete perspective that would help you to make a more informed decision on how to proceed.
7575

7676
## Software Carbon Intensity specification
7777

i18n/de/code.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"version.label": {
3+
"message": "Next",
4+
"description": "The label for version current"
5+
},
6+
"sidebar.sidebar.category.Welcome": {
7+
"message": "Welcome",
8+
"description": "The label for category Welcome in sidebar sidebar"
9+
}
10+
}

0 commit comments

Comments
 (0)