aboutsummaryrefslogtreecommitdiffstats
path: root/preamble
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2018-04-29 22:50:20 +0200
committerGustav Eek <gustav.eek@fripost.org>2018-04-29 22:50:20 +0200
commita18c6ba51352f60d0bf0a8cd8a088b41872cd46c (patch)
tree7bf229ef022ed22c906c1eca5593bb064e3cfaa9 /preamble
parentc00efc3abb3b065104be0055f3e0e0933440980a (diff)
parent92be899e95c3e84947500ec9c558c491f0b83b20 (diff)
Merge branch '2016-04-17-annual' into intgr/2016intgr/2016
Diffstat (limited to 'preamble')
-rw-r--r--preamble/preamble.tex7
1 files changed, 6 insertions, 1 deletions
diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index b5c08f3..2bcb267 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -72,13 +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}}
@@ -89,6 +90,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}}
@@ -108,6 +110,7 @@
\newcommand \ntig {\textsc{nti}-gymnasiet}
\newcommand \ntp {\textsc{ntp}}
\newcommand \ok {\textsc{ok}}
+\newcommand \omx {\textsc{omx}}
\newcommand \ossec {\textsc{ossec}}
\newcommand \otrs {\textsc{otrs}}
\newcommand \otrss {\otrs\ (Open-source Ticket Request System)}
@@ -138,6 +141,8 @@
\newcommand \vpnn {\vpn\ (\textit{Virtual Private Network})}
\newcommand \vps {\textsc{vps}}
\newcommand \vpss {\vps\ (Virtual Private Server)}
+\newcommand \xmpp {\textsc{xmpp}}
+\newcommand \xmppp {\xmpp\ (Extensible Messaging and Presence Protocol)}
\newcommand \xss {\textsc{xss}}
\newcommand \xsss {\xss\ (Cross-site scripting)}
\newcommand \zetkin {\texthost{zetkin}}