@@ -37,15 +37,15 @@ <h3>An introduction with Git</h3>
3737
3838 < section >
3939 < h2 > What is version control?</ h2 >
40- < p class ="fragment "> System that records changes to a set of files over time</ p >
40+ < p class ="fragment "> System that records changes made to a set of files over time</ p >
4141 < p class ="fragment "> These systems are called VCS (Version Control Systems)</ p >
42- < p class ="fragment "> They are essential for a development project with several people</ p >
42+ < p class ="fragment "> They are essential to programming projects involving several people</ p >
4343 </ section >
4444
4545 < section >
4646 < h2 > What can we do with that?</ h2 >
4747 < p class ="fragment "> Keep every version of a file (source code, image...)</ p >
48- < p class ="fragment "> Work easily with several developers </ p >
48+ < p class ="fragment "> Work easily with several programmers </ p >
4949 < p class ="fragment "> Revert files back to a previous state</ p >
5050 < p class ="fragment "> Compare changes over time</ p >
5151 < p class ="fragment "> And much more...</ p >
@@ -95,7 +95,7 @@ <h2>Centralised VCS</h2>
9595 < h2 > Distributed VCS</ h2 >
9696 < p class ="fragment "> Full local copy of the remote repository</ p >
9797 < p class ="fragment "> Can deal with several remote repositories</ p >
98- < p class ="fragment "> Several types of workflow </ p >
98+ < p class ="fragment "> Several types of workflows </ p >
9999 < p class ="fragment "> Examples: < a href ="http://www.git-scm.com "> Git</ a > , < a href ="https://www.mercurial-scm.org/ "> Mercurial</ a > </ p >
100100 </ section >
101101
@@ -111,10 +111,10 @@ <h2>Distributed VCS</h2>
111111 < section >
112112 < h2 > Why using Git?</ h2 >
113113 < p class ="fragment "> It's fast</ p >
114- < p class ="fragment "> Strong support of non-linear development </ p >
114+ < p class ="fragment "> Strong support of non-linear workflows </ p >
115115 < p class ="fragment "> Ables to handle large projects efficiently</ p >
116- < p class ="fragment "> Most VCS used these days</ p >
117- < p class ="fragment "> Free and open- source</ p >
116+ < p class ="fragment "> Most used VCS these days</ p >
117+ < p class ="fragment "> Free and open source</ p >
118118 </ section >
119119
120120 < section >
@@ -136,7 +136,7 @@ <h2>Git basics</h2>
136136 < pre > < code data-trim >
137137git clone git@github.com:docker/docker.git
138138 </ code > </ pre >
139- < p > The above command- line will clone the official repository of the < a href ="https://www.docker.com/ "> Docker</ a > project</ p >
139+ < p > The above command line will clone the official repository of the < a href ="https://www.docker.com/ "> Docker</ a > project</ p >
140140 </ section >
141141
142142 < section >
@@ -149,7 +149,7 @@ <h2>Git basics</h2>
149149
150150 < section >
151151 < h2 > Git basics</ h2 >
152- < p > To add files to be tracked :</ p >
152+ < p > To track new files :</ p >
153153 < pre > < code data-trim >
154154git add *.c
155155git add include/
@@ -276,7 +276,7 @@ <h2>The rebase feature</h2>
276276 < section >
277277 < h2 > Different workflows</ h2 >
278278 < p > Centralised</ p >
279- < p > Integration- manager</ p >
279+ < p > Integration manager</ p >
280280 < p > Dictator and lieutenant</ p >
281281 </ section >
282282
@@ -289,7 +289,7 @@ <h2>Centralised</h2>
289289 </ section >
290290
291291 < section >
292- < h2 > Integration- manager</ h2 >
292+ < h2 > Integration manager</ h2 >
293293 < figure >
294294 < img src ="img/integration-manager.png " alt ="Integration-manager workflow ">
295295 < figcaption style ="font-style: italic; font-size: .5em "> Integration-manager workflow - Reference: < a href ="http://git-scm.com/book/en/v2 "> Pro Git, 2nd edition</ a > </ figcaption >
@@ -322,7 +322,7 @@ <h2>Public clouds</h2>
322322 < section >
323323 < h2 > Self-hosted servers</ h2 >
324324 < p class ="fragment "> Examples: < a href ="https://about.gitlab.com/ "> GitLab</ a > , < a href ="https://gogs.io/ "> Gogs</ a > </ p >
325- < p class ="fragment "> Better choice for your confidential works </ p >
325+ < p class ="fragment "> Better choice if your work is confidential </ p >
326326 </ section >
327327
328328 < section >
0 commit comments