1 files changed, 18 insertions, 23 deletions
diff --git a/plugins/wallabag/README.md b/plugins/wallabag/README.md
index 5bc35be1..ea21a519 100644
--- a/plugins/wallabag/README.md
+++ b/plugins/wallabag/README.md
@@ -4,39 +4,34 @@ For each link in your Shaarli, adds a button to save the target page in your [wa
 ### Installation
-Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.  
+Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.
 The directory structure should look like:
-```
+```bash
 └── tpl
    └── plugins
-        └── wallabag
+        └── wallabag
-            ├── README.md
+            ├── README.md
-            ├── config.php.dist
+            ├── wallabag.html
-            ├── wallabag.html
+            ├── wallabag.meta
-            ├── wallabag.php
+            ├── wallabag.php
-            └── wallabag.png
+            ├── wallabag.php
+            └── WallabagInstance.php
 ```
-To enable the plugin, add `'wallabag'` to your list of enabled plugins in `data/options.php` (`PLUGINS` array).
+To enable the plugin, you can either:
-This should look like:
-```
+  * enable it in the plugins administration page (`?do=pluginadmin`). 
-$GLOBALS['config']['PLUGINS'] = array('qrcode', 'any_other_plugin', 'wallabag')
+  * add `wallabag` to your list of enabled plugins in `data/config.json.php` (`general.enabled_plugins` section).
-```
 ### Configuration
-Copy `config.php.dist` into `config.php` and setup your instance.
+Go to the plugin administration page, and edit the following settings (with the plugin enabled).
-*Wallabag instance URL*
+**WALLABAG_URL**: *Wallabag instance URL*
-```
+Example value: `http://v2.wallabag.org`
-$GLOBALS['config']['WALLABAG_URL'] = 'http://v2.wallabag.org' ;
-```
-*Wallabag version*: either `1` (for 1.x) or `2` (for 2.x)
+**WALLABAG_VERSION**: *Wallabag version*
-```
+Value: either `1` (for 1.x) or `2` (for 2.x)
-$GLOBALS['config']['WALLABAG_VERSION'] = 2;
-```
-> Note: these settings can also be set in `data/config.php`.
-\ No newline at end of file
+> Note: these settings can also be set in `data/config.json.php`, in the plugins section.

diff --git a/plugins/wallabag/README.md b/plugins/wallabag/README.md index 5bc35be1..ea21a519 100644 --- a/plugins/wallabag/README.md +++ b/plugins/wallabag/README.md
@@ -4,39 +4,34 @@ For each link in your Shaarli, adds a button to save the target page in your [wa
4		4
5	### Installation	5	### Installation
6		6
7	Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.	7	Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.
8	The directory structure should look like:	8	The directory structure should look like:
9		9
10	```	10	```bash
11	└── tpl	11	└── tpl
12	└── plugins	12	└── plugins
13	└── wallabag	13	└── wallabag
14	├── README.md	14	├── README.md
15	├── config.php.dist	15	├── wallabag.html
16	├── wallabag.html	16	├── wallabag.meta
17	├── wallabag.php	17	├── wallabag.php
18	└── wallabag.png	18	├── wallabag.php
		19	└── WallabagInstance.php
19	```	20	```
20		21
21	To enable the plugin, add `'wallabag'` to your list of enabled plugins in `data/options.php` (`PLUGINS` array).	22	To enable the plugin, you can either:
22	This should look like:
23		23
24	```	24	* enable it in the plugins administration page (`?do=pluginadmin`).
25	$GLOBALS['config']['PLUGINS'] = array('qrcode', 'any_other_plugin', 'wallabag')	25	* add `wallabag` to your list of enabled plugins in `data/config.json.php` (`general.enabled_plugins` section).
26	```
27		26
28	### Configuration	27	### Configuration
29		28
30	Copy `config.php.dist` into `config.php` and setup your instance.	29	Go to the plugin administration page, and edit the following settings (with the plugin enabled).
31		30
32	Wallabag instance URL	31	WALLABAG_URL: Wallabag instance URL
33	```	32	Example value: `http://v2.wallabag.org`
34	$GLOBALS['config']['WALLABAG_URL'] = 'http://v2.wallabag.org' ;
35	```
36		33
37	Wallabag version: either `1` (for 1.x) or `2` (for 2.x)	34	WALLABAG_VERSION: Wallabag version
38	```	35	Value: either `1` (for 1.x) or `2` (for 2.x)
39	$GLOBALS['config']['WALLABAG_VERSION'] = 2;
40	```
41		36
42	> Note: these settings can also be set in `data/config.php`. \ No newline at end of file	37	> Note: these settings can also be set in `data/config.json.php`, in the plugins section.