Skip to content

Commit 885783f

Browse files
simon04simon04
committed
Merge remote-tracking branch 'origin/main' into cpp
2 parents ef44985 + 9b8819a commit 885783f

290 files changed

Lines changed: 4640 additions & 2956 deletions

File tree

Some content is hidden

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

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ Want to contribute? Great. Please review the following guidelines carefully and
1010
4. [Contributing code and features](#contributing-code-and-features)
1111
5. [Contributing new documentations](#contributing-new-documentations)
1212
6. [Updating existing documentations](#updating-existing-documentations)
13-
7. [Other contributions](#other-contributions)
14-
8. [Coding conventions](#coding-conventions)
15-
9. [Questions?](#questions)
13+
7. [Coding conventions](#coding-conventions)
14+
8. [Questions?](#questions)
1615

1716
## Reporting bugs
1817

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve Devdocs
3+
about: Create a report to help us improve DevDocs
44
title: ''
55
labels: 'bug'
66
assignees: ''
@@ -34,7 +34,7 @@ encountered it
3434
## More resources
3535

3636
<!--
37-
Add images, GIFs, screenshot, console output or any other resource that might help to undestand this bug
37+
Add images, GIFs, screenshot, console output or any other resource that might help to understand this bug
3838
-->
3939

4040
## Possible fix

‎.github/ISSUE_TEMPLATE/documentation_bug.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Add a description about how the documentation should be
2424

2525
## Actual style
2626
<!--
27-
Add images or urls of the miss-formatted devdocs documentation
27+
Add images or urls of the miss-formatted DevDocs documentation
2828
-->
2929

3030
## Expected style

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If possible fill each section
1313
# Feature request
1414

1515
<!--
16-
Verify this steps before suggeting a new feature:
16+
Verify this steps before suggesting a new feature:
1717
1818
- Check if anyone has suggested this feature before
1919
https://github.com/freeCodeCamp/devdocs/labels/feature
@@ -25,12 +25,12 @@ Verify this steps before suggeting a new feature:
2525
## Summary
2626

2727
<!--
28-
Write a description of this feature and write why it should be added to Devdocs
28+
Write a description of this feature and write why it should be added to DevDocs
2929
-->
3030

3131
## Examples
3232

3333
<!--
34-
If you have seen this feature before you can add images, URLs, gifs and any other
35-
resouce that might help to undestand how this feature works
34+
If you have seen this feature before you can add images, URLs, GIFs and any other
35+
resource that might help to understand how this feature works
3636
-->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ If you’re adding a new scraper, please ensure that you have:
1616
- [ ] `[email protected]`: a 32×32 pixel icon for the doc
1717
- [ ] `SOURCE`: A text file containing the URL to the page the image can be found on or the URL of the original image itself
1818

19-
<!-- SECTION B - Updating an existing documentation to it's latest version -->
19+
<!-- SECTION B - Updating an existing documentation to its latest version -->
2020
<!-- See https://github.com/freeCodeCamp/devdocs/blob/main/.github/CONTRIBUTING.md#updating-existing-documentations -->
2121

22-
If you're updating an existing documentation to it's latest version, please ensure that you have:
22+
If you're updating existing documentation to its latest version, please ensure that you have:
2323

2424
- [ ] Updated the versions and releases in the scraper file
25-
- [ ] Ensured the license is up-to-date and that the documentation's entry in the array in `about_tmpl.coffee` matches it's data in `self.attribution`
25+
- [ ] Ensured the license is up-to-date and that the documentation's entry in the array in `about_tmpl.coffee` matches its data in `self.attribution`
2626
- [ ] Ensured the icons and the `SOURCE` file in <code>public/icons/*your_scraper_name*/</code> are up-to-date if the documentation has a custom icon
2727
- [ ] Ensured `self.links` contains up-to-date urls if `self.links` is defined
2828
- [ ] Tested the changes locally to ensure:

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-20.04
1212
if: github.repository == 'freeCodeCamp/devdocs'
1313
steps:
14-
- uses: actions/checkout@v2.3.4
14+
- uses: actions/checkout@v2.4.2
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@v1.81.0
16+
uses: ruby/setup-ruby@v1.110.0
1717
with:
1818
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1919
- name: Run tests

‎.github/workflows/schedule-doc-report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-20.04
99
if: github.repository == 'freeCodeCamp/devdocs'
1010
steps:
11-
- uses: actions/checkout@v2.3.4
11+
- uses: actions/checkout@v2.4.2
1212
- name: Set up Ruby
13-
uses: ruby/setup-ruby@v1.81.0
13+
uses: ruby/setup-ruby@v1.110.0
1414
with:
1515
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1616
- name: Generate report

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
test:
1010
runs-on: ubuntu-20.04
1111
steps:
12-
- uses: actions/checkout@v2.3.4
12+
- uses: actions/checkout@v2.4.2
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@v1.81.0
14+
uses: ruby/setup-ruby@v1.110.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Run tests

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ public/docs/**/*
88
docs/**/*
99
!docs/*.md
1010
/vendor
11+
*.tar
12+
*.tar.bz2
13+
*.tar.gz
14+
*.zip

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
2.7.6

0 commit comments

Comments
 (0)