Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor

Conflicts:
	setup.py

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/code_style.rst b/docs/code_style.rst

index 6e53f3eb09..dc40a7ab7b 100644
--- a/docs/code_style.rst
+++ b/docs/code_style.rst
@@ -22,17 +22,17 @@ Basically, PEP8
   depending on the size and shape of the arguments and what makes more sense to
   the author. In other words, both this::
 
-    print("I am a fish %s", "moo")
+    print("I am a fish %s" % "moo")
 
   and this::
 
-    print("I am a fish %s",
+    print("I am a fish %s" %
           "moo")
 
   and this::
 
     print(
-        "I am a fish %s",
+        "I am a fish %s" %
         "moo"
     )