fixed merge conflicts, new results table

[tt2015.git] / a2 / 2results.tex

diff --git a/a2/2results.tex b/a2/2results.tex
index 361f9df..7c1bca0 100644 (file)
--- a/a2/2results.tex
+++ b/a2/2results.tex
@@ -1,36 +1,33 @@
 \r
-\pagebreak\r
-\r
-\begin{table}\r
-\r
 \subsection{Preflight checklist}\r
-\r
-\textbf{TODO: DEZE TABEL WEL UPDATEN!!}\r
-\r
-\begin{tabularx}{\linewidth}{| l | X|}\r
-       \hline\r
-Check 1 & Get the SUT in a workable state. \\\hline\r
-Course of action & \begin{enumerate}\r
-       \item Import the VirtualBox image into VirtualBox.\r
-       \item Boot the vm.\r
-       \item Verify the SUT booted succesfully and the network module(s) are loaded.\r
-\end{enumerate} \\\hline\r
-Passed & \textit{\st{Yes}/No} \\\hline \hline\r
-Check 2 & Verify the SUT is complete. \\\hline\r
-Course of action & \begin{enumerate}\r
-       \item Use the course of action for \emph{Check 1} in order to boot the SUT.\r
-       \item Verify the loopback device exists using \emph{ifconfig}\r
-       \item Verify the \emph{echo-server} is present on the system.\r
-       \item Verify \emph{Scrappy} is present on the system.\r
-       \item Verify all scripts used for testing are present on the system.\r
-\end{enumerate} \\\hline\r
-Passed & \textit{\st{Yes}/No} \\\hline \hline\r
-Check 3 & Initialize the testing environment. \\\hline\r
-Course of action & \begin{enumerate}\r
-       \item Boot the SUT (see \emph{Check 1}).\r
-       \item Setup iptables by executing \emph{./scripts/setup/iptables.sh}\r
-       \item Setup ... by executing \emph{./scripts/setup/...}\r
-\end{enumerate} \\\hline\r
-Passed & \textit{\st{Yes}/No} \\\hline\r
-\end{tabularx}\r
-\end{table}\r
+%\r
+%\textbf{TODO: DEZE TABEL WEL UPDATEN!!}\r
+%\r
+%\begin{table}\r
+%\begin{tabularx}{\linewidth}{| l | X|}\r
+%      \hline\r
+%Check 1 & Get the SUT in a workable state. \\\hline\r
+%Course of action & \begin{enumerate}\r
+%      \item Import the VirtualBox image into VirtualBox.\r
+%      \item Boot the vm.\r
+%      \item Verify the SUT booted succesfully and the network module(s) are loaded.\r
+%\end{enumerate} \\\hline\r
+%Passed & \textit{\st{Yes}/No} \\\hline \hline\r
+%Check 2 & Verify the SUT is complete. \\\hline\r
+%Course of action & \begin{enumerate}\r
+%      \item Use the course of action for \emph{Check 1} in order to boot the SUT.\r
+%      \item Verify the loopback device exists using \emph{ifconfig}\r
+%      \item Verify the \emph{echo-server} is present on the system.\r
+%      \item Verify \emph{Scrappy} is present on the system.\r
+%      \item Verify all scripts used for testing are present on the system.\r
+%\end{enumerate} \\\hline\r
+%Passed & \textit{\st{Yes}/No} \\\hline \hline\r
+%Check 3 & Initialize the testing environment. \\\hline\r
+%Course of action & \begin{enumerate}\r
+%      \item Boot the SUT (see \emph{Check 1}).\r
+%      \item Setup iptables by executing \emph{./scripts/setup/iptables.sh}\r
+%      \item Setup ... by executing \emph{./scripts/setup/...}\r
+%\end{enumerate} \\\hline\r
+%Passed & \textit{\st{Yes}/No} \\\hline\r
+%\end{tabularx}\r
+%\end{table}\r