diff options
| author | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
| commit | b4ecf0b886c67437901e0af457c5f801ebde9a72 (patch) | |
| tree | ef66b0684edcfeb4ad68d20375641f4654393f44 /docs/code_style.rst | |
| parent | Include the ts the notif was received at (diff) | |
| parent | Merge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff) | |
| download | synapse-b4ecf0b886c67437901e0af457c5f801ebde9a72.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api
Diffstat (limited to 'docs/code_style.rst')
| -rw-r--r-- | docs/code_style.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/code_style.rst b/docs/code_style.rst index dc40a7ab7b..8d73d17beb 100644 --- a/docs/code_style.rst +++ b/docs/code_style.rst @@ -43,7 +43,10 @@ Basically, PEP8 together, or want to deliberately extend or preserve vertical/horizontal space) -Comments should follow the google code style. This is so that we can generate -documentation with sphinx (http://sphinxcontrib-napoleon.readthedocs.org/en/latest/) +Comments should follow the `google code style <http://google.github.io/styleguide/pyguide.html?showone=Comments#Comments>`_. +This is so that we can generate documentation with +`sphinx <http://sphinxcontrib-napoleon.readthedocs.org/en/latest/>`_. See the +`examples <http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html>`_ +in the sphinx documentation. Code should pass pep8 --max-line-length=100 without any warnings. |