diff --git a/.gitignore b/.gitignore index 7eb5a5dbdf246a505ec5142c84838e55095e759e..cb3b59c1bf5b1431dcb65581feeb26df40f67cd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ -paper.html -paper.pdf img/git-remote-contributor.svg img/git-remote-maintainer.svg img/git-remote-solo.svg img/license-chooser.svg +img/motivation-structure.svg img/motivation-throwaway-playground.svg img/staging-area.svg +paper.html +paper.pdf *.pdf diff --git a/basics.html b/basics.html index 5fbdf2871954dd592ada65fecb01d1b5bc0cffc3..a7fa81f0d8ded9f4deb96c852587ced5edf2e253 100644 --- a/basics.html +++ b/basics.html @@ -117,7 +117,7 @@ - statistics and R support @ iDiv since 2014 - knows that kind of pain: -  +  </section> <section id="intro-about-you" data-markdown> @@ -153,7 +153,7 @@ ## motivation #1 ### avoid mess -  +  notes: - who has seen such a mess? @@ -165,11 +165,12 @@ ## motivation #1 ### want structure -  +  notes: - structure - who, when, why + - (and you can see how fast you are with git *joke*) </section> <section id="motivation-playground" data-markdown> diff --git a/img/draft_mess_half_size.png b/img/motivation-draft-mess-half-size.png similarity index 100% rename from img/draft_mess_half_size.png rename to img/motivation-draft-mess-half-size.png diff --git a/img/draft_mess.png b/img/motivation-draft-mess.png similarity index 100% rename from img/draft_mess.png rename to img/motivation-draft-mess.png diff --git a/img/motivation-structure.dot b/img/motivation-structure.dot new file mode 100644 index 0000000000000000000000000000000000000000..19dd760bfc0e70339e37c6a0336b4b0d3e2f5090 --- /dev/null +++ b/img/motivation-structure.dot @@ -0,0 +1,16 @@ +digraph { + node [shape = "box", style = "filled, rounded"] + + subgraph clustermaster { + label = "master" + + node [color = limegreen] + + master4[label = "Dirk (today)\nupdates methods chapter", color = limegreen] + master3[label = "Christian (yesterday)\nfixes typos", color = darkorchid1] + master2[label = "Dirk (three days ago)\nadds methods chapter", color = limegreen] + master1[label = "...", color = grey] + + master4 -> master3 -> master2 -> master1 + } +}