aboutsummaryrefslogtreecommitdiffstats
path: root/preamble
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@etraveli.com>2017-05-09 21:53:15 +0200
committerGustav Eek <gustav.eek@etraveli.com>2017-05-09 21:53:15 +0200
commitb5b613ed628948d38968e897b6d4558d227c613e (patch)
treea7366bdc47261522b584c684b23ba44e7ae5d844 /preamble
parentad33c470cc6f8878afd24133f4ffd1db7acff5ca (diff)
parentbbdb2e6b58317aac124c0bf176bd2e67b4ed4413 (diff)
Merge branch '2016-04-17-annual' into 2017-05-13-annual
Conflicts: 2016/Makefile agenda/Makefile
Diffstat (limited to 'preamble')
-rw-r--r--preamble/preamble.tex9
1 files changed, 8 insertions, 1 deletions
diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 66703e3..6fa9a65 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -72,11 +72,14 @@
\newcommand \fscons {\textsc{fscons}}
\newcommand \fsfe {\textsc{fsfe}}
\newcommand \giraff {\texthost{giraff}}
-\newcommand \gnuhost {\textsc{gnu}}
+\newcommand \gnu {\textsc{gnu}}
\newcommand \gnupg {Gnu\textsc{pg}}
\newcommand \gpg {\textsc{gpg}}
\newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)}
\newcommand \harvey {\texthost{harvey}}
+\newcommand \http {\textsc{http}}
+\newcommand \https {\textsc{https}}
+\newcommand \ikiwiki {Ikiwiki}
\newcommand \imap {\textsc{imap}}
\newcommand \ip {\textsc{ip}}
\newcommand \ipred {\textsc{ipred}}
@@ -85,6 +88,7 @@
\newcommand \isplong {\textsc{isp} (\textit{Internet Service Provider})}
\newcommand \ituniv {\textsc{it}-universitetet}
\newcommand \jak {\textsc{jak}}
+\newcommand \jakbanken {\textsc{jak}-banken}
\newcommand \ldap {\textsc{ldap}}
\newcommand \ldapp {\ldap\ (Lightweight Directory Access Protocol)}
\newcommand \luxemburg {\texthost{luxemburg}}
@@ -103,6 +107,7 @@
\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)}
@@ -131,6 +136,8 @@
\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 \xmppp {\xmpp\ (Extensible Messaging and Presence Protocol)}
\newcommand \zetkin {\texthost{zetkin}}
\newcommand \zivette {\texthost{zivette}}