Merge pull request #1945 from ddeimeke/master

Added some curl examples

diff --git a/app/config/capistrano/deploy/staging.rb b/app/config/capistrano/deploy/staging.rb
index ccd05b4d99b67bf758e372c771cb2f84d849982b..ad899a850864c13796f3dec30e2101b595c7f9e7 100644 (file)
--- 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/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index 39478fd506fa886e98098f347ce6b160a2dec257..f1a12adfe323eb8634d89b975c562449f1bd5ea4 100644 (file)
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -12,15 +12,15 @@ Translation files
     As wallabag is mainly developed by a French team, please consider that french
     translation is the most updated one and please copy it to create your own translation.
 
-You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
+You can find translation files here: https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
 You have to create ``messages.CODE.yml``, where CODE
 is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
 
 Other files to translate:
 
-- https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations.
-- https://github.com/wallabag/wallabag/tree/v2/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
 
 You have to create ``THE_TRANSLATION_FILE.CODE.yml`` files.
 
@@ -28,7 +28,7 @@ Configuration file
 ~~~~~~~~~~~~~~~~~~
 
 You have to edit `app/config/config.yml
-<https://github.com/wallabag/wallabag/blob/v2/app/config/config.yml>`__ to display
+<https://github.com/wallabag/wallabag/blob/master/app/config/config.yml>`__ to display
 your language on Configuration page of wallabag (to allow users to switch to this new translation).
 
 Under the ``wallabag_core.languages`` section, you have to add a new line with
@@ -55,6 +55,6 @@ wallabag documentation
 
     Contrary to the web application, the main language for documentation is english.
 
-Documentation files are stored here: https://github.com/wallabag/wallabag/tree/v2/docs
+Documentation files are stored here: https://github.com/wallabag/wallabag/tree/master/docs
 
 You need to respect the ``en`` folder structure when you create your own translation.

diff --git a/docs/fr/developer/translate.rst b/docs/fr/developer/translate.rst
index 410aafe62f9000f2753c41ab251f486efd8fdc05..cc5336ee3386d9e4c255a1171ff8cf3a2dfbc4a9 100644 (file)
--- a/docs/fr/developer/translate.rst
+++ b/docs/fr/developer/translate.rst
@@ -13,15 +13,15 @@ Fichiers de traductions
     cette traduction qui est considérée comme la plus récente. Merci de vous baser
     sur celle-ci pour créer votre traduction.
 
-Les principaux fichiers de traduction se trouvent ici : https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
+Les principaux fichiers de traduction se trouvent ici : https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
 Vous devez créer le fichier ``messages.CODE.yml``,
 où CODE est le code ISO 639-1 de votre langue (`cf wikipedia <https://fr.wikipedia.org/wiki/Liste_des_codes_ISO_639-1>`__).
 
 Autres fichiers à traduire :
 
-- https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations.
-- https://github.com/wallabag/wallabag/tree/v2/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
 
 Vous devez créer les fichiers ``LE_FICHIER_DE_TRADUCTION.CODE.yml``.
 
@@ -29,7 +29,7 @@ Fichier de configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Vous devez éditer `app/config/config.yml
-<https://github.com/wallabag/wallabag/blob/v2/app/config/config.yml>`__ pour
+<https://github.com/wallabag/wallabag/blob/master/app/config/config.yml>`__ pour
 afficher votre langue dans la page Configuration de wallabag (pour permettre aux
 utilisateurs de choisir cette nouvelle traduction).
 
@@ -57,6 +57,6 @@ Documentation de wallabag
 
     Contrairement à l'application, la langue principale de la documentation est l'anglais
 
-Les fichiers de documentation se trouvent ici : https://github.com/wallabag/wallabag/tree/v2/docs
+Les fichiers de documentation se trouvent ici : https://github.com/wallabag/wallabag/tree/master/docs
 
 Vous devez respecter la structure du dossier ``en`` quand vous crééz votre traduction.

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 67696a7b198d2b5595d1a5cfd939d9a2588cf700..001c5cbbc7c1768632c887caa583a54bb063e110 100644 (file)
--- 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 0b54556a46348172f36a33ba8e40c4532239e00c..404d28578d257f28145cb735f82f64a9261b6f8a 100644 (file)
--- 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 5f65ce151d53dcb2e0700eb6278a07a09d48f361..b3d3d5a08cb7305ad656744781292cda3237a5fc 100644 (file)
--- 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 67696a7b198d2b5595d1a5cfd939d9a2588cf700..001c5cbbc7c1768632c887caa583a54bb063e110 100644 (file)
--- 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 f77f092ee2be10757c1dd3519970029ac8e50d08..d0b94279569cd0e67303f61be8a02a8976316385 100644 (file)
--- 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 706c4a7926422c128e82f48db7143682e4ca8b33..59dd037b85bcbe85009d4957633506683dc9f45c 100644 (file)
--- 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>