From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 19 Apr 2016 18:25:36 +0000 (+0200)
Subject: Merge pull request #1954 from wallabag/update-links-doc
X-Git-Tag: 2.0.2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f88530de68ca11fbfcac4c703576e10f1a981694;hp=24f65a838c647faf5f4a860642b841bfd159a5db;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1954 from wallabag/update-links-doc

Update links in documentation
---

diff --git a/app/config/capistrano/deploy/staging.rb b/app/config/capistrano/deploy/staging.rb
index ccd05b4d..ad899a85 100644
--- a/app/config/capistrano/deploy/staging.rb
+++ b/app/config/capistrano/deploy/staging.rb
@@ -1,2 +1,2 @@
-set :branch, 'v2'
+set :branch, 'master'
 set :deploy_to, '/var/www/v2.wallabag.org/web/'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
index 67696a7b..001c5cbb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
@@ -14,7 +14,7 @@
 
                 <ul>
                     <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/v2/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
+                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
                     <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
                 </ul>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
index 0b54556a..404d2857 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
@@ -25,8 +25,8 @@
 
     <dl>
         <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-        <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
-        <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>
+        <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>
 
         <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
         <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
index 5f65ce15..b3d3d5a0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
@@ -48,10 +48,10 @@
 
     <h4>{{ 'quickstart.docs.title'|trans }}</h4>
     <ul>
-        <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
+        <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/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
+        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
         <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
     </ul>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
index 67696a7b..001c5cbb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
@@ -14,7 +14,7 @@
 
                 <ul>
                     <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/v2/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
+                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
                     <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
                 </ul>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index f77f092e..d0b94279 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
@@ -34,8 +34,8 @@
                     <div id="set2" class="col s12">
                         <dl>
                             <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-                            <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
-                            <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>
+                            <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>
 
                             <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
                             <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
index 706c4a79..59dd037b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
@@ -53,10 +53,10 @@
 
                     <h4>{{ 'quickstart.docs.title'|trans }}</h4>
                     <ul>
-                        <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
+                        <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/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
+                        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
                         <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
                     </ul>