Skip to content

Commit 76d69a6

Browse files
committed
fix typos
1 parent dacc237 commit 76d69a6

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed
File renamed without changes.
File renamed without changes.

index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h2>What can we do with that ?</h2>
7171
<section>
7272
<h2>Different VCS architectures</h2>
7373
<p>Local</p>
74-
<p>Centralized</p>
74+
<p>Centralised</p>
7575
<p>Distributed</p>
7676
</section>
7777

@@ -92,26 +92,26 @@ <h2>Local VCS</h2>
9292
</section>
9393

9494
<section>
95-
<h2>Centralized VCS</h2>
95+
<h2>Centralised VCS</h2>
9696
<p class="fragment">Made for dealing with the collaboration issue</p>
9797
<p class="fragment">One single remote server</p>
9898
<p class="fragment">Requires to know what other people are doing</p>
9999
<p class="fragment">Examples : <a href="https://savannah.nongnu.org/projects/cvs">CVS</a>, <a href="https://subversion.apache.org/">Subversion</a></p>
100100
</section>
101101

102102
<section>
103-
<h2>Centralized VCS</h2>
103+
<h2>Centralised VCS</h2>
104104
<figure>
105-
<img src="img/centralized.png" alt="Centralized VCS" style="height: 520px; width: 748px">
106-
<figcaption style="font-style: italic; font-size: .5em">Centralized VCS - Reference: <a href="http://git-scm.com/book/en/v2">Pro Git, 2nd edition</a></figcaption>
105+
<img src="img/centralised.png" alt="Centralised VCS" style="height: 520px; width: 748px">
106+
<figcaption style="font-style: italic; font-size: .5em">Centralised VCS - Reference: <a href="http://git-scm.com/book/en/v2">Pro Git, 2nd edition</a></figcaption>
107107
</figure>
108108
</section>
109109

110110
<section>
111111
<h2>Distributed VCS</h2>
112112
<p class="fragment">Full local copy of the remote repository</p>
113113
<p class="fragment">Can deal with several remote repositories</p>
114-
<p class="fragment">Several types of workflows</p>
114+
<p class="fragment">Several types of workflow</p>
115115
<p class="fragment">Examples : <a href="http://www.git-scm.com">Git</a>, <a href="https://www.mercurial-scm.org/">Mercurial</a></p>
116116
</section>
117117

@@ -130,13 +130,13 @@ <h2>Why using Git ?</h2>
130130
<p class="fragment">Strong support of non-linear development</p>
131131
<p class="fragment">Ables to handle large projects efficiently</p>
132132
<p class="fragment">Most VCS used these days</p>
133-
<p class="fragment">Free and open source</p>
133+
<p class="fragment">Free and open-source</p>
134134
</section>
135135

136136
<section>
137137
<section>
138138
<h2>Git basics</h2>
139-
<p>To initialize a Git repository in an existing directory :</p>
139+
<p>To initialise a Git repository in an existing directory :</p>
140140
<pre><code data-trim>
141141
git init
142142
</code></pre>
@@ -152,7 +152,7 @@ <h2>Git basics</h2>
152152
<pre><code data-trim>
153153
git clone [email protected]:docker/docker.git
154154
</code></pre>
155-
<p>The above command line will clone the official repository of the <a href="https://www.docker.com/">Docker</a> project</p>
155+
<p>The above command-line will clone the official repository of the <a href="https://www.docker.com/">Docker</a> project</p>
156156
</section>
157157

158158
<section>
@@ -291,16 +291,16 @@ <h2>The rebase feature</h2>
291291
<section>
292292
<section>
293293
<h2>Different workflows</h2>
294-
<p>Centralized</p>
294+
<p>Centralised</p>
295295
<p>Integration-manager</p>
296296
<p>Dictator and lieutenant</p>
297297
</section>
298298

299299
<section>
300-
<h2>Centralized</h2>
300+
<h2>Centralised</h2>
301301
<figure>
302-
<img src="img/centralized_workflow.png" alt="Centralized workflow">
303-
<figcaption style="font-style: italic; font-size: .5em">Centralized workflow - Reference: <a href="http://git-scm.com/book/en/v2">Pro Git, 2nd edition</a></figcaption>
302+
<img src="img/centralised_workflow.png" alt="Centralised workflow">
303+
<figcaption style="font-style: italic; font-size: .5em">Centralised workflow - Reference: <a href="http://git-scm.com/book/en/v2">Pro Git, 2nd edition</a></figcaption>
304304
</figure>
305305
</section>
306306

@@ -343,7 +343,7 @@ <h2>Self-hosted servers</h2>
343343

344344
<section>
345345
<h2>Common features</h2>
346-
<p class="fragment">Manage privilegies</p>
346+
<p class="fragment">Manage privileges</p>
347347
<p class="fragment">Pull requests / Merge requests</p>
348348
<p class="fragment">Issues</p>
349349
<p class="fragment">Wiki</p>

0 commit comments

Comments
 (0)