aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-10-12 17:02:51 -0400
committerHubert Chathi <hubert@uhoreg.ca>2018-10-12 17:02:51 -0400
commit5cf074d3372f1e189fe410a075013adefabb1aa5 (patch)
treea72a96fafab69e62b5083cbe1933b4e34e9a72d5 /docs
parentac071d9c0d69e4330a06f171e3bddc713ecd97d6 (diff)
parentaf86a9a8b899eeb3c1c464cb0c54218acd788fa6 (diff)
Merge branch 'master' into poljar
Diffstat (limited to 'docs')
-rw-r--r--docs/olm.rst4
-rw-r--r--docs/signing.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/olm.rst b/docs/olm.rst
index a18662d..9c13478 100644
--- a/docs/olm.rst
+++ b/docs/olm.rst
@@ -72,7 +72,7 @@ info.
Advancing the chain key
~~~~~~~~~~~~~~~~~~~~~~~
-Advancing a chain key takes the previous chain key, :math:`C_{i,j-i}`. The next
+Advancing a chain key takes the previous chain key, :math:`C_{i,j-1}`. The next
chain key, :math:`C_{i,j}`, is the HMAC-SHA-256_ of ``"\x02"`` using the
previous chain key as the key.
@@ -338,7 +338,7 @@ The Olm specification (this document) is hereby placed in the public domain.
Feedback
--------
-Can be sent to mark at matrix.org.
+Can be sent to olm at matrix.org.
Acknowledgements
----------------
diff --git a/docs/signing.rst b/docs/signing.rst
index 7387794..05c55eb 100644
--- a/docs/signing.rst
+++ b/docs/signing.rst
@@ -113,6 +113,6 @@ This document is licensed under the `Apache License, Version 2.0
Feedback
--------
-Questions and feedback can be sent to richard at matrix.org.
+Questions and feedback can be sent to olm at matrix.org.
.. _`Ed25519`: http://ed25519.cr.yp.to/