Edited parts of the text

While reading over the already written parts (and hopefully complete the
paper), they were edited/corrected to be more clear.

3 files changed, 24 insertions, 18 deletions

diff --git a/tex/src/figure-file-architecture.tex b/tex/src/figure-file-architecture.tex
index e08ee52..8fb1a6d 100644
--- a/tex/src/figure-file-architecture.tex
+++ b/tex/src/figure-file-architecture.tex
@@ -134,32 +134,32 @@
   \node [anchor=west, at={(4.67cm,-3.0cm)}] {\scriptsize\sf by \LaTeX).};
   \fi
 
+  %% .git/
+  \ifdefined\fullfilearchitecture
+  \node [dirbox, at={(0,-3.6cm)}, minimum width=14.2cm, minimum height=7mm,
+    label={[shift={(0,-5mm)}]\texttt{.git/}}, fill=brown!15!white] {};
+  \node [anchor=north, at={(0cm,-3.9cm)}]
+        {\scriptsize\sf Full project temporal provenance (version controlled history) in Git.};
+  \fi
+
   %% .local/
   \ifdefined\fullfilearchitecture
-  \node [dirbox, at={(-3.6cm,-3.6cm)}, minimum width=7cm, minimum height=1.2cm,
+  \node [dirbox, at={(-3.6cm,-4.5cm)}, minimum width=7cm, minimum height=1.2cm,
     label={[shift={(0,-5mm)}]\texttt{.local/}}, dashed, fill=brown!15!white] {};
-  \node [anchor=west, at={(-7.1cm,-4.3cm)}]
+  \node [anchor=west, at={(-7.1cm,-5.2cm)}]
         {\scriptsize\sf Symbolic link to project's software environment, e.g., };
-  \node [anchor=west, at={(-7.1cm,-4.6cm)}]
+  \node [anchor=west, at={(-7.1cm,-5.5cm)}]
         {\scriptsize\sf Python or R, run `\texttt{.local/bin/python}' or `\texttt{.local/bin/R}'};
   \fi
 
   %% .build/
   \ifdefined\fullfilearchitecture
-  \node [dirbox, at={(3.6cm,-3.6cm)}, minimum width=7cm, minimum height=1.2cm,
+  \node [dirbox, at={(3.6cm,-4.5cm)}, minimum width=7cm, minimum height=1.2cm,
     label={[shift={(0,-5mm)}]\texttt{.build/}}, dashed, fill=brown!15!white] {};
-  \node [anchor=west, at={(0.1cm,-4.3cm)}]
+  \node [anchor=west, at={(0.1cm,-5.2cm)}]
         {\scriptsize\sf Symbolic link to project's top-level build directory.};
-  \node [anchor=west, at={(0.1cm,-4.6cm)}]
+  \node [anchor=west, at={(0.1cm,-5.5cm)}]
         {\scriptsize\sf Enabling easy access to all of project's built components.};
   \fi
 
-  %% .git/
-  \ifdefined\fullfilearchitecture
-  \node [dirbox, at={(0,-5cm)}, minimum width=14.2cm, minimum height=7mm,
-    label={[shift={(0,-5mm)}]\texttt{.git/}}, dashed, fill=brown!15!white] {};
-  \node [anchor=north, at={(0cm,-5.3cm)}]
-        {\scriptsize\sf Full project temporal provenance (version controlled history) in Git.};
-  \fi
-
 \end{tikzpicture}
diff --git a/tex/src/preamble-style.tex b/tex/src/preamble-style.tex
index c3aeca2..9556f54 100644
--- a/tex/src/preamble-style.tex
+++ b/tex/src/preamble-style.tex
@@ -137,3 +137,9 @@
 
 %% Custom macros
 \newcommand{\inlinecode}[1]{\textcolor{blue!35!black}{\texttt{#1}}}
+
+%% Example Makefile macros
+\newcommand{\mkcomment}[1]{\textcolor{red!35!white}{#1}}
+\newcommand{\mktarget}[1]{\textcolor{blue!40!black}{#1}}
+\newcommand{\mkprereq}[1]{\textcolor{green!30!black}{#1}}
+\newcommand{\mktab}[1]{\textcolor{black!25!white}{\_\_\_TAB\_\_\_}}
diff --git a/tex/src/references.tex b/tex/src/references.tex
index 305c3ab..f57b26e 100644
--- a/tex/src/references.tex
+++ b/tex/src/references.tex
@@ -845,13 +845,13 @@ archivePrefix = {arXiv},
 
 
 @ARTICLE{courtes15,
-       author = {{Court{\`e}s}, Ludovic and {Wurmus}, Ricardo},
-        title = "{Reproducible and User-Controlled Software Environments in HPC with Guix}",
+       author = {{Court{\'e}s}, Ludovic and {Wurmus}, Ricardo},
+        title = {Reproducible and User-Controlled Software Environments in HPC with Guix},
       journal = {Euro-Par},
        volume = {9523},
      keywords = {Computer Science - Distributed, Parallel, and Cluster Computing, Computer Science - Operating Systems, Computer Science - Software Engineering},
-         year = "2015",
-        month = "Jun",
+         year = {2015},
+        month = {Jun},
           eid = {arXiv:1506.02822},
         pages = {arXiv:1506.02822},
 archivePrefix = {arXiv},