From bb88faf6b5bb37516e61a51e03b5a2a1fd314d58 Mon Sep 17 00:00:00 2001
From: chhan11 <zbcchhan11@zbc.dk>
Date: Sun, 18 Jun 2017 01:52:22 +0200
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 commands.tex                           | 71 +++++++++++---------------
 main.tex                               |  2 +-
 references.bib => references-books.bib |  8 ---
 references-websites.bib                | 15 ++++++
 references-wikipedia.bib               |  8 +++
 structure.tex                          | 10 +++-
 6 files changed, 63 insertions(+), 51 deletions(-)
 rename references.bib => references-books.bib (52%)
 create mode 100644 references-websites.bib

diff --git a/commands.tex b/commands.tex
index 0a312dc..61cbc05 100644
--- a/commands.tex
+++ b/commands.tex
@@ -1,11 +1,3 @@
-% Usage: \pic[<pct-of-columnwidth>]{<path-to-file>}
-\newcommand{\pic}[2][50]{
-\begin{center}
-    \transparent{0.4}
-    \includegraphics[width=0.#1\columnwidth]{#2}
-\end{center}
-}
-
 % Usage: \fig{<path-to-file>}{<label>}{<caption>}
 \newcommand{\fig}[4][]{
 \begin{figure}[h!]
@@ -23,21 +15,15 @@
 \end{figure}
 }
 
+
+% Usage:
 \newcommand{\xkcd}[2]{\fig{xkcd/#1}{#1}{#2\\%
 {\tiny\MakeUppercase{https://imgs.xkcd.com/comics/#1.png}\hskip3mm%
 License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC 2.5}}%
 }}}
 
-% Usage: \svg{<path-to-file>}{<label>}{<caption>}
-\newcommand{\svg}[3]{
-    \begin{figure}[h]
-        \centering
-        \includesvg{#1}
-        \caption{#3}
-        \label{fig:#2}
-    \end{figure}
-}
 
+% Usage:
 \newcommand{\notice}[2]{%
     \shadowbox{%
         \begin{varwidth}{0.85\linewidth}
@@ -47,8 +33,12 @@ License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC
     }
 }
 
+
+% Usage:
 \newcommand{\cliline}[2][]{\lstinline[columns=fixed,#1]{#2}}
 
+
+% Usage:
 \newcommand{\utccurrenttime}[0]{%
     \today%
     T%
@@ -59,6 +49,7 @@ License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC
 }
 
 
+% Usage:
 \newcommand{\itemhead}[2][]{%
 	\sbox0{#1}%
 	\ifdim\wd0=0pt
@@ -67,6 +58,9 @@ License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC
 		{\textbf{#2:}\\{\footnotesize #1}}
 	\fi
 }
+
+
+% Usage:
 \newcommand{\itemtitle}[2]{%
 	\sbox0{#1}%
 	\ifdim\wd0=0pt
@@ -77,6 +71,7 @@ License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC
 }
 
 
+% Usage:
 \newcommand{\myquote}[2]{%
     \sbox0{#1}%
     \ifdim\wd0=0pt
@@ -87,43 +82,39 @@ License: \texttt{\href{https://creativecommons.org/licenses/by-nc/2.5/}{CC BY-NC
 }
 
 
+% Usage:
 % Enviroment @var txt
 % changes code styling to: in frame, white bg.
 \lstnewenvironment{txt}{\lstset{style=plaintxt}}{}
 
 
+% Usage:
 % Enviroment @var cisco
 \lstnewenvironment{cisco}{\lstset{language=cisco}}{}
 
 
-%\newcommand{cisline}[1]{\lstinline[columns=fixed]{network-device\# #1}}
-
-
-%\newcommand{cisconf}[2][]{%
-%\def\temp{#1}\ifx\temp\empty
-%\lstinline[columns=fixed]{network-device(config)\# #2}
-%\else
-%\lstinline[columns=fixed]{network-device(config-#1)\# #2}
-%\fi\}
-
-
+% Usage:
 \newcommand{\txtreflect}[1]{\reflectbox{#1}}
+
+
+% Usage:
 \newcommand{\txtupdown}[1]{\raisebox{\depth}{\rotatebox{270}{\reflectbox{\rotatebox{90}{#1}}}}}
 
 
+% Usage: used in similair manner as itemize --> \begin{rules} then \end{rules}
 % http://www.troubleshooters.com/linux/lyx/ownlists.htm
 \newenvironment{rules}{
-\begin{list}
-{\bfseries{}§\hskip1mm\arabic{qcounter}:~}
-{
-\usecounter{qcounter}
-\bfseries
-\setlength\labelwidth{1in}
-\setlength\labelsep{0.27in}
-\setlength\leftmargin{0.56in}
-\setlength\listparindent{1in}
-\setlength\itemindent{0.1in}
-}
+    \begin{list}%
+    {\bfseries{}§\hskip1mm\arabic{qcounter}:~}%
+    {
+        \usecounter{qcounter}
+        \bfseries
+        \setlength\labelwidth{1in}
+        \setlength\labelsep{0.27in}
+        \setlength\leftmargin{0.56in}
+        \setlength\listparindent{1in}
+        \setlength\itemindent{0.1in}
+    }
 }{
-\end{list}
+    \end{list}
 }
diff --git a/main.tex b/main.tex
index 659113f..66d2d61 100644
--- a/main.tex
+++ b/main.tex
@@ -67,7 +67,7 @@
 %                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\bibliography{references,references-wikipedia}
+\bibliography{references-books,references-websites,references-wikipedia}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %
diff --git a/references.bib b/references-books.bib
similarity index 52%
rename from references.bib
rename to references-books.bib
index c1bdc34..488f789 100644
--- a/references.bib
+++ b/references-books.bib
@@ -1,11 +1,3 @@
-@online{ slideshare:vtpchap4,
-    author = "Hector Camba Lainez",
-    title = "Cap4 implementing vtp",
-    year = "2010",
-    url = {https://www.slideshare.net/lucky0679/cap4-implementing-vtp},
-    note = "[Online; accessed 22-May-2017]"
-}
-
 @book{froom2015implementing,
     author = "Froom, Richard",
     title = "Implementing Cisco IP switched networks (SWITCH) : foundation learning guide",
diff --git a/references-websites.bib b/references-websites.bib
new file mode 100644
index 0000000..a469821
--- /dev/null
+++ b/references-websites.bib
@@ -0,0 +1,15 @@
+@online{ slideshare:vtpchap4,
+    author = "Hector Camba Lainez",
+    title = "Cap4 implementing vtp",
+    year = "2010",
+    url = {https://www.slideshare.net/lucky0679/cap4-implementing-vtp},
+    note = "[Online; accessed 22-May-2017]"
+}
+
+@misc{ web:SP_Tiers,
+   author = "Orhan Ergun",
+   title = "{Tier 1,Tier 2 and Tier 3 Service Providers - Tier and BGP Peering} --- Orhanergun.net",
+   year = "2017",
+   howpublished = {\url{https://orhanergun.net/2017/01/tier-1-tier-2-tier-3-service-providers/}},
+   note = "[Online; accessed 17-June-2017]"
+}
diff --git a/references-wikipedia.bib b/references-wikipedia.bib
index e39f076..29621dc 100644
--- a/references-wikipedia.bib
+++ b/references-wikipedia.bib
@@ -49,3 +49,11 @@
    howpublished = {\url{http://en.wikipedia.org/w/index.php?title=Common\%20Address\%20Redundancy\%20Protocol&oldid=767510512}},
    note = "[Online; accessed 11-June-2017]"
 }
+
+@misc{ wiki:ARPANET,
+   author = "Wikipedia",
+   title = "{ARPANET} --- {W}ikipedia{,} The Free Encyclopedia",
+   year = "2017",
+   howpublished = {\url{http://en.wikipedia.org/w/index.php?title=ARPANET&oldid=783213190}},
+   note = "[Online; accessed 17-June-2017]"
+}
diff --git a/structure.tex b/structure.tex
index 1ef48c8..2d3e50a 100644
--- a/structure.tex
+++ b/structure.tex
@@ -1,4 +1,4 @@
-	% Latex Packages
+% Latex Packages
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage{lmodern}
@@ -39,7 +39,7 @@
 \usepackage{titling} % makes available \thetitle \theauthor \thedate
 \usepackage[toc,acronym,footnote,nomain]{glossaries} % Load the package with the acronym option
 \usepackage{chngcntr}
-\newcounter{qcounter}
+\usepackage[toc]{multitoc}
 \usepackage[unicode=false,
     colorlinks=true,
     linkcolor=darkgray,
@@ -48,6 +48,12 @@
     urlcolor=darkgray]{hyperref} % https://en.wikibooks.org/wiki/LaTeX/Hyperlinks
 
 
+\renewcommand*{\multicolumntoc}{3} % https://tex.stackexchange.com/a/6455
+
+
+\newcounter{qcounter}
+
+
 \catcode`\_=12