summary refs log tree commit diff
path: root/docs/code_style.md
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-12-19 11:11:14 +0000
committerGitHub <noreply@github.com>2019-12-19 11:11:14 +0000
commitb95b762560441b28f06e6458da796327e394953e (patch)
treebfb47790bd2efa34bf85b2cb543d536b8894d900 /docs/code_style.md
parentClean up startup for the pusher (#6558) (diff)
downloadsynapse-b95b762560441b28f06e6458da796327e394953e.tar.xz
Add an export_signing_key script (#6546)
I want to do some key rotation, and it is silly that we don't have a way to do
this.
Diffstat (limited to 'docs/code_style.md')
-rw-r--r--docs/code_style.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/code_style.md b/docs/code_style.md
index f983f72d6c..71aecd41f7 100644
--- a/docs/code_style.md
+++ b/docs/code_style.md
@@ -137,6 +137,7 @@ Some guidelines follow:
     correctly handles the top-level option being set to `None` (as it
     will be if no sub-options are enabled).
 -   Lines should be wrapped at 80 characters.
+-   Use two-space indents.
 
 Example:
 
@@ -155,13 +156,13 @@ Example:
     # Settings for the frobber
     #
     frobber:
-       # frobbing speed. Defaults to 1.
-       #
-       #speed: 10
+      # frobbing speed. Defaults to 1.
+      #
+      #speed: 10
 
-       # frobbing distance. Defaults to 1000.
-       #
-       #distance: 100
+      # frobbing distance. Defaults to 1000.
+      #
+      #distance: 100
 
 Note that the sample configuration is generated from the synapse code
 and is maintained by a script, `scripts-dev/generate_sample_config`.