@@ -71,7 +71,7 @@ <h2>What can we do with that ?</h2>
71
71
< section >
72
72
< h2 > Different VCS architectures</ h2 >
73
73
< p > Local</ p >
74
- < p > Centralized </ p >
74
+ < p > Centralised </ p >
75
75
< p > Distributed</ p >
76
76
</ section >
77
77
@@ -92,26 +92,26 @@ <h2>Local VCS</h2>
92
92
</ section >
93
93
94
94
< section >
95
- < h2 > Centralized VCS</ h2 >
95
+ < h2 > Centralised VCS</ h2 >
96
96
< p class ="fragment "> Made for dealing with the collaboration issue</ p >
97
97
< p class ="fragment "> One single remote server</ p >
98
98
< p class ="fragment "> Requires to know what other people are doing</ p >
99
99
< p class ="fragment "> Examples : < a href ="https://savannah.nongnu.org/projects/cvs "> CVS</ a > , < a href ="https://subversion.apache.org/ "> Subversion</ a > </ p >
100
100
</ section >
101
101
102
102
< section >
103
- < h2 > Centralized VCS</ h2 >
103
+ < h2 > Centralised VCS</ h2 >
104
104
< 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 >
107
107
</ figure >
108
108
</ section >
109
109
110
110
< section >
111
111
< h2 > Distributed VCS</ h2 >
112
112
< p class ="fragment "> Full local copy of the remote repository</ p >
113
113
< 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 >
115
115
< p class ="fragment "> Examples : < a href ="http://www.git-scm.com "> Git</ a > , < a href ="https://www.mercurial-scm.org/ "> Mercurial</ a > </ p >
116
116
</ section >
117
117
@@ -130,13 +130,13 @@ <h2>Why using Git ?</h2>
130
130
< p class ="fragment "> Strong support of non-linear development</ p >
131
131
< p class ="fragment "> Ables to handle large projects efficiently</ p >
132
132
< 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 >
134
134
</ section >
135
135
136
136
< section >
137
137
< section >
138
138
< 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 >
140
140
< pre > < code data-trim >
141
141
git init
142
142
</ code > </ pre >
@@ -152,7 +152,7 @@ <h2>Git basics</h2>
152
152
< pre > < code data-trim >
153
153
git clone
[email protected] :docker/docker.git
154
154
</ 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 >
156
156
</ section >
157
157
158
158
< section >
@@ -291,16 +291,16 @@ <h2>The rebase feature</h2>
291
291
< section >
292
292
< section >
293
293
< h2 > Different workflows</ h2 >
294
- < p > Centralized </ p >
294
+ < p > Centralised </ p >
295
295
< p > Integration-manager</ p >
296
296
< p > Dictator and lieutenant</ p >
297
297
</ section >
298
298
299
299
< section >
300
- < h2 > Centralized </ h2 >
300
+ < h2 > Centralised </ h2 >
301
301
< 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 >
304
304
</ figure >
305
305
</ section >
306
306
@@ -343,7 +343,7 @@ <h2>Self-hosted servers</h2>
343
343
344
344
< section >
345
345
< h2 > Common features</ h2 >
346
- < p class ="fragment "> Manage privilegies </ p >
346
+ < p class ="fragment "> Manage privileges </ p >
347
347
< p class ="fragment "> Pull requests / Merge requests</ p >
348
348
< p class ="fragment "> Issues</ p >
349
349
< p class ="fragment "> Wiki</ p >
0 commit comments