Merge remote-tracking branch 'origin/master' into 2.3

2 files changed, 10 insertions, 9 deletions

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 f82e5dc5..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 @@
                     <div id="set2" class="col s12">
                         <dl>
                             <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-                            <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
-                            <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
-                            <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd>
+                            <dd><a href="https://doc.wallabag.org/en/">english</a></dd>
+                            <dd><a href="https://doc.wallabag.org/fr/">français</a></dd>
+                            <dd><a href="https://doc.wallabag.org/de/">deutsch</a></dd>
+                            <dd><a href="https://doc.wallabag.org/it/">italiano</a></dd>
 
                             <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
                             <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
@@ -46,7 +47,7 @@
                     <div id="set3" class="col s12">
                         <dl>
                             <dt>{{ 'about.helping.description'|trans }}</dt>
-                            <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
+                            <dd>{{ 'about.helping.by_contributing'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing_2'|trans }}</a></dd>
                             <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
                         </dl>
                     </div>
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 @@
                                 <div class="card-action">
                                     <ul>
                                         <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/">{{ 'quickstart.more'|trans }}</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -84,9 +84,9 @@
                                 </div>
                                 <div class="card-action">
                                     <ul>
-                                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/user/articles/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/user/articles/download.html">{{ 'quickstart.docs.export'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
                                     </ul>
                                 </div>
                             </div>