diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:57:40 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:57:40 +0200 |
| commit | 2e45e78e3b748deed03ceec43d6769532f08cd78 (patch) | |
| tree | 71fac120a34a1c5c68af16d26d7b86d0acffb7ba /preamble/preamble.tex | |
| parent | d72e5a93d36726d3ddb026f6c71b82f5d89c3e05 (diff) | |
| parent | 2e5ce0865dc0111623d72c44b2c93459cd7235b0 (diff) | |
Merge branch 'intgr/2018-board' into 2018-05-28-board
Conflicts:
2018/Makefile
Diffstat (limited to 'preamble/preamble.tex')
| -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 a6ed1c2..d8f0c7a 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}} @@ -144,6 +146,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}} |