Merge pull request #222 from NETWAYS/chore/handout-fixes

Update some sizing to fix PDF handout

Author: martialblog

day1/01_Introduction/01_Intro.md

@@ -27,7 +27,7 @@ systems which store the file revisions in a database.
 
 ~~~ENDSECTION~~~
 
-!SLIDE
+!SLIDE noprint
 # Centralized and Distributed VCS
 
 * Central VCS
@@ -46,6 +46,21 @@ systems which store the file revisions in a database.
   </tbody>
 </table>
 
+!SLIDE smbullets printonly
+# Centralized and Distributed VCS
+
+* Central VCS
+  * A central system contains the *version database*, clients work on this system
+  * Examples: CVS, Subversion
+
+<img src="../../_images/mermaid/central-vcs.mmd.png" alt="Central VCS"/>
+
+* Decentral VCS
+  * Clients mirror the *version database* from a central system and work locally
+  * Examples: Git, Mercurial
+
+<img src="../../_images/mermaid/decentral-vcs.mmd.png" alt="Decentral VCS"/>
+
 !SLIDE
 # The History of Git
 

day1/01_Introduction/04_Basics.md

@@ -16,7 +16,7 @@ Git stores compressed snapshots (aka BLOBs) of the files, not diffs. It keeps tr
 
 If a file does not change between commits, Git just refers back to the previous commit.
 
-<center><img src="../../_images/mermaid/deltas.mmd.png" alt="Git Snapshots" width="50%"/></center>
+<center><img src="../../_images/mermaid/deltas.mmd.png" alt="Git Snapshots" width="400px"/></center>
 
 !SLIDE smbullets
 # Git Branch

day1/03_Basics/01_Intro.md

@@ -14,37 +14,10 @@
 
 ****
 
-Example from Git CLI command:
+How to list available commands and get help:
 
-    start a working area (see also: git help tutorial)
-       clone      Clone a repository into a new directory
-       init       Create an empty Git repository or reinitialize an existing one
-
-    work on the current change (see also: git help everyday)
-       add         Add file contents to the index
-       mv          Move or rename a file, a directory, or a symlink
-       rm --cached Reset current HEAD to the specified state
-       rm          Remove files from the working tree and from the index
-
-    examine the history and state (see also: git help revisions)
-       bisect     Use binary search to find the commit that introduced a bug
-       grep       Print lines matching a pattern
-       log        Show commit logs
-       show       Show various types of objects
-       status     Show the working tree status
-
-    grow, mark and tweak your common history
-       branch     List, create, or delete branches
-       checkout   Switch branches or restore working tree files
-       commit     Record changes to the repository
-       diff       Show changes between commits, commit and working tree, etc
-       merge      Join two or more development histories together
-       rebase     Forward-port local commits to the updated upstream head
-       tag        Create, list, delete or verify a tag object signed with GPG
-
-    collaborate (see also: git help workflows)
-       fetch      Download objects and refs from another repository
-       pull       Fetch from and integrate with another repository or a local branch
-       push       Update remote refs along with associated objects
+    git --help
+    git clone --help
+    man git-add
 
 ~~~ENDSECTION~~~

day2/01_Workflows/05_Gitlab_Workflow.md

@@ -114,15 +114,9 @@ GitLab puts the URL into the shell output when pushing the branch.
 
     @@@ Sh
     $ git push -u origin feature/docs-merge-request
-    Counting objects: 6, done.
-    Delta compression using up to 4 threads.
-    Compressing objects: 100% (6/6), done.
-    Writing objects: 100% (6/6), 618 bytes | 618.00 KiB/s, done.
     Total 6 (delta 4), reused 0 (delta 0)
-    remote:
     remote: To create a merge request for feature/docs-merge-request, visit:
     remote:   https://[...].nws.netways.de/root/training/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2Fdocs-merge-request
-    remote:
     To https://[...].nws.netways.de/root/training.git
      * [new branch]      feature/docs-merge-request -> feature/docs-merge-request
     Branch 'feature/docs-merge-request' set up to track remote branch 'feature/docs-merge-request' from 'origin'.
@@ -152,4 +146,3 @@ by merging the MR.
     @@@ Sh
     $ git checkout main
     $ git pull
-    $ tig

day2/03_CI/04_Gitlab_Pipelines.md

@@ -211,14 +211,7 @@ Example:
 
 Rules are evaluated in order until the first match when the pipeline is created. Depending on the configuration, a job is either included or excluded.
 
-The `rules` keyword accepts an array of rules defined with:
-
-* if
-* changes
-* exists
-* allow_failure
-* variables
-* when
+The `rules` keyword accepts an array of rules defined with: if, changes , exists, allow_failure, variables, when.
 
 ~~~ENDSECTION~~~