Changes

.latexmkrc

@@ -1,5 +1,11 @@
+# @default_files = ('main-book.tex', 'main-presentation.tex');
+@default_files = ('a4.tex', 'a5.tex', 'main-presentation.tex');
+
+# Output directly to PDF (5 = XeLaTeX)
 $pdf_mode = 1;
-@default_files = ('main-book.tex', 'main-presentation.tex');
+$emulate_aux = 1;
+$aux_dir = 'aux/';
+$ENV{'TEXINPUTS'}='./tex//:' . $ENV{'TEXINPUTS'};
 
 add_cus_dep( 'acn', 'acr', 0, 'makeglossaries' );
 add_cus_dep( 'glo', 'gls', 0, 'makeglossaries' );

a4.tex

@@ -0,0 +1,5 @@
+\documentclass[a4paper,12pt,british]{memoir}
+%\def\CurrentAudience{student}
+\usepackage{graphicx}
+\setkeys{Gin}{width=.75\textwidth} % from the graphicx package
+\input{main-book}

a5.tex

@@ -0,0 +1,5 @@
+\documentclass[a5paper,10pt,british]{memoir}
+%\def\CurrentAudience{teacher}
+\usepackage{graphicx}
+\setkeys{Gin}{width=\textwidth} % from the graphicx package
+\input{main-book}

chapters/ethernet.tex

@@ -40,7 +40,7 @@
 
 \begin{figure}
 \centering
-\includegraphics[width=.8\textwidth]{images/mac-address-format.png}
+\includegraphics{images/mac-address-format.png}
 \caption[The format of a \acs{MAC} address]{The \acs{MAC} address consists of two parts with the first part having two bits with special meaning}
 \label{fig:mac-format}
 \end{figure}

chapters/introduction.tex

@@ -271,7 +271,7 @@ \subsection{Wide-area networks}
 
 \begin{figure}
 \centering
-\includegraphics[width=.5\textwidth]{images/thompson.png}
+\includegraphics{images/thompson.png}
 \caption%
    [Thompson and Ritchie working on a \abbr{PDP-11}]%
    {Ken Thompson (sitting) and Dennis Ritchie working on a \abbr{PDP-11}, circa~1970. The picture was taken by Peter Hamer and the line drawing was made by \href{https://www.truecable.com/blogs/cable-academy/a-brief-history-of-network-technology}{truecable.com}.}

chapters/ip.tex

@@ -495,28 +495,20 @@
 This means that \acl{ISP} should block packets with a private \acs{IP} address as either the source or the destination address.
 
 There are several blocks of private \acs{IP} addresses which can be used internally by organisations without having to ask for permission to do so.
-These include the \rfc{1918} addresses
-\begin{multicols}{3}
-\raggedcolumns
-\begin{itemize}
-\item 10.0.0.0/8,
-\item 172.16.0.0/12, and;
-\item 192.168.0.0/16
-\end{itemize}
-\end{multicols}
-but also these lesser-known address ranges:
 \begin{multicols}{3}
 \raggedcolumns
 \begin{itemize}
+\item 10.0.0.0/8
 \item 100.64.0.0/10
 \item 169.254.0.0/16
+\item 172.16.0.0/12
 \item 192.0.2.0/24
+\item 192.168.0.0/16
 \item 198.18.0.0/15
 \item 198.51.100.0/24
 \item 203.0.113.0/24
 \end{itemize}
 \end{multicols}
-These are private address ranges set aside for carrier-grade \acs{NAT}, documentation purposes, link-local addressing, and test setups.
 
 The ranges 10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/16 were introduced as private IP ranges to enable \acf{NAT}.
 The ranges 192.0.2.0/24, 198.51.100.0/24, and 203.0.113.0/24 have been reserved for documentation purposes but can be used internally within an organisation.

chapters/transport.tex

@@ -30,8 +30,8 @@
 
 \begin{table}
     \centering
-    \begin{minipage}{.7\textwidth}
-    \centering
+    %\begin{minipage}{.7\textwidth}
+    %\centering
     \sffamily
     \begin{tabular}{ll@{\hspace{2cm}}ll}
     \textbf{port} & \textbf{application} & \textbf{port} & \textbf{application} \\[1ex]
@@ -42,7 +42,7 @@
      \acs{UDP}/68 & \acs{DHCP} (client) & \acs{TCP}/445 & \acs{SMB} file shares \\
      \acs{TCP}/80 & \acs{HTTP}          & \acs{UDP}/666 & Doom\footnote{Doom is the first online first-person shooter game.}\\
     \end{tabular}
-    \end{minipage}
+    %\end{minipage}
     \caption{A few well-known ports}
     \label{tab:port-numbers}
 \end{table}

main-book.tex

@@ -1,5 +1,6 @@
-\documentclass[a4paper,12pt,british]{memoir}
-%\documentclass[a5paper,10pt,british]{memoir}
+%\usepackage{multiaudience}
+%\SetNewAudience{teacher}
+%\SetNewAudience{student}
 \usepackage[utf8]{inputenc}
 \usepackage{babel}
 \isopage
@@ -55,8 +56,6 @@
 \captionsetup[table]{position=above}
 \captionsetup[figure]{position=below}
 \usepackage{subcaption}
-\usepackage{graphicx}
-\setkeys{Gin}{width=.75\textwidth} % from the graphicx package
 
 \usepackage{csquotes}
 \usepackage[backend=biber,style=reading,citestyle=authoryear,entrykey=false,sorting=tyn]{biblatex}

tex/abbreviations.tex

@@ -38,7 +38,7 @@
 \newabbreviation{DNS}{DNS}{Domain Name System}
 \newabbreviation{DOD}{DoD}{Department of Defense}
 \newabbreviation{DORA}{DORA}{discover, offer, request, and acknowledge}
-\newabbreviation{DPI}{DPI}{deep packet inspection}
+\newabbreviation{DPI}{DPI}{deep-packet inspection}
 \newabbreviation{EAP}{EAP}{Extensible Authentication Protocol}
 \newabbreviation{EAPOL}{EAPOL}{\acs{EAP} over \acs{LAN}}
 \newabbreviation{ECMP}{ECMP}{equal-cost multi-path routing}
@@ -76,7 +76,7 @@
 \newabbreviation{LAN}{LAN}{local-area network}
 \newabbreviation{LC}{LC}{lucent connector/little connector/local connector}
 \newabbreviation{LED}{LED}{light-emitting diode}
-\newabbreviation{LLC}{LLC}{logical link-control}
+\newabbreviation{LLC}{LLC}{logical-link control}
 \newabbreviation{MAC}{MAC}{media access control}
 \newabbreviation{MAU}{MAU}{media access unit}
 \newabbreviation{MAN}{MAN}{metropolitan-area network}