diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-05-17 10:40:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 10:40:35 +0200 |
| commit | afc9875f28e3ef3edd4b42808eeb4368d4adf4e7 (patch) | |
| tree | bf528a978f8c4ef4cef095cb5b5f7a6417530c14 /src/Wallabag | |
| parent | 4e88a6a65138d2e46d74ff346bf0626ee791b009 (diff) | |
| parent | 6b94ee51b85b0244ea5f2b10754c012629def219 (diff) | |
| download | wallabag-afc9875f28e3ef3edd4b42808eeb4368d4adf4e7.tar.gz wallabag-afc9875f28e3ef3edd4b42808eeb4368d4adf4e7.tar.zst wallabag-afc9875f28e3ef3edd4b42808eeb4368d4adf4e7.zip | |
Merge pull request #3117 from wallabag/fix-doc
Fixed documentation URL
Diffstat (limited to 'src/Wallabag')
3 files changed, 10 insertions, 9 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig index 3430c0d4..b3f0affb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | <ul> | 15 | <ul> |
| 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> |
| 17 | <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> | 17 | <li><a href="https://doc.wallabag.org/en/developer/api/readme.html">{{ 'developer.full_documentation'|trans }}</a></li> |
| 18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | 18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> |
| 19 | </ul> | 19 | </ul> |
| 20 | 20 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig index dae7adae..1cd3485c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |||
| @@ -34,9 +34,10 @@ | |||
| 34 | <div id="set2" class="col s12"> | 34 | <div id="set2" class="col s12"> |
| 35 | <dl> | 35 | <dl> |
| 36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | 36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> |
| 37 | <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> | 37 | <dd><a href="https://doc.wallabag.org/en/">english</a></dd> |
| 38 | <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> | 38 | <dd><a href="https://doc.wallabag.org/fr/">français</a></dd> |
| 39 | <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd> | 39 | <dd><a href="https://doc.wallabag.org/de/">deutsch</a></dd> |
| 40 | <dd><a href="https://doc.wallabag.org/it/">italiano</a></dd> | ||
| 40 | 41 | ||
| 41 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | 42 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> |
| 42 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | 43 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index b7a48551..4580813c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
| @@ -69,8 +69,8 @@ | |||
| 69 | <div class="card-action"> | 69 | <div class="card-action"> |
| 70 | <ul> | 70 | <ul> |
| 71 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | 71 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> |
| 72 | <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li> | 72 | <li><a href="https://doc.wallabag.org/en/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li> |
| 73 | <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li> | 73 | <li><a href="https://doc.wallabag.org/">{{ 'quickstart.more'|trans }}</a></li> |
| 74 | </ul> | 74 | </ul> |
| 75 | </div> | 75 | </div> |
| 76 | </div> | 76 | </div> |
| @@ -84,9 +84,9 @@ | |||
| 84 | </div> | 84 | </div> |
| 85 | <div class="card-action"> | 85 | <div class="card-action"> |
| 86 | <ul> | 86 | <ul> |
| 87 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | 87 | <li><a href="https://doc.wallabag.org/en/user/articles/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> |
| 88 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | 88 | <li><a href="https://doc.wallabag.org/en/user/articles/download.html">{{ 'quickstart.docs.export'|trans }}</a></li> |
| 89 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | 89 | <li><a href="https://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> |
| 90 | </ul> | 90 | </ul> |
| 91 | </div> | 91 | </div> |
| 92 | </div> | 92 | </div> |