diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-08 15:22:00 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-08 15:22:00 +0100 |
| commit | af01af52df453294ed7db36fe8ea4d021d07930b (patch) | |
| tree | 8af7dd8f77e5989a7e4de885702688ff09d561e2 /preamble | |
| parent | 1d5cf0f448b08d398f7edee472815844926e5de4 (diff) | |
| parent | 8864329adc31391babc106799934395fc6190d65 (diff) | |
Merge branch 'feb-23-2015', containing Jan 26 and Feb 23 minutes
Diffstat (limited to 'preamble')
| -rw-r--r-- | preamble/preamble.tex | 5 |
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}} |