diff options
author | Lorenz Diener <[email protected]> | 2019-07-23 12:08:21 +0200 |
---|---|---|
committer | Lorenz Diener <[email protected]> | 2019-07-23 12:08:21 +0200 |
commit | 5b3c1c6582389899108fac7b3e88e8584edc73bc (patch) | |
tree | 7a8c84b05f0696494ac45b228d61fb7fba4d88d2 /docs | |
parent | 588a157050bb128caecd5e2bd9c11d05d30a055f (diff) | |
download | mastodon.py-5b3c1c6582389899108fac7b3e88e8584edc73bc.tar.gz |
Doc fixes, remove some broken code, note about blocks
Diffstat (limited to 'docs')
-rw-r--r-- | docs/conf.py | 2 | ||||
-rw-r--r-- | docs/index.rst | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index d957bf3..2705ce6 100644 --- a/docs/conf.py +++ b/docs/conf.py | |||
@@ -68,7 +68,7 @@ author = u'Lorenz Diener' | |||
68 | # The short X.Y version. | 68 | # The short X.Y version. |
69 | version = u'1.4' | 69 | version = u'1.4' |
70 | # The full version, including alpha/beta/rc tags. | 70 | # The full version, including alpha/beta/rc tags. |
71 | release = u'1.4.5' | 71 | release = u'1.4.6' |
72 | 72 | ||
73 | # The language for content autogenerated by Sphinx. Refer to documentation | 73 | # The language for content autogenerated by Sphinx. Refer to documentation |
74 | # for a list of supported languages. | 74 | # for a list of supported languages. |
diff --git a/docs/index.rst b/docs/index.rst index 3ce98de..399927c 100644 --- a/docs/index.rst +++ b/docs/index.rst | |||
@@ -208,6 +208,11 @@ to server misconfiguration. | |||
208 | 208 | ||
209 | `MastodonVersionError` is raised when a version check for an API call fails. | 209 | `MastodonVersionError` is raised when a version check for an API call fails. |
210 | 210 | ||
211 | A brief note on block lists | ||
212 | --------------------------- | ||
213 | The default distribution of Mastodon.py prevents you from logging in to instances on a very short list of domains. The purpose of this is to disassociate the developers of Mastodon.py from these instances and to disavow the ideology of violence that they represent. You could, of course, take that part out - Mastodon.py is free software, and you have the right to modify it to suit your needs. | ||
214 | |||
215 | While you take the extra step of removing the code, please take a moment to consider why reasonable people whose work you build and depend on every day thought it was necessary to put it in to begin with. | ||
211 | 216 | ||
212 | Return values | 217 | Return values |
213 | ------------- | 218 | ------------- |
@@ -232,7 +237,6 @@ you can also just write | |||
232 | and everything will work as intended. The class used for this is exposed as | 237 | and everything will work as intended. The class used for this is exposed as |
233 | `AttribAccessDict`. | 238 | `AttribAccessDict`. |
234 | 239 | ||
235 | |||
236 | User dicts | 240 | User dicts |
237 | ~~~~~~~~~~ | 241 | ~~~~~~~~~~ |
238 | .. _user dict: | 242 | .. _user dict: |