change doc url

diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 2268808ebe7a3826a4d92325a9b27662f527ed1a..7f1b8c92b2d83438319f23baa4b20804ec89fb47 100755 (executable)
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../../inc/poche/define.inc.php';
 
 # /!\ Be careful if you change the lines below /!\
 if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
-    die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
+    die('Twig does not seem installed. Have a look at <a href="inthepoche.com/doc">the documentation.</a>');
 }
 
 require_once __DIR__ . '/../../inc/poche/User.class.php';

diff --git a/tpl/config.twig b/tpl/config.twig
index e24e58d4150bda665faadceff521712c5a3060a6..7078887677ec6f7553689fc2a0bbb7d7d8188b3e 100644 (file)
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -6,7 +6,7 @@
 {% endblock %}
 {% block content %}
             <h2>{% trans "Poching a link" %}</h2>
-            <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>You can poche a link by several methods: (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
                 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
                 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
@@ -24,8 +24,8 @@
             <h2>{% trans "Updating poche" %}</h2>
             <ul>
                 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
-                <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
-                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
+                <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
+                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
             </ul>
 
             <h2>{% trans "Change your password" %}</h2>
@@ -49,7 +49,7 @@
 
             <h2>{% trans "Import" %}</h2>
             <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
-            <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
+            <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/doc">inthepoche.com</a></p>
             <ul>
                 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ constant('IMPORT_POCKET_FILE')}}" file on your server)</li>
             <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "{{constant('IMPORT_READABILITY_FILE')}}" file on your server)</li>

diff --git a/tpl/error.twig b/tpl/error.twig
index 14c499254419a5a230a495a314a74ac501dcdebd..c829d12bba595b6d519be1cf461ff98d467b3fe8 100644 (file)
--- a/tpl/error.twig
+++ b/tpl/error.twig
@@ -2,5 +2,5 @@
 {% block title %}{% trans "plop" %}{% endblock %}
 {% block content %}
         {{ msg|raw }}
-        <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p>
+        <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p>
 {% endblock %}
\ No newline at end of file

diff --git a/tpl/install.twig b/tpl/install.twig
index afb5b0f6bb1acd4f687ad7022e99509cc0ec2aec..6e85e5cbbc9d856384b8f6a820a2133e75f7f664 100644 (file)
--- a/tpl/install.twig
+++ b/tpl/install.twig
@@ -5,7 +5,7 @@
             <fieldset class="w500p center">
                 <h2 class="mbs txtcenter">{% trans "install your poche" %}</h2>
                 <p>
-                    {% trans "poche is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://inthepoche.com/?pages/Documentation'>read the documentation on poche website</a>." %}
+                    {% trans "poche is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation on poche website</a>." %}
                 </p>
                 <p class="row">
                     <label class="col w150p" for="login">{% trans "Login" %}</label>