add glossary

autocrypt · Dec 22, 2016 · ac3eed5 · ac3eed5
1 parent 6448d93
commit ac3eed5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/doc/glossary.rst b/doc/glossary.rst
@@ -0,0 +1,20 @@
+Glossary
+========
+
+MUA
+        Mail User Agent.
+        Any program/client/app that handles emails for the end user.
+
+MUAA
+        Mail User Agent Account.
+        The data/state a mail user agent holds for a specific account.
+        When synchonizing autocrypt data, we have to synchonize MUAA data
+        (data held by different MUAs for the same account).
+        See :doc:`peering`
+
+SMA
+        Shared MUAA Messaging Archive.
+        See :doc:`peering`
+
+
+
diff --git a/doc/index.rst b/doc/index.rst
@@ -52,6 +52,8 @@ and privacy enthusiasts.
 
 :doc:`faq`
 
+:doc:`glossary`
+
 .. _`contact channels`:
 
 Channels