diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
| commit | fe12842374a257c03c7210ae9fddfdafe5cb79d7 (patch) | |
| tree | 5c9062e62c8cec3b4052fc5544d8d3af975fbe74 /preamble | |
| parent | 6fab3cb421b68d419193490a6bcc122290866013 (diff) | |
| parent | 22eec5d6ac3b064d43f7ffba05eb0b5819532a4f (diff) | |
Merge branch 'annual-mar-29', minutes from annual meeting 2014
Conflicting '2014/Makefile' was resolved
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 d2295ba..55c4baa 100644 --- a/preamble/preamble.tex +++ b/preamble/preamble.tex @@ -61,6 +61,8 @@ \newcommand \dnssecc {\dnssec\ (\textit{Domain Name System Security Extensions})} \newcommand \elefant {\texthost{elefant}} \newcommand \faq {\textsc{faq}} +\newcommand \fra {\textsc{fra}} +\newcommand \fraa {\textsc{fra} (Försvarets radioanstalt)} \newcommand \fripost {\textsf{\textsc{\small Fripost}}} \newcommand \fscons {\textsc{fscons}} \newcommand \fsfe {\textsc{fsfe}} @@ -88,6 +90,8 @@ \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 \nti {\textsc{nti}} \newcommand \ntig {\textsc{nti}-gymnasiet} \newcommand \ok {\textsc{ok}} |