diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 21:53:27 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 21:53:27 +0100 |
| commit | 2784a5345920940253a0501041a0b101df952a0b (patch) | |
| tree | a3c06a1e437d791ea9f85cf570b2f13d3c27d25b /preamble | |
| parent | 8c9f57713b34a6a1e9e8a2c67aa17c43e644ad2e (diff) | |
| parent | 1ca554c9240399d7d7d4a56ea6f5d9bd4a839765 (diff) | |
Merge branch 'apr-21' containing minutes from April 21, 2014
Conflicting '2014/Makefile'
Diffstat (limited to 'preamble')
| -rw-r--r-- | preamble/preamble.tex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/preamble/preamble.tex b/preamble/preamble.tex index ed52144..6331238 100644 --- a/preamble/preamble.tex +++ b/preamble/preamble.tex @@ -48,6 +48,7 @@ % Macros, förkortningar \newcommand \acta {\textsc{acta}} +\newcommand \antilop {\texthost{antilop}} \newcommand \benjamin {\texthost{benjamin}} \newcommand \cacert {\textsc{ca}cert} \newcommand \cfengine {\textsc{cf}-engine} @@ -60,6 +61,7 @@ \newcommand \dnssec {\textsc{dnssec}} \newcommand \dnssecc {\dnssec\ (\textit{Domain Name System Security Extensions})} \newcommand \elefant {\texthost{elefant}} +\newcommand \eu {\textsc{eu}} \newcommand \faq {\textsc{faq}} \newcommand \fra {\textsc{fra}} \newcommand \fraa {\textsc{fra} (Försvarets radioanstalt)} @@ -69,6 +71,7 @@ \newcommand \giraff {\texthost{giraff}} \newcommand \gnuhost {\texthost{gnu}} \newcommand \gnu {\textsc{gnu}} +\newcommand \gnuhost {\texthost{gnu}} \newcommand \gnupg {Gnu\textsc{pg}} \newcommand \gpg {\textsc{gpg}} \newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)} @@ -110,6 +113,7 @@ \newcommand \smtp {\textsc{smtp}} \newcommand \ssh {\textsc{ssh}} \newcommand \sso {\textsc{sso}} +\newcommand \ssl {\textsc{ssl}} \newcommand \sun {Sun} \newcommand \sql {\textsc{sql}} \newcommand \srpfyra {\textsc{sr p4}} |