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
2 changes: 1 addition & 1 deletion src/glossary.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default new Glossary({
to be part of the next <TooltipTerm name="version">version</TooltipTerm>.
</p>
<p>
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.
</p>
</Fragment>
Expand Down
2 changes: 1 addition & 1 deletion src/models/chapters/commandlineChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const commandlineChapter = createChapter('Command-line', {
</Fragment>
)),
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(() => (
Expand Down
4 changes: 2 additions & 2 deletions src/models/chapters/gitChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const gitChapter = createChapter('Introducing Git', {
new ChapterText(() => 'Let’s take a look at the different parts of Git.'),
new ChapterText(() => (
<Fragment>
First, there is the <strong>working directory</strong>. Its the folder
First, there is the <strong>working directory</strong>. Its the folder
on your computer where your project is located in, where you modify, add
or delete files.
</Fragment>
Expand All @@ -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.
</Fragment>
)),
new ChapterText(() => (
Expand Down
4 changes: 2 additions & 2 deletions src/models/chapters/gitInATeamChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const gitInATeamChapter = createChapter('Git in a Team', {
<code>new-feature</code>. By now new commits are still added to the{' '}
<code>master</code> branch because our new branch is not active yet. To
change that we need to activate <code>new-feature</code>.{' '}
<em>Its called checking out a branch.</em>
<em>Its called checking out a branch.</em>
</Fragment>
)),
new ChapterText(() => (
Expand All @@ -43,7 +43,7 @@ const gitInATeamChapter = createChapter('Git in a Team', {
<code>new-feature</code> into the now active <code>master</code> branch.
</Fragment>
)),
new ChapterText(() => 'Not difficult, right? Lets get it right now …'),
new ChapterText(() => 'Not difficult, right? Lets get it right now …'),
],
get vis() {
return this.parent.vis;
Expand Down
2 changes: 1 addition & 1 deletion src/models/chapters/gitInTheConsoleChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const gitInTheConsoleChapter = createChapter('Git in the Console', {
new ChapterText(
() => (
<Fragment>
Lets look at the final topic and see what else Git can do for you.
Lets look at the final topic and see what else Git can do for you.
</Fragment>
),
{ skip: true },
Expand Down
4 changes: 2 additions & 2 deletions src/models/chapters/introductionChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const introductionChapter = createChapter('Introduction', {
new ChapterText(() => (
<Fragment>
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.<br />
<em>
Regardless how hard we work on file name conventions and how many
Expand All @@ -45,7 +45,7 @@ const introductionChapter = createChapter('Introduction', {
),
{ skip: true },
),
new ChapterText(() => 'All set? Then lets start with the basics …'),
new ChapterText(() => 'All set? Then lets start with the basics …'),
],
});

Expand Down
4 changes: 2 additions & 2 deletions src/models/chapters/sandboxChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const sandboxChapter = createChapter('Git Sandbox', {
<Fragment>
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. Isnt that
in a team and how to use all these concepts together. Isnt that
amazing? I hope it was easy to understand and you liked it!
</Fragment>
),
Expand All @@ -52,7 +52,7 @@ const sandboxChapter = createChapter('Git Sandbox', {
One more thing: the sandbox mode. Use the <code>tutorial</code>{' '}
command to create new files or modify selected ones. Use the{' '}
<code>git</code> command to stage files, create commits or branches
and merge branches together. Dont forget (and I cant stress this
and merge branches together. Dont forget (and I cant stress this
often enough):
</Fragment>
)),
Expand Down
2 changes: 1 addition & 1 deletion src/models/chapters/versioningInGitChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const versioningInGitChapter = createChapter('Versioning in Git', {
<Fragment>
Commit{' '}
<VisualisationCommitReference vis={this.vis} commit={data} />{' '}
was revereted successfully.
was reverted successfully.
</Fragment>
),
action: revertCommit,
Expand Down
2 changes: 1 addition & 1 deletion src/models/chapters/versioningOfFilesChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const versioningOfFilesChapter = createChapter('Versioning of Files', {
() => (
<Fragment>
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.
</Fragment>
),
Expand Down
4 changes: 2 additions & 2 deletions src/models/chapters/workingInATeamChapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const workingInATeamChapter = createChapter('Working in a Team', {
sections: [
new ChapterText(() => (
<Fragment>
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{' '}
<Tooltip name="cloud">cloud</Tooltip>. Let’s take a closer look at a
project e.g. with one file and two users.
Expand All @@ -28,7 +28,7 @@ const workingInATeamChapter = createChapter('Working in a Team', {
)),
new ChapterText(() => (
<Fragment>
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.
</Fragment>
)),
Expand Down