From d78d08981a6b4f5fe2e2395050e411d0ceedfbb0 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Sat, 18 Mar 2017 22:47:37 +0000
Subject: [PATCH] log_contexts.rst: fix typos

---
 docs/log_contexts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/log_contexts.rst b/docs/log_contexts.rst
index a5f59745e6..ffe438c614 100644
--- a/docs/log_contexts.rst
+++ b/docs/log_contexts.rst
@@ -331,7 +331,7 @@ gathered:
             result = yield defer.gatherResults([d1, d2])
 
 In this case particularly, though, option two, of using
-``logcontext.preserve.fn`` almost certainly makes more sense, so that
+``logcontext.preserve_fn`` almost certainly makes more sense, so that
 ``operation1`` and ``operation2`` are both logged against the original
 logcontext. This looks like:
 
@@ -355,7 +355,7 @@ follow for any more exotic flows. It's hard not to wonder if we could have done
 something else.
 
 We're not going to rewrite Synapse now, so the following is entirely of
-acadamic interest, but I'd like to record some thoughts on an alternative
+academic interest, but I'd like to record some thoughts on an alternative
 approach.
 
 I briefly prototyped some code following an alternative set of rules. I think
-- 
GitLab