aboutsummaryrefslogtreecommitdiffstats
path: root/preamble
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2019-11-25 10:09:48 +0100
committerGustav Eek <gustav.eek@fripost.org>2019-11-25 10:09:48 +0100
commit5a1d1b95993cd6f1184133bcf9c409ef74334acc (patch)
tree4d0c406e0e119cea28240420719b235b2b718319 /preamble
parenta9e9cf52ea4f43533fd294bd958dd17afc85e1ce (diff)
parentb3ae60f513a4871a8b6ddba457581701192654a3 (diff)
Merge branch 'master' into 2019-08-26-board
Diffstat (limited to 'preamble')
-rw-r--r--preamble/acronyms.tex6
1 files changed, 5 insertions, 1 deletions
diff --git a/preamble/acronyms.tex b/preamble/acronyms.tex
index bd90ce6..2faf6f8 100644
--- a/preamble/acronyms.tex
+++ b/preamble/acronyms.tex
@@ -6,6 +6,8 @@
\newcommand \bgp {\textsc{bgp}}
\newcommand \cacert {\textsc{ca}cert}
\newcommand \calima {\texthost{calima}}
+\newcommand \ccc {\textsc{ccc}}
+\newcommand \cccc {\ccc\ (Chaos Communication Congress)}
\newcommand \cfengine {\textsc{cf}-engine}
\newcommand \civett {\texthost{civett}}
\newcommand \cpu {\textsc{cpu}}
@@ -14,7 +16,7 @@
\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 \dkimm {\textsc{dkim} (\textit{Domain Keys Identified Mail})}
\newcommand \dmarc {\textsc{dmarc}}
\newcommand \dmarcc {\dmarc\ (Domain-based Message Authentication, Reporting and Conformance)}
\newcommand \dns {\textsc{dns}}
@@ -118,6 +120,8 @@
\newcommand \udp {\textsc{udp}}
\newcommand \usb {\textsc{usb}}
\newcommand \vlan {\textsc{vlan}} % virtual LAN, different LAN:s on the same broadcast domain
+\newcommand \vm {\textsc{vm}} % virtual machine
+\newcommand \vmm {\vm\ (virtuell maskin)}
\newcommand \vps {\textsc{vps}}
\newcommand \vpss {\vps\ (Virtual Private Server)}
\newcommand \xmpp {\textsc{xmpp}}