From e816f2da73651d558c4056494bbfeb12c99b7942 Mon Sep 17 00:00:00 2001
From: chhan11 <zbcchhan11@zbc.dk>
Date: Thu, 1 Jun 2017 12:25:34 +0200
Subject: [PATCH] Moved content of chapter files to main.tex

---
 chapter/internet.tex        | 11 -------
 chapter/layer2protocols.tex |  7 -----
 chapter/layer3protocols.tex | 11 -------
 chapter/management.tex      | 13 --------
 main.tex                    | 62 ++++++++++++++++++++++++++++++++++---
 5 files changed, 58 insertions(+), 46 deletions(-)
 delete mode 100644 chapter/internet.tex
 delete mode 100644 chapter/layer2protocols.tex
 delete mode 100644 chapter/layer3protocols.tex
 delete mode 100644 chapter/management.tex

diff --git a/chapter/internet.tex b/chapter/internet.tex
deleted file mode 100644
index 35c4ad7..0000000
--- a/chapter/internet.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
-
-\section{Service Providers}
-
-\section{IXP}
-
-\section{MPLS}
-
-\section{BGP}
-
-\section{eVPN}
\ No newline at end of file
diff --git a/chapter/layer2protocols.tex b/chapter/layer2protocols.tex
deleted file mode 100644
index a10c235..0000000
--- a/chapter/layer2protocols.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\chapter{Protocols Layer 2}
-
-\input{chapter/section/switchednetwork}
-
-\newpage
-
-\input{chapter/section/spanningtree}
diff --git a/chapter/layer3protocols.tex b/chapter/layer3protocols.tex
deleted file mode 100644
index a000aec..0000000
--- a/chapter/layer3protocols.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\chapter{Layer-2-to-Layer-3}
-
-\input{chapter/section/intervlanrouting}
-
-\chapter{DHCP}
-
-\input{chapter/section/dhcp}
-
-\chapter{Protocols Layer 3}
-
-\input{chapter/section/routednetwork}
diff --git a/chapter/management.tex b/chapter/management.tex
deleted file mode 100644
index e008d56..0000000
--- a/chapter/management.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\chapter{Managemnt}
-
-\section{Network management}
-
-\subsection{Routers}
-
-\subsection{Switches}
-
-\subsection{Firewall}
-
-\section{Out-of-band management}
-
-\subsection{Console server}
\ No newline at end of file
diff --git a/main.tex b/main.tex
index 97c7ee6..11522b0 100644
--- a/main.tex
+++ b/main.tex
@@ -27,13 +27,67 @@
 	
 \include{chapter/baseconf}
 
-\include{chapter/layer2protocols}
+\chapter{Layer 2}
 
-\include{chapter/layer3protocols}
+\input{chapter/section/switchednetwork}
 
-\include{chapter/internet}
+\newpage
 
-\include{chapter/management}
+\input{chapter/section/spanningtree}
+
+\chapter{L2 to L3}
+
+\input{chapter/section/intervlanrouting}
+
+\chapter{DHCP}
+
+\input{chapter/section/dhcp}
+
+\chapter{Triple A\tsq{s}}
+
+\myquote{}{Remember to log the details, too.}
+
+\xkcd{latitude}{Remember logging when necessary}
+
+\input{chapter/aaa/radius}
+
+\input{chapter/aaa/tacacsplus}
+
+\chapter{Network Time Protocol}
+
+\section{The old NTP from \tsq{85}}
+
+\section{Secure NTP}
+
+\chapter{Managemnt}
+
+\section{Network management}
+
+\subsection{Routers}
+
+\subsection{Switches}
+
+\subsection{Firewall}
+
+\section{Out-of-band management}
+
+\subsection{Console server}
+
+\chapter{Protocols Layer 3}
+
+\input{chapter/section/routednetwork}
+
+\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
+
+\section{Service Providers}
+
+\section{IXP}
+
+\section{MPLS}
+
+\section{BGP}
+
+\section{eVPN}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %