diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:28:29 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-05-07 22:28:29 +0200 |
| commit | 17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (patch) | |
| tree | 08ae173c75430d05d08a56dbe12b209440f1b0e1 /preamble/preamble.tex | |
| parent | c001d764a688a3b4b62fefe551dd2c19e0e17fa9 (diff) | |
| parent | 608a59abb8a6beda80c0509fb8fdd20a7e628b08 (diff) | |
Merge branch 'intgr/2018-board' into 2018-10-22-board
Conflicts:
2018/Makefile
agenda/Makefile
preamble/preamble.tex
resources/board-minutes-template-en.tex
resources/board-minutes-template-sv.tex
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 d3c2df0..89ceaec 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 \fossnorth {\textsc{foss} North} \newcommand \fps {\textsc{fps}} \newcommand \fpss {Friprogramvarusyndikatet (\fps)} @@ -139,6 +141,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}} |