diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /docs/en/index.rst | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'docs/en/index.rst')
-rw-r--r-- | docs/en/index.rst | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/en/index.rst b/docs/en/index.rst index 03025ef9..6d85db2b 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst | |||
@@ -17,6 +17,11 @@ The main documentation for this application is organized into a couple sections: | |||
17 | * :ref:`user-docs` | 17 | * :ref:`user-docs` |
18 | * :ref:`dev-docs` | 18 | * :ref:`dev-docs` |
19 | 19 | ||
20 | The documentation is available in other languages: | ||
21 | |||
22 | * `Documentation en français <http://doc.wallabag.org/fr/master/>`_ | ||
23 | * `Deutsch Dokumentation <http://doc.wallabag.org/de/master/>`_ | ||
24 | |||
20 | .. _user-docs: | 25 | .. _user-docs: |
21 | 26 | ||
22 | .. toctree:: | 27 | .. toctree:: |
@@ -25,7 +30,8 @@ The main documentation for this application is organized into a couple sections: | |||
25 | 30 | ||
26 | user/faq | 31 | user/faq |
27 | user/installation | 32 | user/installation |
28 | user/upgrade | 33 | user/upgrade-2.0.x-2.1.1 |
34 | user/upgrade-2.1.x-2.1.y | ||
29 | user/migration | 35 | user/migration |
30 | user/import | 36 | user/import |
31 | user/create_account | 37 | user/create_account |
@@ -35,9 +41,11 @@ The main documentation for this application is organized into a couple sections: | |||
35 | user/errors_during_fetching | 41 | user/errors_during_fetching |
36 | user/annotations | 42 | user/annotations |
37 | user/download_articles | 43 | user/download_articles |
44 | user/share | ||
38 | user/filters | 45 | user/filters |
39 | user/tags | 46 | user/tags |
40 | user/android | 47 | user/android |
48 | user/parameters | ||
41 | 49 | ||
42 | .. _dev-docs: | 50 | .. _dev-docs: |
43 | 51 | ||
@@ -50,3 +58,5 @@ The main documentation for this application is organized into a couple sections: | |||
50 | developer/documentation | 58 | developer/documentation |
51 | developer/translate | 59 | developer/translate |
52 | developer/maintenance | 60 | developer/maintenance |
61 | developer/redis | ||
62 | developer/rabbitmq | ||