diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1f302a060..80717b4fd 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,7 +4,7 @@ ## [FEATURE] _REPLACE THIS WITH A BRIEF SUMMARY OF THE SUGGESTED SNIPPET_ -**Category:** +**Category:** ### Description diff --git a/.travis/push.sh b/.travis/push.sh index ac6939000..dd539799c 100755 --- a/.travis/push.sh +++ b/.travis/push.sh @@ -6,7 +6,7 @@ setup_git() { commit_website_files() { if [ $TRAVIS_EVENT_TYPE != "pull_request" ]; then if [ $TRAVIS_BRANCH == "master" ]; then - echo "Commiting to master branch..." + echo "Committing to master branch..." git checkout master git add * git commit --message "Travis build: $TRAVIS_BUILD_NUMBER [ci skip]" diff --git a/COLLABORATING.md b/COLLABORATING.md index fdf6ab673..a38c4d52d 100644 --- a/COLLABORATING.md +++ b/COLLABORATING.md @@ -14,7 +14,7 @@ As a member of the team that manages **30 seconds of code**, you have the follow ## Guidelines for merging pull requests and making changes to the project - **[Usual guidelines](https://github.com/Chalarangelo/30-seconds-of-code/blob/master/CONTRIBUTING.md) apply.** Make sure to follow them, like everybody else. -- **For a pull request to be considered ready to merge, there should be at least 2 (preferrably 3) reviews approving it for merge.** There are, however, certain exceptions: +- **For a pull request to be considered ready to merge, there should be at least 2 (preferably 3) reviews approving it for merge.** There are, however, certain exceptions: - **If a pull request only fixes typos**, there is no need to wait for a second reviewer (unless you are not absolutely certain these were not typos in the first place). - **If a pull request only clarifies a snippet's description or enforces the styleguide for an existng snippet**, you might be able to merge it without getting a second reviewer to review it, but only if you are absolutely certain about it. - **Make sure pull requests pass the Travis CI build**, otherwise try and find out what's wrong and inform the author of the pull request. diff --git a/README.md b/README.md index 0c5ef52ad..3d77ed57c 100644 --- a/README.md +++ b/README.md @@ -1357,7 +1357,7 @@ sampleSize([1, 2, 3], 4); // [2,3,1] Randomizes the order of the values of an array, returning a new array. -Uses the Fisher-Yates algoritm to reorder the elements of the array, based on the [Lodash implementation](https://github.com/lodash/lodash/blob/b2ea6b1cd251796dcb5f9700c4911a7b6223920b/shuffle.js), but as a pure function. +Uses the Fisher-Yates algorithm to reorder the elements of the array, based on the [Lodash implementation](https://github.com/lodash/lodash/blob/b2ea6b1cd251796dcb5f9700c4911a7b6223920b/shuffle.js), but as a pure function. ```js const shuffle = ([...arr]) => { diff --git a/docs/index.html b/docs/index.html index 840b6d38d..aa095370e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -289,7 +289,7 @@ reducedFilter(data, ['id', 'name'], item => item.age > 24); // [{ id: 2, n }; 
sampleSize([1, 2, 3], 2); // [3,1]
 sampleSize([1, 2, 3], 4); // [2,3,1]
-

shuffle

Randomizes the order of the values of an array, returning a new array.

Uses the Fisher-Yates algoritm to reorder the elements of the array, based on the Lodash implementation, but as a pure function.

const shuffle = ([...arr]) => {
+

shuffle

Randomizes the order of the values of an array, returning a new array.

Uses the Fisher-Yates algorithm to reorder the elements of the array, based on the Lodash implementation, but as a pure function.

const shuffle = ([...arr]) => {
   let m = arr.length;
   while (m) {
     const i = Math.floor(Math.random() * m--);
diff --git a/snippets/shuffle.md b/snippets/shuffle.md
index 2b6229634..a9e1c64aa 100644
--- a/snippets/shuffle.md
+++ b/snippets/shuffle.md
@@ -2,7 +2,7 @@
 
 Randomizes the order of the values of an array, returning a new array.
 
-Uses the Fisher-Yates algoritm to reorder the elements of the array, based on the [Lodash implementation](https://github.com/lodash/lodash/blob/b2ea6b1cd251796dcb5f9700c4911a7b6223920b/shuffle.js), but as a pure function.
+Uses the Fisher-Yates algorithm to reorder the elements of the array, based on the [Lodash implementation](https://github.com/lodash/lodash/blob/b2ea6b1cd251796dcb5f9700c4911a7b6223920b/shuffle.js), but as a pure function.
 
 ```js
 const shuffle = ([...arr]) => {