From 63b8b474647ccd001972a7a3d6e1e6939713b508 Mon Sep 17 00:00:00 2001 From: Matthias Rahlf Date: Fri, 23 Feb 2018 03:29:03 +0100 Subject: [PATCH] Fix spelling and apostrophes. --- src/glossary.js | 2 +- src/models/chapters/commandlineChapter.js | 2 +- src/models/chapters/gitChapter.js | 4 ++-- src/models/chapters/gitInATeamChapter.js | 4 ++-- src/models/chapters/gitInTheConsoleChapter.js | 2 +- src/models/chapters/introductionChapter.js | 4 ++-- src/models/chapters/sandboxChapter.js | 4 ++-- src/models/chapters/versioningInGitChapter.js | 2 +- src/models/chapters/versioningOfFilesChapter.js | 2 +- src/models/chapters/workingInATeamChapter.js | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/glossary.js b/src/glossary.js index 82d3e29..fba0e96 100644 --- a/src/glossary.js +++ b/src/glossary.js @@ -49,7 +49,7 @@ export default new Glossary({ to be part of the next version.

- By this you are able to group changes into seperate versions, e.g. by + By this you are able to group changes into separate versions, e.g. by feature or topic.

diff --git a/src/models/chapters/commandlineChapter.js b/src/models/chapters/commandlineChapter.js index a637b56..1314a3e 100644 --- a/src/models/chapters/commandlineChapter.js +++ b/src/models/chapters/commandlineChapter.js @@ -53,7 +53,7 @@ const commandlineChapter = createChapter('Command-line', { )), new ChapterText( - () => 'Let’s take a look at the differnt parts of the console.', + () => 'Let’s take a look at the different parts of the console.', { skip: true }, ), new ChapterText(() => ( diff --git a/src/models/chapters/gitChapter.js b/src/models/chapters/gitChapter.js index 7994daa..1e0d5b5 100644 --- a/src/models/chapters/gitChapter.js +++ b/src/models/chapters/gitChapter.js @@ -59,7 +59,7 @@ const gitChapter = createChapter('Introducing Git', { new ChapterText(() => 'Let’s take a look at the different parts of Git.'), new ChapterText(() => ( - First, there is the working directory. It‘s the folder + First, there is the working directory. It’s the folder on your computer where your project is located in, where you modify, add or delete files. @@ -70,7 +70,7 @@ const gitChapter = createChapter('Introducing Git', { it’s not about showing something to others. Instead you can use the staging area to collect changes in the project that you want to store in the next version. By this you are able to group changes in your files - into seperate versions, e.g. by feature or topic. + into separate versions, e.g. by feature or topic. )), new ChapterText(() => ( diff --git a/src/models/chapters/gitInATeamChapter.js b/src/models/chapters/gitInATeamChapter.js index 29240bf..41f99d3 100644 --- a/src/models/chapters/gitInATeamChapter.js +++ b/src/models/chapters/gitInATeamChapter.js @@ -26,7 +26,7 @@ const gitInATeamChapter = createChapter('Git in a Team', { new-feature. By now new commits are still added to the{' '} master branch because our new branch is not active yet. To change that we need to activate new-feature.{' '} - It‘s called checking out a branch. + It’s called checking out a branch. )), new ChapterText(() => ( @@ -43,7 +43,7 @@ const gitInATeamChapter = createChapter('Git in a Team', { new-feature into the now active master branch. )), - new ChapterText(() => 'Not difficult, right? Let‘s get it right now …'), + new ChapterText(() => 'Not difficult, right? Let’s get it right now …'), ], get vis() { return this.parent.vis; diff --git a/src/models/chapters/gitInTheConsoleChapter.js b/src/models/chapters/gitInTheConsoleChapter.js index ef5d6fe..7a3ff58 100644 --- a/src/models/chapters/gitInTheConsoleChapter.js +++ b/src/models/chapters/gitInTheConsoleChapter.js @@ -132,7 +132,7 @@ const gitInTheConsoleChapter = createChapter('Git in the Console', { new ChapterText( () => ( - Let‘s look at the final topic and see what else Git can do for you. + Let’s look at the final topic and see what else Git can do for you. ), { skip: true }, diff --git a/src/models/chapters/introductionChapter.js b/src/models/chapters/introductionChapter.js index a9ea0d2..6a1390c 100644 --- a/src/models/chapters/introductionChapter.js +++ b/src/models/chapters/introductionChapter.js @@ -19,7 +19,7 @@ const introductionChapter = createChapter('Introduction', { new ChapterText(() => ( Although lots of backups are created and files are stored in clouds data - is lost frequently because you may have accidentily deleted an old file + is lost frequently because you may have accidentally deleted an old file or overwritten a file a colleague had changed a few minutes ago.
Regardless how hard we work on file name conventions and how many @@ -45,7 +45,7 @@ const introductionChapter = createChapter('Introduction', { ), { skip: true }, ), - new ChapterText(() => 'All set? Then let‘s start with the basics …'), + new ChapterText(() => 'All set? Then let’s start with the basics …'), ], }); diff --git a/src/models/chapters/sandboxChapter.js b/src/models/chapters/sandboxChapter.js index 1e80783..5d5ab97 100644 --- a/src/models/chapters/sandboxChapter.js +++ b/src/models/chapters/sandboxChapter.js @@ -41,7 +41,7 @@ const sandboxChapter = createChapter('Git Sandbox', { This is the end of your journey through Git. You just learned the basics about versioning and Git, the console, how to do versioning - in a team and how to use all these concepts together. Isn‘t that + in a team and how to use all these concepts together. Isn’t that amazing? I hope it was easy to understand and you liked it! ), @@ -52,7 +52,7 @@ const sandboxChapter = createChapter('Git Sandbox', { One more thing: the sandbox mode. Use the tutorial{' '} command to create new files or modify selected ones. Use the{' '} git command to stage files, create commits or branches - and merge branches together. Don‘t forget (and I can‘t stress this + and merge branches together. Don’t forget (and I can’t stress this often enough): )), diff --git a/src/models/chapters/versioningInGitChapter.js b/src/models/chapters/versioningInGitChapter.js index 8a2d109..22c315a 100644 --- a/src/models/chapters/versioningInGitChapter.js +++ b/src/models/chapters/versioningInGitChapter.js @@ -163,7 +163,7 @@ const versioningInGitChapter = createChapter('Versioning in Git', { Commit{' '} {' '} - was revereted successfully. + was reverted successfully. ), action: revertCommit, diff --git a/src/models/chapters/versioningOfFilesChapter.js b/src/models/chapters/versioningOfFilesChapter.js index be24284..bd864aa 100644 --- a/src/models/chapters/versioningOfFilesChapter.js +++ b/src/models/chapters/versioningOfFilesChapter.js @@ -51,7 +51,7 @@ const versioningOfFilesChapter = createChapter('Versioning of Files', { () => ( Well done. You added a version database which is able to store and - restore all the versions of your file even when accidentially + restore all the versions of your file even when accidentally deleted. ), diff --git a/src/models/chapters/workingInATeamChapter.js b/src/models/chapters/workingInATeamChapter.js index 38d6cec..f2694d0 100644 --- a/src/models/chapters/workingInATeamChapter.js +++ b/src/models/chapters/workingInATeamChapter.js @@ -14,7 +14,7 @@ const workingInATeamChapter = createChapter('Working in a Team', { sections: [ new ChapterText(() => ( - Working on a project usally means working in a team. This means we need + Working on a project usually means working in a team. This means we need to exchange our files, for example by using a{' '} cloud. Let’s take a closer look at a project e.g. with one file and two users. @@ -28,7 +28,7 @@ const workingInATeamChapter = createChapter('Working in a Team', { )), new ChapterText(() => ( - Once the file beeing uploaded a second user B wants to work on the file, + Once the file being uploaded a second user B wants to work on the file, too. They download the file, add some changes and upload the file again. )),