change sectiontitle to encorporate both v5 and v6

diff --git a/report/preamble.tex b/report/preamble.tex
index c7a017c..a72256a 100644 (file)
--- a/report/preamble.tex
+++ b/report/preamble.tex
@@ -1,4 +1,4 @@
-\documentclass[draft,a4paper,titlepage]{article}
+\documentclass[a4paper,titlepage]{article}
 
 \usepackage{CJKutf8}
 \usepackage{rutitlepage}

diff --git a/report/report.tex b/report/report.tex
index d44b94c..8213ab1 100644 (file)
--- a/report/report.tex
+++ b/report/report.tex
@@ -12,11 +12,9 @@
 
 \subsection{Access Control}
 
-\subsection{Input Validation}
+\subsection{Input Validation \& Output Encoding/Escaping}
 \input{v5_input.tex}
 
-\subsection{Output Encoding/Escaping}
-
 \subsection{Cryptography at rest}
 
 \subsection{Error Handling \& logging}

diff --git a/report/v6_output.tex b/report/v6_output.tex
deleted file mode 100644 (file)
index b01611c..0000000
--- a/report/v6_output.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\begin{enumerate}[label={6.\arabic*}]
-\end{enumerate}