Merge branch 'master' into 2018-05-28-board

1 files changed, 19 insertions, 1 deletions

diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 45030ab..a6ed1c2 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -50,6 +50,7 @@
 \newcommand \acta {\textsc{acta}}
 \newcommand \antilop {\texthost{antilop}}
 \newcommand \benjamin {\texthost{benjamin}}
+\newcommand \bgp {\textsc{bgp}}
 \newcommand \cacert {\textsc{ca}cert}
 \newcommand \cfengine {\textsc{cf}-engine}
 \newcommand \civett {\texthost{civett}}
@@ -59,6 +60,8 @@
 \newcommand \dfrii {Föreningen för Digitala Fri- och Rättigheter (\textsc{dfri})}
 \newcommand \dkim {\textsc{dkim}}
 \newcommand \dkimm {\textsc{dkim} (\textit{DomainKeys Identified Mail})}
+\newcommand \dmarc {\textsc{dmarc}}
+\newcommand \dmarcc {\dmarc\ (Domain-based Message Authentication, Reporting and Conformance)}
 \newcommand \dns {\textsc{dns}}
 \newcommand \dnss {\textsc{dns} (Domain Name System)}
 \newcommand \dnssec {\textsc{dnssec}}
@@ -68,11 +71,16 @@
 \newcommand \etcdagens {\textit{Dagens \etc}}
 \newcommand \eu {\textsc{eu}}
 \newcommand \faq {\textsc{faq}}
+\newcommand \fossgbg {\textsc{foss-gbg}}
+\newcommand \fossnorth {\textsc{foss} North}
 \newcommand \fps {\textsc{fps}}
 \newcommand \fpss {Friprogramvarusyndikatet (\fps)}
+\newcommand \fpsss {Friprogramvarusyndikatets (\fps)}
 \newcommand \fra {\textsc{fra}}
 \newcommand \fraa {\textsc{fra} (Försvarets radioanstalt)}
 \newcommand \fripost {\textsf{\textsc{\small Fripost}}}
+\newcommand \flfd {\textsc{flfd}}
+\newcommand \flfdd {Fripost Lagring för delning (\flfd)}
 \newcommand \fscons {\textsc{fscons}}
 \newcommand \fsfe {\textsc{fsfe}}
 \newcommand \gdpr {\textsc{gdpr}}
@@ -83,14 +91,17 @@
 \newcommand \gpg {\textsc{gpg}}
 \newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)} 
 \newcommand \harvey {\texthost{harvey}}
+\newcommand \icmp {\textsc{icmp}}
 \newcommand \imap {\textsc{imap}}
 \newcommand \ip {\textsc{ip}}
+\newcommand \ipvfour {\textsc{ip}v4}
+\newcommand \ipvsix {\textsc{ip}v6}
 \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}
-\newcommand \jak {\textsc{jak}}
+\newcommand \jak {\textsc{jak}-banken}
 \newcommand \ldap {\textsc{ldap}}
 \newcommand \ldapp {\ldap\ (Lightweight Directory Access Protocol)}
 \newcommand \lool {\textsc{lool}}
@@ -106,6 +117,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 \nsu {\textsc{nsu}}
+\newcommand \nsuu {Nordiskt Sommaruniversitet (\nsu)}
 \newcommand \nat {\textsc{nat}}
 \newcommand \natt {\textsc{nat} (Network Address Translation)}
 \newcommand \nti {\textsc{nti}}
@@ -115,6 +128,8 @@
 \newcommand \ossec {\textsc{ossec}}
 \newcommand \otrs {\textsc{otrs}}
 \newcommand \otrss {\otrs\ (Open-source Ticket Request System)}
+\newcommand \issi {\textsc{issi}}
+\newcommand \issii {\issi\ (Open Suorce Seed Initiative)}
 \newcommand \paypal {PayPal}
 \newcommand \pgp {\textsc{pgp}}
 \newcommand \prq {\textsc{prq}}
@@ -135,7 +150,10 @@
 \newcommand \sun {Sun}
 \newcommand \sql {\textsc{sql}}
 \newcommand \srpfyra {\textsc{sr p4}}
+\newcommand \tcp {\textsc{tcp}}
 \newcommand \tls {\textsc{tls}}
+\newcommand \tlss {\textsc{tls} (Transport Layer Secuity)}
+\newcommand \udp {\textsc{udp}}
 \newcommand \usb {\textsc{usb}}
 \newcommand \vlan {\textsc{vlan}} % virtual LAN, different LAN:s on the same broadcast domain
 \newcommand \vps {\textsc{vps}}