diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:40:32 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:40:32 +0200 |
| commit | 2e5ce0865dc0111623d72c44b2c93459cd7235b0 (patch) | |
| tree | ec325315b86fc3b7e2484e286f6c255a32e82df9 /preamble | |
| parent | c3f5e8b11d786023065fb1f826b5b4040c358756 (diff) | |
| parent | 17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (diff) | |
Merge branch 'intgr/2018-board' into 2018-08-27-board
Conflicts:
2018/Makefile
preamble/preamble.tex
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 84d46ab..25a1304 100644 --- a/preamble/preamble.tex +++ b/preamble/preamble.tex @@ -52,6 +52,7 @@ \newcommand \benjamin {\texthost{benjamin}} \newcommand \bgp {\textsc{bgp}} \newcommand \cacert {\textsc{ca}cert} +\newcommand \calima {\texthost{calima}} \newcommand \cfengine {\textsc{cf}-engine} \newcommand \civett {\texthost{civett}} \newcommand \dfd {\textsc{dfd}} @@ -71,6 +72,7 @@ \newcommand \etcdagens {\textit{Dagens \etc}} \newcommand \eu {\textsc{eu}} \newcommand \faq {\textsc{faq}} +\newcommand \fosdem {\textsc{fosdem}} \newcommand \fossgbg {\textsc{foss-gbg}} \newcommand \fossnorth {\textsc{foss} North} \newcommand \fps {\textsc{fps}} @@ -142,6 +144,8 @@ \newcommand \smart {\textsc{smart}} \newcommand \sms {\textsc{sms}} \newcommand \smtp {\textsc{smtp}} +\newcommand \spf {\textsc{spf}} +\newcommand \spff {\spf\ (\textit{Sender Policy Framework}, ramverk för avsändarpolicy)} \newcommand \ssh {\textsc{ssh}} \newcommand \sso {\textsc{sso}} \newcommand \ssl {\textsc{ssl}} |