Merge branch 'feb-23-2015', containing Jan 26 and Feb 23 minutes

1 files changed, 4 insertions, 1 deletions

diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 7001a21..7223a7c 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -69,7 +69,6 @@
 \newcommand \fscons {\textsc{fscons}}
 \newcommand \fsfe {\textsc{fsfe}}
 \newcommand \giraff {\texthost{giraff}}
-\newcommand \gnuhost {\texthost{gnu}}
 \newcommand \gnu {\textsc{gnu}}
 \newcommand \gnupg {Gnu\textsc{pg}}
 \newcommand \gpg {\textsc{gpg}}
@@ -78,6 +77,7 @@
 \newcommand \imap {\textsc{imap}}
 \newcommand \ip {\textsc{ip}}
 \newcommand \ipred {\textsc{ipred}}
+\newcommand \ipsec {\textsc{ipsec}}
 \newcommand \isp {\textsc{isp}}
 \newcommand \isplong {\textsc{isp} (\textit{Internet Service Provider})}
 \newcommand \ituniv {\textsc{it}-universitetet}
@@ -94,6 +94,8 @@
 \newcommand \mysql {\textsc{m}y\textsc{sql}}
 \newcommand \nsa {\textsc{nsa}}
 \newcommand \nsaa {\textsc{nsa} (\textit{National Security Agency}, \textsc{usa}:s federala säkerhetsmyndighet)}
+\newcommand \nat {\textsc{nat}}
+\newcommand \natt {\textsc{nat} (Network Address Translation)}
 \newcommand \nti {\textsc{nti}}
 \newcommand \ntig {\textsc{nti}-gymnasiet}
 \newcommand \ok {\textsc{ok}}
@@ -118,6 +120,7 @@
 \newcommand \sun {Sun}
 \newcommand \sql {\textsc{sql}}
 \newcommand \srpfyra {\textsc{sr p4}}
+\newcommand \tls {\textsc{tls}}
 \newcommand \usb {\textsc{usb}}
 \newcommand \vlan {\textsc{vlan}} % virtual LAN, different LAN:s on the same broadcast domain
 \newcommand \vps {\textsc{vps}}