aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-10 15:46:05 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-10 15:46:05 +0200
commitd11e2bcf48badc1da0e3914eec49d9ab1d781f4d (patch)
treedab94ba3e760671710f2e86205f458b474bf8767
parent3c33e40b614db7d14fec1d9b87963def4fac46a5 (diff)
downloadwallabag-d11e2bcf48badc1da0e3914eec49d9ab1d781f4d.tar.gz
wallabag-d11e2bcf48badc1da0e3914eec49d9ab1d781f4d.tar.zst
wallabag-d11e2bcf48badc1da0e3914eec49d9ab1d781f4d.zip
change doc url
-rwxr-xr-xinc/poche/config.inc.php2
-rw-r--r--tpl/config.twig8
-rw-r--r--tpl/error.twig2
-rw-r--r--tpl/install.twig2
4 files changed, 7 insertions, 7 deletions
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 2268808e..7f1b8c92 100755
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../../inc/poche/define.inc.php';
12 12
13# /!\ Be careful if you change the lines below /!\ 13# /!\ Be careful if you change the lines below /!\
14if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) { 14if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
15 die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>'); 15 die('Twig does not seem installed. Have a look at <a href="inthepoche.com/doc">the documentation.</a>');
16} 16}
17 17
18require_once __DIR__ . '/../../inc/poche/User.class.php'; 18require_once __DIR__ . '/../../inc/poche/User.class.php';
diff --git a/tpl/config.twig b/tpl/config.twig
index e24e58d4..70788876 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -6,7 +6,7 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Poching a link" %}</h2> 8 <h2>{% trans "Poching a link" %}</h2>
9 <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>You can poche a link by several methods: (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li> 11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
12 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li> 12 <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 @@
24 <h2>{% trans "Updating poche" %}</h2> 24 <h2>{% trans "Updating poche" %}</h2>
25 <ul> 25 <ul>
26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li> 26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
27 <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> 27 <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>
28 {% 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 %} 28 {% 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 %}
29 </ul> 29 </ul>
30 30
31 <h2>{% trans "Change your password" %}</h2> 31 <h2>{% trans "Change your password" %}</h2>
@@ -49,7 +49,7 @@
49 49
50 <h2>{% trans "Import" %}</h2> 50 <h2>{% trans "Import" %}</h2>
51 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 51 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
52 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p> 52 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/doc">inthepoche.com</a></p>
53 <ul> 53 <ul>
54 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ constant('IMPORT_POCKET_FILE')}}" file on your server)</li> 54 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ constant('IMPORT_POCKET_FILE')}}" file on your server)</li>
55 <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "{{constant('IMPORT_READABILITY_FILE')}}" file on your server)</li> 55 <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 14c49925..c829d12b 100644
--- a/tpl/error.twig
+++ b/tpl/error.twig
@@ -2,5 +2,5 @@
2{% block title %}{% trans "plop" %}{% endblock %} 2{% block title %}{% trans "plop" %}{% endblock %}
3{% block content %} 3{% block content %}
4 {{ msg|raw }} 4 {{ msg|raw }}
5 <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p> 5 <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p>
6{% endblock %} \ No newline at end of file 6{% endblock %} \ No newline at end of file
diff --git a/tpl/install.twig b/tpl/install.twig
index afb5b0f6..6e85e5cb 100644
--- a/tpl/install.twig
+++ b/tpl/install.twig
@@ -5,7 +5,7 @@
5 <fieldset class="w500p center"> 5 <fieldset class="w500p center">
6 <h2 class="mbs txtcenter">{% trans "install your poche" %}</h2> 6 <h2 class="mbs txtcenter">{% trans "install your poche" %}</h2>
7 <p> 7 <p>
8 {% 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>." %} 8 {% 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>." %}
9 </p> 9 </p>
10 <p class="row"> 10 <p class="row">
11 <label class="col w150p" for="login">{% trans "Login" %}</label> 11 <label class="col w150p" for="login">{% trans "Login" %}</label>