Merge branch 'master' into 2019-05-05-annual

Conflicts:
	preamble/preamble.tex
	preamble/acronyms.tex
	preamble/attendants.tex

1 files changed, 3 insertions, 122 deletions

diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 2df6321..5459131 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -47,127 +47,7 @@
 \newcommand \tb {\,\textsc{tb}}
 
 % Macros, förkortningar
-\newcommand \acta {\textsc{acta}}
-\newcommand \antilop {\texthost{antilop}}
-\newcommand \benjamin {\texthost{benjamin}}
-\newcommand \bgp {\textsc{bgp}}
-\newcommand \cacert {\textsc{ca}cert}
-\newcommand \calima {\texthost{calima}}
-\newcommand \cfengine {\textsc{cf}-engine}
-\newcommand \civett {\texthost{civett}}
-\newcommand \cpu {\textsc{cpu}}
-\newcommand \dfd {\textsc{dfd}}
-\newcommand \dfdd {Document Freedom Day (\textsc{dfd})}
-\newcommand \dfri {\textsc{dfri}}
-\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}}
-\newcommand \dnssecc {\dnssec\ (\textit{Domain Name System Security Extensions})}
-\newcommand \elefant {\texthost{elefant}}
-\newcommand \etc {\textsc{etc}}
-\newcommand \etcdagens {\textit{Dagens \etc}}
-\newcommand \eu {\textsc{eu}}
-\newcommand \faq {\textsc{faq}}
-\newcommand \fosdem {\textsc{fosdem}}
-\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}}
-\newcommand \gdprr {Allmänna dataskyddsförordningen (\textsc{gdpr}, \textit{General Data Protection Regulation})}
-\newcommand \giraff {\texthost{giraff}}
-\newcommand \gnuhost {\textsc{gnu}}
-\newcommand \gnupg {Gnu\textsc{pg}}
-\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}-banken}
-\newcommand \ldap {\textsc{ldap}}
-\newcommand \ldapp {\ldap\ (Lightweight Directory Access Protocol)}
-\newcommand \lool {\textsc{lool}}
-\newcommand \looll {LibreOffice Online (\lool)}
-\newcommand \luxemburg {\texthost{luxemburg}}
-\newcommand \lvm {\textsc{lvm}} % Logical volume management
-\newcommand \mda {\textsc{mda}}
-\newcommand \mdalong {(Meddelandeleverantör, eng. \textit{Mail Delivery Agent})}
-\newcommand \mistral {\texthost{mistral}}
-\newcommand \msa {\textsc{msa}}
-\newcommand \msaa {\textsc{msa} (\textit{Mail Submission Agent})}
-\newcommand \mx {\textsc{mx}}
-\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}}
-\newcommand \ntig {\textsc{nti}-gymnasiet}
-\newcommand \ok {\textsc{ok}}
-\newcommand \omx {\textsc{omx}}
-\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}}
-\newcommand \prqq {PeriQ Networks (\textsc{prq})}
-\newcommand \raid {\textsc{raid}}
-\newcommand \rfc {\textsc{rfc}}
-\newcommand \savanna {\texthost{savanna}}
-\newcommand \scb {\textsc{scb}}
-\newcommand \scbb {Statistiska centralbyrån (\scb)}
-\newcommand \serengeti {\texthost{serengeti}}
-\newcommand \selinux {\textsc{sel}inux}
-\newcommand \sgs {\textsc{sgs}}
-\newcommand \sgslong {\textsc{sgs} (Stiftelsen Göteborgs studentbostäder)}
-\newcommand \smart {\textsc{smart}}
-\newcommand \sms {\textsc{sms}}
-\newcommand \smtp {\textsc{smtp}}
-\newcommand \spf {\textsc{spf}}
-\newcommand \spff {\spf\ (\textit{Sender Policy Framework}, ramverk för avsändarpolicy)}
-\newcommand \ssh {\textsc{ssh}}
-\newcommand \sso {\textsc{sso}}
-\newcommand \ssl {\textsc{ssl}}
-\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}}
-\newcommand \vpss {\vps\ (Virtual Private Server)}
-\newcommand \xmpp {\textsc{xmpp}}
-\newcommand \zetkin {\texthost{zetkin}}
-\newcommand \zivette {\texthost{zivette}}
+\input{../preamble/acronyms}
 
 % Eumerate
 \newcommand \enumiform {\quad\sffamily\small\color{grayFri}}
@@ -211,4 +91,5 @@
 \rfoot{\footnotesize utskr.\ \today}
 
 
-
+% Deltagare
+\input{../preamble/attendants}