Merge pull request #1493 from wallabag/v2-pocket-import

v2 – 1st draft for Pocket import via API & Wallabag v1 import

.editorconfig

@@ -0,0 +1,10 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -1,6 +1,38 @@
-assets/*
-cache/*
-vendor
-composer.phar
-db/poche.sqlite
-inc/poche/config.inc.php
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Cache and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# Build
+/app/build
+/build
+
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/assets/*
+data/db/wallabag*.sqlite

.scrutinizer.yml

@@ -0,0 +1,27 @@
+filter:
+    paths:
+        - src/*
+    excluded_paths:
+        - 'vendor/*'
+        - 'app/*'
+        - 'web/*'
+        - 'src/Wallabag/*Bundle/Tests/*'
+        - '*Test.php'
+
+tools:
+    php_cs_fixer: true
+    php_analyzer: true
+    php_mess_detector: true
+    php_changetracking: true
+    php_code_sniffer: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
+    #external_code_coverage:
+    #    timeout: 3600
+    php_code_coverage: true
+    php_sim: false
+    php_cpd: false
+
+checks:
+    php:
+        code_rating: true

.travis.yml

@@ -0,0 +1,59 @@
+language: php
+
+# faster builds on docker-container setup
+sudo: false
+
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
+# cache vendor dirs
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+
+env:
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
+
+matrix:
+    fast_finish: true
+    exclude:
+        - php: hhvm
+          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
+    allow_failures:
+        - php: hhvm
+
+branches:
+    only:
+        - v2
+
+before_script:
+    - composer self-update
+    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+    # disable xdebug since we don't use code-coverage for now
+    - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
+    # build coverage only on one build, to speed up results feedbacks
+    # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
+
+script:
+    - ant prepare-$DB
+    - SYMFONY_DEPRECATIONS_HELPER=weak bin/phpunit -v
+
+# after_script:
+    # - |
+        # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
+            # wget https://scrutinizer-ci.com/ocular.phar
+            # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+        # fi

CONTRIBUTING.md

@@ -1,11 +1,30 @@
-# How contributing
+# How to contribute
 
 ## You found a bug
 Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 
 To fix the bug quickly, we need some infos:
-* your wallabag version (in ./index.php)
+* your wallabag version (on top of the ./index.php file, and also on config page)
+* your webserver installation :
+  * type of hosting (shared or dedicated)
+  * in case of a dedicated server, the server and OS used
+  * the php version used, eventually `phpinfo()`
+* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
+* any problem on the `wallabag_compatibility_test.php` page
+* any particular details which could be related
+
+
+If relevant :
 * the link you want to save and which causes problem
+* the file you want to import into wallabag, or just an extract
+
+If you have the skills :
+* enable DEBUG mode and look the output at cache/log.txt
+* look for errors into php and server logs
+
+Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 
 ## You want to fix a bug or to add a feature
-Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
+Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
+
+[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

COPYING.md

@@ -1,14 +1,19 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
+Copyright (c) 2013-2015 Nicolas Lœuillet
 
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
 
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

CREDITS.md

@@ -1,15 +1,6 @@
-wallabag is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* Encoding https://github.com/neitanod/forceutf8
-* logo by Maylis Agniel https://github.com/wallabag/logo
-* icons http://icomoon.io
-* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
-* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-* Twig http://twig.sensiolabs.org
-* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
-* Pagination https://github.com/daveismyname/pagination
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
 
-wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
+Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
 
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
+).

Capfile

@@ -0,0 +1,29 @@
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+require 'capistrano/symfony'
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+# require 'capistrano/rvm'
+# require 'capistrano/rbenv'
+# require 'capistrano/chruby'
+# require 'capistrano/bundler'
+# require 'capistrano/rails/assets'
+# require 'capistrano/rails/migrations'
+# require 'capistrano/passenger'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

GUIDELINES.md

@@ -0,0 +1,53 @@
+# Guidelines for wallabag
+
+If you want to contribute to wallabag, you have some rules to respect. These rules were defined by [PHP Framework Interop Group](http://www.php-fig.org).
+
+## Basic Coding Standard (PSR-1)
+
+This section of the standard comprises what should be considered the standard coding elements that are required to ensure a high level of technical interoperability between shared PHP code.
+
+* Files MUST use only `<?php` and `<?=` tags.
+
+* Files MUST use only UTF-8 without BOM for PHP code.
+
+* Files SHOULD either declare symbols (classes, functions, constants, etc.) or cause side-effects (e.g. generate output, change .ini settings, etc.) but SHOULD NOT do both.
+
+* Namespaces and classes MUST follow [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md).
+
+* Class names MUST be declared in `StudlyCaps`.
+
+* Class constants MUST be declared in all upper case with underscore separators.
+
+* Method names MUST be declared in `camelCase`.
+
+You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-1/).
+
+## Coding Style Guide (PSR-2)
+
+This guide extends and expands on PSR-1, the basic coding standard.
+
+The intent of this guide is to reduce cognitive friction when scanning code from different authors. It does so by enumerating a shared set of rules and expectations about how to format PHP code.
+
+The style rules herein are derived from commonalities among the various member projects. When various authors collaborate across multiple projects, it helps to have one set of guidelines to be used among all those projects. Thus, the benefit of this guide is not in the rules themselves, but in the sharing of those rules.
+
+* Code MUST follow PSR-1.
+
+* Code MUST use 4 spaces for indenting, not tabs.
+
+* There MUST NOT be a hard limit on line length; the soft limit MUST be 120 characters; lines SHOULD be 80 characters or less.
+
+* There MUST be one blank line after the `namespace` declaration, and there MUST be one blank line after the block of `use` declarations.
+
+* Opening braces for classes MUST go on the next line, and closing braces MUST go on the next line after the body.
+
+* Opening braces for methods MUST go on the next line, and closing braces MUST go on the next line after the body.
+
+* Visibility MUST be declared on all properties and methods; `abstract` and `final` MUST be declared before the visibility; `static` MUST be declared after the visibility.
+
+* Control structure keywords MUST have one space after them; method and function calls MUST NOT.
+
+* Opening braces for control structures MUST go on the same line, and closing braces MUST go on the next line after the body.
+
+* Opening parentheses for control structures MUST NOT have a space after them, and closing parentheses for control structures MUST NOT have a space before.
+
+You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-2/).

Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'capistrano',  '~> 3.1'
+gem 'capistrano-symfony', '~> 0.1', :github => 'capistrano/symfony'
+gem 'capistrano-composer', '~> 0.0.3'

Gemfile.lock

@@ -0,0 +1,41 @@
+GIT
+  remote: git://github.com/capistrano/symfony.git
+  revision: ca56a01b817097d2831400ef9b1867fc8e07dcf8
+  specs:
+    capistrano-symfony (0.4.0)
+      capistrano (~> 3.1)
+      capistrano-composer (~> 0.0.3)
+      capistrano-file-permissions (~> 0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    capistrano-composer (0.0.6)
+      capistrano (>= 3.0.0.pre)
+    capistrano-file-permissions (0.1.1)
+      capistrano (~> 3.1)
+    colorize (0.7.7)
+    i18n (0.7.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    rake (10.4.2)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano (~> 3.1)
+  capistrano-composer (~> 0.0.3)
+  capistrano-symfony (~> 0.1)!
+
+BUNDLED WITH
+   1.10.6

README.md

@@ -1,10 +1,26 @@
-# what is wallabag ?
-wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
+[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
+[![Code Coverage](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/coverage.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+
+# What is wallabag ?
+wallabag is a self hostable application allowing you to not miss any content anymore.
+Click, save, read it when you can. It extracts content so that you can read it when you have time.
 
 More informations on our website: [wallabag.org](http://wallabag.org)
 
+# Want to test the v2 ?
+
+Keep in mind it's an **instable** branch, everything can be broken :)
+
+```
+git clone https://github.com/wallabag/wallabag.git -b v2
+cd wallabag
+composer install
+php app/console wallabag:install
+php app/console server:run
+```
+
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
-terms of the Do What The Fuck You Want To Public License, Version 2,
-as published by Sam Hocevar. See the COPYING file for more details.
+terms of the MIT License. See the COPYING file for more details.

TRANSLATION.md

@@ -0,0 +1,67 @@
+# How to manage translations for wallabag
+
+This guide will describe the procedure of translation management of the wallabag web application.
+
+All translations are made using [gettext](http://en.wikipedia.org/wiki/Gettext) system and tools. 
+
+You will need the [Poedit](http://www.poedit.net/download.php) editor to update, edit and create your translation files easily. However, you can also handle translations also without it: all can be done using gettext tools and your favorite plain text editor only. This guide, however, describes editing with Poedit. If you want to use gettext only, please refer to the xgettext manual page to update po files from sources (see also how it is used by Poedit below) and use msgunfmt tool to compile .mo files manually.  
+
+You need to know, that translation phrases are stored in **".po"** files (for example: `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po`), which are then complied in **".mo"** files using **msgfmt** gettext tool or by Poedit, which will run msgfmt for you in background. 
+
+**It's assumed, that you have wallabag installed locally on your computer or on the server you have access to.**
+
+## To change existing translation you will need to do:
+
+### 1. Clear cache
+You can do this using **http://your-wallabag-host.com/?empty-cache** link (replace http://your-wallabag-host.com/ with real url of your wallabag application)
+
+OR
+
+from command line:
+go to root of your installation of wallabag project and run next command:
+
+`rm -rf ./cache/*`
+
+(this may require root privileges if you run, for example Apache web server with mod_php)
+
+### 2. Generate php files from all twig templates
+Do this using next command:
+
+`php ./locale/tools/fillCache.php`
+
+OR
+
+from your browser: **http://your-wallabag-host.com/locale/tools/fillCache.php** (this may require removal of .htaccess file in locale/ directory).
+
+### 3. Configure your Poedit
+Open Poedit editor, open Edit->Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like
+
+`xgettext --no-location --force-po -o %o %C %K %F`
+
+Usually it is required to add "--no-location" to default value. 
+
+### 4. Open .po file you want to edit in Poedit and change its settings
+Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit.
+
+Go to "Catalog"->"Settings..." menu. Then go to "Path" tab and add path to wallabag installation in your local file system. This step can't be omitted as you will not be able to update phrases otherwise.
+
+You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation).
+
+### 5. Update opened .po file from sources
+Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu.
+
+As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Please review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors).
+
+### 6. Translate and save your .po file
+If you have any difficulties on this step, please consult with Poedit manual.
+Every time you save your .po file, Poedit will also compile appropriate .mo file by default (of course, if not disabled in preferences).
+
+You are now almost done.
+
+### 7. Clear cache again
+This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi).
+
+
+##To create new translation
+You just have to copy the folder corresponding to the language you want to translate from, change language in the project settings and for the folder and files names. Then start replacing all existing translations with your own.
+

Vagrantfile

@@ -0,0 +1,71 @@
+
+$script_sqlite = <<SCRIPT
+apt-get update
+apt-get install -y apache2 php5 php5-sqlite php5-xdebug
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+$script_mysql = <<SCRIPT
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y apache2 php5 php5-mysql php5-xdebug mysql-server mysql-client
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+service mysql restart
+echo "create database wallabag;" | mysql -u root
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+$script_postgres = <<SCRIPT
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y apache2 php5 php5-pgsql php5-xdebug postgresql postgresql-contrib
+apt-get clean -y
+echo "ServerName localhost" >> /etc/apache2/apache2.conf
+service apache2 restart
+service postgresql restart
+rm -f /var/www/html/index.html
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+Vagrant.configure("2") do |config|
+
+  config.vm.define "sqlite" do |m|
+    m.vm.box = "ubuntu/trusty64"
+    m.vm.provision "shell", inline: $script_sqlite
+    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+  end
+
+  config.vm.define "mysql" do |m|
+    m.vm.box = "ubuntu/trusty64"
+    m.vm.provision "shell", inline: $script_mysql
+    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+  end
+
+  config.vm.define "postgres" do |m|
+    m.vm.box = "ubuntu/trusty64"
+    m.vm.provision "shell", inline: $script_postgres
+    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
+  end
+
+  config.vm.define "debian7" do |m|
+    m.vm.box = "chef/debian-7.6"
+    m.vm.provision "shell", inline: $script_sqlite
+    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+  end
+
+  config.vm.define "debian6" do |m|
+    m.vm.box = "chef/debian-6.0.10"
+    m.vm.provision "shell", inline: $script_sqlite
+    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+  end
+
+  config.vm.network :forwarded_port, guest: 80, host: 8003
+  #config.vm.network "public_network", :bridge => "en0: Wi-Fi (AirPort)"
+end

app/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>

app/AppCache.php

@@ -0,0 +1,9 @@
+<?php
+
+require_once __DIR__.'/AppKernel.php';
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
+{
+}

app/AppKernel.php

@@ -0,0 +1,52 @@
+<?php
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = array(
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Liip\ThemeBundle\LiipThemeBundle(),
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+        );
+
+        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
+            $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
+            $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+            $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+        }
+
+        return $bundles;
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+    }
+}

app/SymfonyRequirements.php

@@ -0,0 +1,764 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Users of PHP 5.2 should be able to run the requirements checks.
+ * This is why the file and all classes must be compatible with PHP 5.2+
+ * (e.g. not using namespaces and closures).
+ *
+ * ************** CAUTION **************
+ *
+ * DO NOT EDIT THIS FILE as it will be overridden by Composer as part of
+ * the installation/update process. The original file resides in the
+ * SensioDistributionBundle.
+ *
+ * ************** CAUTION **************
+ */
+
+/**
+ * Represents a single PHP requirement, e.g. an installed extension.
+ * It can be a mandatory requirement or an optional recommendation.
+ * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class Requirement
+{
+    private $fulfilled;
+    private $testMessage;
+    private $helpText;
+    private $helpHtml;
+    private $optional;
+
+    /**
+     * Constructor that initializes the requirement.
+     *
+     * @param bool        $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param bool        $optional    Whether this is only an optional recommendation not a mandatory requirement
+     */
+    public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
+    {
+        $this->fulfilled = (bool) $fulfilled;
+        $this->testMessage = (string) $testMessage;
+        $this->helpHtml = (string) $helpHtml;
+        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
+        $this->optional = (bool) $optional;
+    }
+
+    /**
+     * Returns whether the requirement is fulfilled.
+     *
+     * @return bool true if fulfilled, otherwise false
+     */
+    public function isFulfilled()
+    {
+        return $this->fulfilled;
+    }
+
+    /**
+     * Returns the message for testing the requirement.
+     *
+     * @return string The test message
+     */
+    public function getTestMessage()
+    {
+        return $this->testMessage;
+    }
+
+    /**
+     * Returns the help text for resolving the problem.
+     *
+     * @return string The help text
+     */
+    public function getHelpText()
+    {
+        return $this->helpText;
+    }
+
+    /**
+     * Returns the help text formatted in HTML.
+     *
+     * @return string The HTML help
+     */
+    public function getHelpHtml()
+    {
+        return $this->helpHtml;
+    }
+
+    /**
+     * Returns whether this is only an optional recommendation and not a mandatory requirement.
+     *
+     * @return bool true if optional, false if mandatory
+     */
+    public function isOptional()
+    {
+        return $this->optional;
+    }
+}
+
+/**
+ * Represents a PHP requirement in form of a php.ini configuration.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class PhpIniRequirement extends Requirement
+{
+    /**
+     * Constructor that initializes the requirement.
+     *
+     * @param string        $cfgName           The configuration name used for ini_get()
+     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+     *                                         Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string|null   $testMessage       The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
+     * @param string|null   $helpHtml          The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
+     * @param string|null   $helpText          The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param bool          $optional          Whether this is only an optional recommendation not a mandatory requirement
+     */
+    public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
+    {
+        $cfgValue = ini_get($cfgName);
+
+        if (is_callable($evaluation)) {
+            if (null === $testMessage || null === $helpHtml) {
+                throw new InvalidArgumentException('You must provide the parameters testMessage and helpHtml for a callback evaluation.');
+            }
+
+            $fulfilled = call_user_func($evaluation, $cfgValue);
+        } else {
+            if (null === $testMessage) {
+                $testMessage = sprintf('%s %s be %s in php.ini',
+                    $cfgName,
+                    $optional ? 'should' : 'must',
+                    $evaluation ? 'enabled' : 'disabled'
+                );
+            }
+
+            if (null === $helpHtml) {
+                $helpHtml = sprintf('Set <strong>%s</strong> to <strong>%s</strong> in php.ini<a href="#phpini">*</a>.',
+                    $cfgName,
+                    $evaluation ? 'on' : 'off'
+                );
+            }
+
+            $fulfilled = $evaluation == $cfgValue;
+        }
+
+        parent::__construct($fulfilled || ($approveCfgAbsence && false === $cfgValue), $testMessage, $helpHtml, $helpText, $optional);
+    }
+}
+
+/**
+ * A RequirementCollection represents a set of Requirement instances.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class RequirementCollection implements IteratorAggregate
+{
+    private $requirements = array();
+
+    /**
+     * Gets the current RequirementCollection as an Iterator.
+     *
+     * @return Traversable A Traversable interface
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->requirements);
+    }
+
+    /**
+     * Adds a Requirement.
+     *
+     * @param Requirement $requirement A Requirement instance
+     */
+    public function add(Requirement $requirement)
+    {
+        $this->requirements[] = $requirement;
+    }
+
+    /**
+     * Adds a mandatory requirement.
+     *
+     * @param bool        $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null)
+    {
+        $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, false));
+    }
+
+    /**
+     * Adds an optional recommendation.
+     *
+     * @param bool        $fulfilled   Whether the recommendation is fulfilled
+     * @param string      $testMessage The message for testing the recommendation
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null)
+    {
+        $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, true));
+    }
+
+    /**
+     * Adds a mandatory requirement in form of a php.ini configuration.
+     *
+     * @param string        $cfgName           The configuration name used for ini_get()
+     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+     *                                         Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string        $testMessage       The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
+     * @param string        $helpHtml          The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
+     * @param string|null   $helpText          The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
+    {
+        $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, false));
+    }
+
+    /**
+     * Adds an optional recommendation in form of a php.ini configuration.
+     *
+     * @param string        $cfgName           The configuration name used for ini_get()
+     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+     *                                         Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string        $testMessage       The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
+     * @param string        $helpHtml          The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
+     * @param string|null   $helpText          The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
+    {
+        $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, true));
+    }
+
+    /**
+     * Adds a requirement collection to the current set of requirements.
+     *
+     * @param RequirementCollection $collection A RequirementCollection instance
+     */
+    public function addCollection(RequirementCollection $collection)
+    {
+        $this->requirements = array_merge($this->requirements, $collection->all());
+    }
+
+    /**
+     * Returns both requirements and recommendations.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function all()
+    {
+        return $this->requirements;
+    }
+
+    /**
+     * Returns all mandatory requirements.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getRequirements()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns the mandatory requirements that were not met.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getFailedRequirements()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && !$req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns all optional recommendations.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getRecommendations()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if ($req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns the recommendations that were not met.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getFailedRecommendations()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && $req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns whether a php.ini configuration is not correct.
+     *
+     * @return bool php.ini configuration problem?
+     */
+    public function hasPhpIniConfigIssue()
+    {
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && $req instanceof PhpIniRequirement) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the PHP configuration file (php.ini) path.
+     *
+     * @return string|false php.ini file path
+     */
+    public function getPhpIniConfigPath()
+    {
+        return get_cfg_var('cfg_file_path');
+    }
+}
+
+/**
+ * This class specifies all requirements and optional recommendations that
+ * are necessary to run the Symfony Standard Edition.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SymfonyRequirements extends RequirementCollection
+{
+    const REQUIRED_PHP_VERSION = '5.3.3';
+
+    /**
+     * Constructor that initializes the requirements.
+     */
+    public function __construct()
+    {
+        /* mandatory requirements follow */
+
+        $installedPhpVersion = phpversion();
+
+        $this->addRequirement(
+            version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>='),
+            sprintf('PHP version must be at least %s (%s installed)', self::REQUIRED_PHP_VERSION, $installedPhpVersion),
+            sprintf('You are running PHP version "<strong>%s</strong>", but Symfony needs at least PHP "<strong>%s</strong>" to run.
+                Before using Symfony, upgrade your PHP installation, preferably to the latest version.',
+                $installedPhpVersion, self::REQUIRED_PHP_VERSION),
+            sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion)
+        );
+
+        $this->addRequirement(
+            version_compare($installedPhpVersion, '5.3.16', '!='),
+            'PHP version must not be 5.3.16 as Symfony won\'t work properly with it',
+            'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)'
+        );
+
+        $this->addRequirement(
+            is_dir(__DIR__.'/../vendor/composer'),
+            'Vendor libraries must be installed',
+            'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. '.
+                'Then run "<strong>php composer.phar install</strong>" to install them.'
+        );
+
+        $cacheDir = is_dir(__DIR__.'/../var/cache') ? __DIR__.'/../var/cache' : __DIR__.'/cache';
+
+        $this->addRequirement(
+            is_writable($cacheDir),
+            'app/cache/ or var/cache/ directory must be writable',
+            'Change the permissions of either "<strong>app/cache/</strong>" or  "<strong>var/cache/</strong>" directory so that the web server can write into it.'
+        );
+
+        $logsDir = is_dir(__DIR__.'/../var/logs') ? __DIR__.'/../var/logs' : __DIR__.'/logs';
+
+        $this->addRequirement(
+            is_writable($logsDir),
+            'app/logs/ or var/logs/ directory must be writable',
+            'Change the permissions of either "<strong>app/logs/</strong>" or  "<strong>var/logs/</strong>" directory so that the web server can write into it.'
+        );
+
+        $this->addPhpIniRequirement(
+            'date.timezone', true, false,
+            'date.timezone setting must be set',
+            'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
+        );
+
+        if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
+            $timezones = array();
+            foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
+                foreach ($abbreviations as $abbreviation) {
+                    $timezones[$abbreviation['timezone_id']] = true;
+                }
+            }
+
+            $this->addRequirement(
+                isset($timezones[@date_default_timezone_get()]),
+                sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()),
+                'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
+            );
+        }
+
+        $this->addRequirement(
+            function_exists('iconv'),
+            'iconv() must be available',
+            'Install and enable the <strong>iconv</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('json_encode'),
+            'json_encode() must be available',
+            'Install and enable the <strong>JSON</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('session_start'),
+            'session_start() must be available',
+            'Install and enable the <strong>session</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('ctype_alpha'),
+            'ctype_alpha() must be available',
+            'Install and enable the <strong>ctype</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('token_get_all'),
+            'token_get_all() must be available',
+            'Install and enable the <strong>Tokenizer</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('simplexml_import_dom'),
+            'simplexml_import_dom() must be available',
+            'Install and enable the <strong>SimpleXML</strong> extension.'
+        );
+
+        if (function_exists('apc_store') && ini_get('apc.enabled')) {
+            if (version_compare($installedPhpVersion, '5.4.0', '>=')) {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.1.13', '>='),
+                    'APC version must be at least 3.1.13 when using PHP 5.4',
+                    'Upgrade your <strong>APC</strong> extension (3.1.13+).'
+                );
+            } else {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.0.17', '>='),
+                    'APC version must be at least 3.0.17',
+                    'Upgrade your <strong>APC</strong> extension (3.0.17+).'
+                );
+            }
+        }
+
+        $this->addPhpIniRequirement('detect_unicode', false);
+
+        if (extension_loaded('suhosin')) {
+            $this->addPhpIniRequirement(
+                'suhosin.executor.include.whitelist',
+                create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'),
+                false,
+                'suhosin.executor.include.whitelist must be configured correctly in php.ini',
+                'Add "<strong>phar</strong>" to <strong>suhosin.executor.include.whitelist</strong> in php.ini<a href="#phpini">*</a>.'
+            );
+        }
+
+        if (extension_loaded('xdebug')) {
+            $this->addPhpIniRequirement(
+                'xdebug.show_exception_trace', false, true
+            );
+
+            $this->addPhpIniRequirement(
+                'xdebug.scream', false, true
+            );
+
+            $this->addPhpIniRecommendation(
+                'xdebug.max_nesting_level',
+                create_function('$cfgValue', 'return $cfgValue > 100;'),
+                true,
+                'xdebug.max_nesting_level should be above 100 in php.ini',
+                'Set "<strong>xdebug.max_nesting_level</strong>" to e.g. "<strong>250</strong>" in php.ini<a href="#phpini">*</a> to stop Xdebug\'s infinite recursion protection erroneously throwing a fatal error in your project.'
+            );
+        }
+
+        $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
+
+        $this->addRequirement(
+            null !== $pcreVersion,
+            'PCRE extension must be available',
+            'Install the <strong>PCRE</strong> extension (version 8.0+).'
+        );
+
+        if (extension_loaded('mbstring')) {
+            $this->addPhpIniRequirement(
+                'mbstring.func_overload',
+                create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
+                true,
+                'string functions should not be overloaded',
+                'Set "<strong>mbstring.func_overload</strong>" to <strong>0</strong> in php.ini<a href="#phpini">*</a> to disable function overloading by the mbstring extension.'
+            );
+        }
+
+        /* optional recommendations follow */
+
+        if (file_exists(__DIR__.'/../vendor/composer')) {
+            require_once __DIR__.'/../vendor/autoload.php';
+
+            try {
+                $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle');
+
+                $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php');
+            } catch (ReflectionException $e) {
+                $contents = '';
+            }
+            $this->addRecommendation(
+                file_get_contents(__FILE__) === $contents,
+                'Requirements file should be up-to-date',
+                'Your requirements file is outdated. Run composer install and re-check your configuration.'
+            );
+        }
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.3.4', '>='),
+            'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions',
+            'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.'
+        );
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.3.8', '>='),
+            'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156',
+            'Install PHP 5.3.8 or newer if your project uses annotations.'
+        );
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.4.0', '!='),
+            'You should not use PHP 5.4.0 due to the PHP bug #61453',
+            'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.'
+        );
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.4.11', '>='),
+            'When using the logout handler from the Symfony Security Component, you should have at least PHP 5.4.11 due to PHP bug #63379 (as a workaround, you can also set invalidate_session to false in the security logout handler configuration)',
+            'Install PHP 5.4.11 or newer if your project uses the logout handler from the Symfony Security Component.'
+        );
+
+        $this->addRecommendation(
+            (version_compare($installedPhpVersion, '5.3.18', '>=') && version_compare($installedPhpVersion, '5.4.0', '<'))
+            ||
+            version_compare($installedPhpVersion, '5.4.8', '>='),
+            'You should use PHP 5.3.18+ or PHP 5.4.8+ to always get nice error messages for fatal errors in the development environment due to PHP bug #61767/#60909',
+            'Install PHP 5.3.18+ or PHP 5.4.8+ if you want nice error messages for all fatal errors in the development environment.'
+        );
+
+        if (null !== $pcreVersion) {
+            $this->addRecommendation(
+                $pcreVersion >= 8.0,
+                sprintf('PCRE extension should be at least version 8.0 (%s installed)', $pcreVersion),
+                '<strong>PCRE 8.0+</strong> is preconfigured in PHP since 5.3.2 but you are using an outdated version of it. Symfony probably works anyway but it is recommended to upgrade your PCRE extension.'
+            );
+        }
+
+        $this->addRecommendation(
+            class_exists('DomDocument'),
+            'PHP-DOM and PHP-XML modules should be installed',
+            'Install and enable the <strong>PHP-DOM</strong> and the <strong>PHP-XML</strong> modules.'
+        );
+
+        $this->addRecommendation(
+            function_exists('mb_strlen'),
+            'mb_strlen() should be available',
+            'Install and enable the <strong>mbstring</strong> extension.'
+        );
+
+        $this->addRecommendation(
+            function_exists('iconv'),
+            'iconv() should be available',
+            'Install and enable the <strong>iconv</strong> extension.'
+        );
+
+        $this->addRecommendation(
+            function_exists('utf8_decode'),
+            'utf8_decode() should be available',
+            'Install and enable the <strong>XML</strong> extension.'
+        );
+
+        $this->addRecommendation(
+            function_exists('filter_var'),
+            'filter_var() should be available',
+            'Install and enable the <strong>filter</strong> extension.'
+        );
+
+        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->addRecommendation(
+                function_exists('posix_isatty'),
+                'posix_isatty() should be available',
+                'Install and enable the <strong>php_posix</strong> extension (used to colorize the CLI output).'
+            );
+        }
+
+        $this->addRecommendation(
+            extension_loaded('intl'),
+            'intl extension should be available',
+            'Install and enable the <strong>intl</strong> extension (used for validators).'
+        );
+
+        if (extension_loaded('intl')) {
+            // in some WAMP server installations, new Collator() returns null
+            $this->addRecommendation(
+                null !== new Collator('fr_FR'),
+                'intl extension should be correctly configured',
+                'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.'
+            );
+
+            // check for compatible ICU versions (only done when you have the intl extension)
+            if (defined('INTL_ICU_VERSION')) {
+                $version = INTL_ICU_VERSION;
+            } else {
+                $reflector = new ReflectionExtension('intl');
+
+                ob_start();
+                $reflector->info();
+                $output = strip_tags(ob_get_clean());
+
+                preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches);
+                $version = $matches[1];
+            }
+
+            $this->addRecommendation(
+                version_compare($version, '4.0', '>='),
+                'intl ICU version should be at least 4+',
+                'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
+            );
+
+            $this->addPhpIniRecommendation(
+                'intl.error_level',
+                create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
+                true,
+                'intl.error_level should be 0 in php.ini',
+                'Set "<strong>intl.error_level</strong>" to "<strong>0</strong>" in php.ini<a href="#phpini">*</a> to inhibit the messages when an error occurs in ICU functions.'
+            );
+        }
+
+        $accelerator =
+            (extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'))
+            ||
+            (extension_loaded('apc') && ini_get('apc.enabled'))
+            ||
+            (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
+            ||
+            (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
+            ||
+            (extension_loaded('xcache') && ini_get('xcache.cacher'))
+            ||
+            (extension_loaded('wincache') && ini_get('wincache.ocenabled'))
+        ;
+
+        $this->addRecommendation(
+            $accelerator,
+            'a PHP accelerator should be installed',
+            'Install and/or enable a <strong>PHP accelerator</strong> (highly recommended).'
+        );
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $this->addRecommendation(
+                $this->getRealpathCacheSize() > 1000,
+                'realpath_cache_size should be above 1024 in php.ini',
+                'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.'
+            );
+        }
+
+        $this->addPhpIniRecommendation('short_open_tag', false);
+
+        $this->addPhpIniRecommendation('magic_quotes_gpc', false, true);
+
+        $this->addPhpIniRecommendation('register_globals', false, true);
+
+        $this->addPhpIniRecommendation('session.auto_start', false);
+
+        $this->addRecommendation(
+            class_exists('PDO'),
+            'PDO should be installed',
+            'Install <strong>PDO</strong> (mandatory for Doctrine).'
+        );
+
+        if (class_exists('PDO')) {
+            $drivers = PDO::getAvailableDrivers();
+            $this->addRecommendation(
+                count($drivers) > 0,
+                sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'),
+                'Install <strong>PDO drivers</strong> (mandatory for Doctrine).'
+            );
+        }
+    }
+
+    /**
+     * Loads realpath_cache_size from php.ini and converts it to int.
+     *
+     * (e.g. 16k is converted to 16384 int)
+     *
+     * @return int
+     */
+    protected function getRealpathCacheSize()
+    {
+        $size = ini_get('realpath_cache_size');
+        $size = trim($size);
+        $unit = strtolower(substr($size, -1, 1));
+        switch ($unit) {
+            case 'g':
+                return $size * 1024 * 1024 * 1024;
+            case 'm':
+                return $size * 1024 * 1024;
+            case 'k':
+                return $size * 1024;
+            default:
+                return (int) $size;
+        }
+    }
+}

app/autoload.php

@@ -0,0 +1,13 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
+
+/**
+ * @var ClassLoader $loader
+ */
+$loader = require __DIR__.'/../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+
+return $loader;

app/check.php

@@ -0,0 +1,142 @@
+<?php
+
+require_once dirname(__FILE__).'/SymfonyRequirements.php';
+
+$lineSize = 70;
+$symfonyRequirements = new SymfonyRequirements();
+$iniPath = $symfonyRequirements->getPhpIniConfigPath();
+
+echo_title('Symfony2 Requirements Checker');
+
+echo '> PHP is using the following php.ini file:'.PHP_EOL;
+if ($iniPath) {
+    echo_style('green', '  '.$iniPath);
+} else {
+    echo_style('warning', '  WARNING: No configuration file (php.ini) used by PHP!');
+}
+
+echo PHP_EOL.PHP_EOL;
+
+echo '> Checking Symfony requirements:'.PHP_EOL.'  ';
+
+$messages = array();
+foreach ($symfonyRequirements->getRequirements() as $req) {
+    /** @var $req Requirement */
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('red', 'E');
+        $messages['error'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+$checkPassed = empty($messages['error']);
+
+foreach ($symfonyRequirements->getRecommendations() as $req) {
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('yellow', 'W');
+        $messages['warning'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+if ($checkPassed) {
+    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+} else {
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+
+    echo_title('Fix the following mandatory requirements', 'red');
+
+    foreach ($messages['error'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+if (!empty($messages['warning'])) {
+    echo_title('Optional recommendations to improve your setup', 'yellow');
+
+    foreach ($messages['warning'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+echo PHP_EOL;
+echo_style('title', 'Note');
+echo '  The command console could use a different php.ini file'.PHP_EOL;
+echo_style('title', '~~~~');
+echo '  than the one used with your web server. To be on the'.PHP_EOL;
+echo '      safe side, please check the requirements from your web'.PHP_EOL;
+echo '      server using the ';
+echo_style('yellow', 'web/config.php');
+echo ' script.'.PHP_EOL;
+echo PHP_EOL;
+
+exit($checkPassed ? 0 : 1);
+
+function get_error_message(Requirement $requirement, $lineSize)
+{
+    if ($requirement->isFulfilled()) {
+        return;
+    }
+
+    $errorMessage  = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
+    $errorMessage .= '   > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.'   > ').PHP_EOL;
+
+    return $errorMessage;
+}
+
+function echo_title($title, $style = null)
+{
+    $style = $style ?: 'title';
+
+    echo PHP_EOL;
+    echo_style($style, $title.PHP_EOL);
+    echo_style($style, str_repeat('~', strlen($title)).PHP_EOL);
+    echo PHP_EOL;
+}
+
+function echo_style($style, $message)
+{
+    // ANSI color codes
+    $styles = array(
+        'reset' => "\033[0m",
+        'red' => "\033[31m",
+        'green' => "\033[32m",
+        'yellow' => "\033[33m",
+        'error' => "\033[37;41m",
+        'success' => "\033[37;42m",
+        'title' => "\033[34m",
+    );
+    $supports = has_color_support();
+
+    echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');
+}
+
+function echo_block($style, $title, $message)
+{
+    $message = ' '.trim($message).' ';
+    $width = strlen($message);
+
+    echo PHP_EOL.PHP_EOL;
+
+    echo_style($style, str_repeat(' ', $width).PHP_EOL);
+    echo_style($style, str_pad(' ['.$title.']',  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad($message,  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_repeat(' ', $width).PHP_EOL);
+}
+
+function has_color_support()
+{
+    static $support;
+
+    if (null === $support) {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+        } else {
+            $support = function_exists('posix_isatty') && @posix_isatty(STDOUT);
+        }
+    }
+
+    return $support;
+}

app/config/config.yml

@@ -0,0 +1,209 @@
+imports:
+    - { resource: parameters.yml }
+    - { resource: security.yml }
+    - { resource: services.yml }
+
+framework:
+    #esi:             ~
+    translator:      { fallback: "%locale%" }
+    secret:          "%secret%"
+    router:
+        resource: "%kernel.root_dir%/config/routing.yml"
+        strict_requirements: ~
+    form:            ~
+    csrf_protection: ~
+    validation:      { enable_annotations: true }
+    templating:
+        engines: ['twig']
+        #assets_version: SomeVersionScheme
+    default_locale:  "%locale%"
+    trusted_hosts:   ~
+    trusted_proxies: ~
+    session:
+        # handler_id set to null will use default session handler from php.ini
+        handler_id:  ~
+    fragments:       ~
+    http_method_override: true
+
+wallabag_core:
+    languages:
+        en: 'English'
+        fr: 'Français'
+        de: 'Deutsch'
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+
+# Twig Configuration
+twig:
+    debug:            "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
+    globals:
+        share_twitter: %share_twitter%
+        share_mail: %share_mail%
+        share_shaarli: %share_shaarli%
+        shaarli_url: %shaarli_url%
+        share_diaspora: %share_diaspora%
+        diaspora_url: %diaspora_url%
+        flattr: %flattr%
+        flattrable: 1
+        flattred: 2
+        carrot: %carrot%
+        show_printlink: %show_printlink%
+        export_epub: %export_epub%
+        export_mobi: %export_mobi%
+        export_pdf: %export_pdf%
+        version: %app.version%
+        twofactor_auth: %twofactor_auth%
+        warning_message: %warning_message%
+        paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
+        flattr_url: "https://flattr.com/thing/1265480"
+    form:
+        resources:
+            - LexikFormFilterBundle:Form:form_div_layout.html.twig
+
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        #closure:
+        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
+        #yui_css:
+        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
+
+# Doctrine Configuration
+doctrine:
+    dbal:
+        driver:   "%database_driver%"
+        host: "%database_host%"
+        port: "%database_port%"
+        dbname: "%database_name%"
+        user: "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        path:     "%database_path%"
+
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        entity_managers:
+            default:
+                auto_mapping: true
+
+stof_doctrine_extensions:
+    default_locale: "%locale%"
+    translation_fallback: true
+    orm:
+        default:
+            tree: true
+            sluggable: true
+
+# Swiftmailer Configuration
+swiftmailer:
+    transport: "%mailer_transport%"
+    host:      "%mailer_host%"
+    username:  "%mailer_user%"
+    password:  "%mailer_password%"
+    spool:     { type: memory }
+
+fos_rest:
+    param_fetcher_listener: true
+    body_listener: true
+    format_listener: true
+    view:
+        view_response_listener: 'force'
+        formats:
+            xml: true
+            json : true
+        templating_formats:
+            html: true
+        force_redirects:
+            html: true
+        failed_validation: HTTP_BAD_REQUEST
+        default_engine: twig
+    routing_loader:
+        default_format: json
+
+nelmio_api_doc:
+    sandbox:
+        enabled: false
+    name: wallabag API documentation
+
+nelmio_cors:
+    defaults:
+        allow_credentials: false
+        allow_origin: []
+        allow_headers: []
+        allow_methods: []
+        expose_headers: []
+        max_age: 0
+        hosts: []
+        #origin_regex: false
+    paths:
+        '^/api/':
+            allow_origin: ['*']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+        '^/':
+            #origin_regex: true
+            allow_origin: ['^http://localhost:[0-9]+']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+            hosts: ['^api\.']
+
+liip_theme:
+    load_controllers: false
+    themes:
+        - baggy
+        - material
+    autodetect_theme: wallabag_core.helper.detect_active_theme
+
+    path_patterns:
+        # app_resource:
+        #     - %%app_path%%/views/themes/%%current_theme%%/%%template%%
+        #     - %%app_path%%/views/%%template%%
+        bundle_resource:
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+        # bundle_resource_dir:
+        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
+        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
+
+fos_user:
+    db_driver: orm
+    firewall_name: main
+    user_class: Wallabag\UserBundle\Entity\User
+    registration:
+        confirmation:
+            enabled: true
+
+fos_oauth_server:
+    db_driver:           orm
+    client_class:        Wallabag\ApiBundle\Entity\Client
+    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
+    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
+    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    service:
+        user_provider: fos_user.user_manager
+
+scheb_two_factor:
+    trusted_computer:
+        enabled: true
+        cookie_name: wllbg_trusted_computer
+        cookie_lifetime: 2592000
+
+    email:
+        enabled: %twofactor_auth%
+        sender_email: %twofactor_sender%
+        digits: 6
+        template: WallabagUserBundle:Authentication:form.html.twig
+        mailer: wallabag_user.auth_code_mailer
+
+kphoen_rulerz:
+    executors:
+        doctrine: true

app/config/config_dev.yml

@@ -0,0 +1,54 @@
+imports:
+    - { resource: config.yml }
+
+framework:
+    router:
+        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        strict_requirements: true
+    profiler: { only_exceptions: false }
+
+web_profiler:
+    toolbar: true
+    intercept_redirects: false
+
+monolog:
+    handlers:
+        main:
+            type:   stream
+            path:   "%kernel.logs_dir%/%kernel.environment%.log"
+            level:  debug
+        console:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: INFO
+                VERBOSITY_VERY_VERBOSE: DEBUG
+            channels: ["!doctrine"]
+        console_very_verbose:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: NOTICE
+                VERBOSITY_VERY_VERBOSE: NOTICE
+                VERBOSITY_DEBUG: DEBUG
+            channels: ["doctrine"]
+        # uncomment to get logging in your browser
+        # you may have to allow bigger header sizes in your Web server configuration
+        #firephp:
+        #    type:   firephp
+        #    level:  info
+        #chromephp:
+        #    type:   chromephp
+        #    level:  info
+
+assetic:
+    use_controller: true
+
+swiftmailer:
+    # see http://mailcatcher.me/
+    transport: smtp
+    host: 'localhost'
+    port: 1025
+    username: null
+    password: null
+

app/config/config_prod.yml

@@ -0,0 +1,25 @@
+imports:
+    - { resource: config.yml }
+
+#framework:
+#    validation:
+#        cache: apc
+
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apc
+#        result_cache_driver: apc
+#        query_cache_driver: apc
+
+monolog:
+    handlers:
+        main:
+            type:         fingers_crossed
+            action_level: error
+            handler:      nested
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+        console:
+            type:  console

app/config/config_test.yml

@@ -0,0 +1,36 @@
+imports:
+    - { resource: config_dev.yml }
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.mock_file
+    profiler:
+        collect: false
+
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+swiftmailer:
+    # to be able to read emails sent
+    spool:
+        type: file
+
+doctrine:
+    dbal:
+        driver: "%test_database_driver%"
+        host: "%test_database_host%"
+        port: "%test_database_port%"
+        dbname: "%test_database_name%"
+        user: "%test_database_user%"
+        password: "%test_database_password%"
+        charset: UTF8
+        path: "%test_database_path%"
+    orm:
+        metadata_cache_driver:
+            type: service
+            id: filesystem_cache
+        query_cache_driver:
+            type: service
+            id: filesystem_cache

app/config/parameters.yml.dist

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: 127.0.0.1
+    test_database_port: ~
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/routing.yml

@@ -0,0 +1,33 @@
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type:     annotation
+    prefix:   /import
+
+wallabag_api:
+    resource: "@WallabagApiBundle/Resources/config/routing.yml"
+    prefix: /
+
+app:
+    resource: @WallabagCoreBundle/Controller/
+    type: annotation
+
+doc-api:
+    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
+    prefix: /api/doc
+
+rest :
+    type : rest
+    resource : "routing_rest.yml"
+    prefix : /api
+
+homepage:
+    path: "/{page}"
+    defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    requirements:
+        page: \d+
+
+fos_user:
+    resource: "@FOSUserBundle/Resources/config/routing/all.xml"
+
+fos_oauth_server_token:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"

app/config/routing_dev.yml

@@ -0,0 +1,18 @@
+_wdt:
+    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    prefix:   /_wdt
+
+_profiler:
+    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    prefix:   /_profiler
+
+_configurator:
+    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
+    prefix:   /_configurator
+
+_errors:
+    resource: "@TwigBundle/Resources/config/routing/errors.xml"
+    prefix:   /_error
+
+_main:
+    resource: routing.yml

app/config/routing_rest.yml

@@ -0,0 +1,3 @@
+Rest_Wallabag:
+  type : rest
+  resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"

app/config/security.yml

@@ -0,0 +1,55 @@
+security:
+    encoders:
+        FOS\UserBundle\Model\UserInterface: sha512
+
+    role_hierarchy:
+        ROLE_ADMIN:       ROLE_USER
+        ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
+
+    providers:
+        administrators:
+            entity: { class: WallabagUserBundle:User, property: username }
+        fos_userbundle:
+            id: fos_user.user_provider.username
+
+    # the main part of the security, where you can set up firewalls
+    # for specific sections of your app
+    firewalls:
+        oauth_token:
+            pattern: ^/oauth/v2/token
+            security: false
+
+        api:
+            pattern: /api/.*
+            fos_oauth: true
+            stateless: true
+            anonymous: true
+
+        login_firewall:
+            pattern:    ^/login$
+            anonymous:  ~
+
+        secured_area:
+            pattern: ^/
+            form_login:
+                provider: fos_userbundle
+                csrf_provider: security.csrf.token_manager
+
+            anonymous:    true
+            remember_me:
+                key:      "%secret%"
+                lifetime: 31536000
+                path:     /
+                domain:   ~
+
+            logout:
+                path:   /logout
+                target: /
+
+    access_control:
+        - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -0,0 +1,32 @@
+parameters:
+    lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+
+services:
+    # used for tests
+    filesystem_cache:
+        class: Doctrine\Common\Cache\FilesystemCache
+        arguments:
+            - %kernel.cache_dir%/doctrine/metadata
+
+    twig.extension.text:
+        class: Twig_Extensions_Extension_Text
+        tags:
+            - { name: twig.extension }
+
+    wallabag.twig_extension:
+        class: Wallabag\CoreBundle\Twig\WallabagExtension
+        public: false
+        tags:
+            - { name: twig.extension }
+
+    wallabag.locale_listener:
+        class: Wallabag\CoreBundle\EventListener\LocaleListener
+        arguments: ["%kernel.default_locale%"]
+        tags:
+            - { name: kernel.event_subscriber }
+
+    wallabag.user_locale_listener:
+        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+        arguments: ["@session"]
+        tags:
+            - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }

app/config/tests/parameters.yml.dist.mysql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_mysql
+    test_database_host: localhost
+    test_database_port: 3306
+    test_database_name: wallabag
+    test_database_user: root
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.pgsql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_pgsql
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: wallabag
+    test_database_user: travis
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.sqlite

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/console

@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+//umask(0000);
+
+set_time_limit(0);
+
+require_once __DIR__.'/bootstrap.php.cache';
+require_once __DIR__.'/AppKernel.php';
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);

bin/phpunit

@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit

build.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="clean,composer,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,composer,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,composer,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/app/cache"/>
+    </target>
+
+    <target name="composer" description="Install deps using Composer">
+        <exec executable="composer">
+            <arg value="install"/>
+            <arg value="--no-interaction"/>
+            <arg value="--no-progress"/>
+        </exec>
+    </target>
+
+    <target name="prepare" description="Prepare for build">
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_mysql" description="Run test for MySQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.mysql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_sqlite" description="Run test for SQLite">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_pgsql" description="Run test for PostgreSQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">
+        <exec executable="phpunit" failonerror="true">
+            <arg value="--coverage-html"/>
+            <arg value="build/coverage"/>
+        </exec>
+    </target>
+</project>

cache/.gitignore

@@ -1 +0,0 @@
-!.htaccess

cache/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

check_setup.php

@@ -1,40 +0,0 @@
-<?php
-
-// PHP 5.3 minimum
-if (version_compare(PHP_VERSION, '5.3.3', '<')) {
-    die('This software require PHP 5.3.3 minimum');
-}
-
-// Short tags must be enabled for PHP < 5.4
-if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-
-    if (! ini_get('short_open_tag')) {
-        die('This software require to have short tags enabled, check your php.ini => "short_open_tag = On"');
-    }
-}
-
-// Check PDO Sqlite
-if (! extension_loaded('pdo_sqlite')) {
-    die('PHP extension required: pdo_sqlite');
-}
-
-// Check ZIP
-if (! extension_loaded('zip')) {
-    die('PHP extension required: zip');
-}
-
-// Check if /cache is writeable
-if (! is_writable('cache')) {
-    die('The directory "cache" must be writeable by your web server user');
-}
-
-// Check if /db is writeable
-if (! is_writable('db')) {
-    die('The directory "db" must be writeable by your web server user');
-}
-
-// install folder still present, need to install wallabag
-if (is_dir('install')) {
-    require('install/index.php');
-    exit;
-}

composer.json

@@ -1,7 +1,118 @@
 {
+    "name": "wallabag/wallabag",
+    "type": "project",
+    "description": "open source self hostable read-it-later web application",
+    "keywords": ["read-it-later","read it later"],
+    "homepage": "https://github.com/wallabag/wallabag",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Lœuillet",
+            "email": "nicolas@loeuillet.org",
+            "homepage": "http://www.cdetc.fr",
+            "role": "Developer"
+        },
+        {
+            "name": "Thomas Citharel",
+            "homepage": "http://tcit.fr",
+            "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "homepage": "http://www.j0k3r.net",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "hello@wallabag.org",
+        "issues": "https://github.com/wallabag/wallabag/issues"
+    },
     "require": {
-        "twig/twig": "1.*",
-        "twig/extensions": "1.0.*",
-        "umpirsky/twig-gettext-extractor": "1.1.*"
-    }
-}
+        "php": ">=5.5.0",
+        "symfony/symfony": "~2.7.0",
+        "doctrine/orm": "~2.3",
+        "doctrine/doctrine-bundle": "1.5.2",
+        "twig/extensions": "~1.0",
+        "symfony/assetic-bundle": "~2.3",
+        "symfony/swiftmailer-bundle": "~2.3",
+        "symfony/monolog-bundle": "~2.4",
+        "sensio/distribution-bundle": "~3.0.12",
+        "sensio/framework-extra-bundle": "~3.0",
+        "incenteev/composer-parameter-handler": "~2.0",
+        "nelmio/cors-bundle": "~1.4.0",
+        "friendsofsymfony/rest-bundle": "~1.4",
+        "jms/serializer-bundle": "~0.13",
+        "nelmio/api-doc-bundle": "~2.7",
+        "ezyang/htmlpurifier": "~4.6",
+        "mgargano/simplehtmldom": "~1.5",
+        "tecnickcom/tcpdf": "~6.2",
+        "simplepie/simplepie": "~1.3.1",
+        "willdurand/hateoas-bundle": "~0.5.0",
+        "htmlawed/htmlawed": "~1.1.19",
+        "liip/theme-bundle": "~1.1.3",
+        "pagerfanta/pagerfanta": "~1.0.3",
+        "lexik/form-filter-bundle": "~4.0",
+        "j0k3r/graby": "~1.0",
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "scheb/two-factor-bundle": "~1.4.0",
+        "grandt/phpepub": "~4.0",
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10",
+        "guzzlehttp/guzzle": "^5.2.0"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "~2.2.0",
+        "sensio/generator-bundle": "~2.5",
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "~2.7.0"
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/wallabag/phpMobi"
+        }
+    ],
+    "scripts": {
+        "post-install-cmd": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ],
+        "post-update-cmd": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ],
+        "build-parameters": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+        ]
+    },
+    "extra": {
+        "symfony-app-dir": "app",
+        "symfony-web-dir": "web",
+        "symfony-assets-install": "relative",
+        "incenteev-parameters": {
+            "file": "app/config/parameters.yml",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
+        }
+    },
+    "autoload": {
+        "psr-0": { "": "src/" }
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

config/deploy.rb

@@ -0,0 +1,23 @@
+# config valid only for current version of Capistrano
+lock '3.4.0'
+
+set :application, 'wallabag'
+set :repo_url, 'git@github.com:wallabag/wallabag.git'
+
+set :ssh_user, 'framasoft_bag'
+server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
+
+set :scm, :git
+
+set :format, :pretty
+set :log_level, :info
+# set :log_level, :debug
+
+set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
+
+set :linked_files, %w{app/config/parameters.yml}
+set :linked_dirs, %w{app/logs web/uploads data}
+
+set :keep_releases, 3
+
+after 'deploy:finishing', 'deploy:cleanup'

config/deploy/production.rb

@@ -0,0 +1,61 @@
+# server-based syntax
+# ======================
+# Defines a single server with a list of roles and multiple properties.
+# You can define all roles on a single server, or split them:
+
+# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
+# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
+# server 'db.example.com', user: 'deploy', roles: %w{db}
+
+
+
+# role-based syntax
+# ==================
+
+# Defines a role with one or multiple servers. The primary server in each
+# group is considered to be the first unless any  hosts have the primary
+# property set. Specify the username and a domain or IP for the server.
+# Don't use `:all`, it's a meta role.
+
+# role :app, %w{deploy@example.com}, my_property: :my_value
+# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
+# role :db,  %w{deploy@example.com}
+
+
+
+# Configuration
+# =============
+# You can set any configuration variable like in config/deploy.rb
+# These variables are then only loaded and set in this stage.
+# For available Capistrano configuration variables see the documentation page.
+# http://capistranorb.com/documentation/getting-started/configuration/
+# Feel free to add new variables to customise your setup.
+
+
+
+# Custom SSH Options
+# ==================
+# You may pass any option but keep in mind that net/ssh understands a
+# limited set of options, consult the Net::SSH documentation.
+# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
+#
+# Global options
+# --------------
+#  set :ssh_options, {
+#    keys: %w(/home/rlisowski/.ssh/id_rsa),
+#    forward_agent: false,
+#    auth_methods: %w(password)
+#  }
+#
+# The server-based syntax can be used to override options:
+# ------------------------------------
+# server 'example.com',
+#   user: 'user_name',
+#   roles: %w{web app},
+#   ssh_options: {
+#     user: 'user_name', # overrides user setting above
+#     keys: %w(/home/user_name/.ssh/id_rsa),
+#     forward_agent: false,
+#     auth_methods: %w(publickey password)
+#     # password: 'please use keys'
+#   }

config/deploy/staging.rb

@@ -0,0 +1,2 @@
+set :branch, 'v2'
+set :deploy_to, '/var/www/v2.wallabag.org/web/'

db/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

docs/en/Administrator/hidden_options.rst

@@ -0,0 +1,85 @@
+Hidden options
+==============
+
+Caution
+-------
+
+**Be careful**, this section is destined to advanced users. We are going
+to modify an important wallabag configuration file,
+``inc/poche/config.inc.php``. It is therefore advised to do a backup of
+this file before you proceed. **Any error occuring during the
+modification of a wallabag file could lead to malfunctions**.
+
+This file is created when you install wallabag. Install wallabag, do a
+backup copy of the file, then open it in your favorite text editor.
+
+In this file, there are some options that are not, as of now, available
+in the **config** page of wallabag.
+
+Modification of advanced options
+--------------------------------
+
+Each option is defined this way:
+
+::
+
+    @define ('OPTION_NAME', 'Value');
+
+For each line, you can only modify the ``Value`` field.
+
+Here is the list of each option you can change:
+
+-  ``HTTP_PORT`` (default: ``80``) : the HTTP port of your web server.
+   You may need to change it if your server is behind a proxy. Accepted
+   values: number
+-  ``SSL_PORT`` (default: ``443``) : the HTTP port of your web server.
+   You may need to change it if your server use SSLH. Accepted values:
+   number
+-  ``MODE_DEMO`` (default : ``FALSE)``: If you ever wanted to set up a
+   demonstration server… Accepted values: ``TRUE`` or ``FALSE``.
+-  ``DEBUG_POCHE`` (default: ``FALSE``) : if you encounter some problems
+   with wallabag, we may ask you to active Debug mode. Accepted values:
+   ``TRUE`` or ``FALSE``. Check the logs in cache/log.txt after
+   activating that.
+-  ``ERROR_REPORTING`` (default : ``E_ALL & ~E_NOTICE``) : Set to
+   ``E_ALL`` if needed to look for eventual PHP errors.
+-  ``DOWNLOAD_PICTURES`` (default: ``FALSE``) : Allows wallabag to fetch
+   images from the articles you save on your server, instead of fetching
+   only the text. We prefer to let you activate this option yourself.
+   Accepted values: ``TRUE`` or ``FALSE``.
+-  ``REGENERATE_PICTURES_QUALITY`` (default : ``75``) : In order to
+   avoid security problems, pictures are regenerated if you activate the
+   download of pictures. This is the percentage of quality at which they
+   are saved. Increase that numbler if you want better quality, lower if
+   you need better performances.
+-  ``SHARE_TWITTER`` (default: ``TRUE``) : enables Twitter sharing.
+   Accepted values: ``TRUE`` or ``FALSE``.
+-  ``SHARE_MAIL`` (default: ``TRUE``) : enables mail sharing. Accepted
+   values: ``TRUE`` or ``FALSE``.
+-  ``SHARE_EVERNOTE``\ (default : ``FALSE``) : enables sharing with your
+   Evernote account. Accepted values: ``TRUE`` or ``FALSE``.
+-  ``SHARE_DIASPORA`` (default : ``FALSE``) : enables to share an
+   article on your Diaspora account.
+-  ``DIASPORA_URL`` (default : ``http://diasporapod.com``) : The URL of
+   your Diaspora\* pod
+-  ``CARROT`` (default : ``FALSE``) : Like Flattr, it’s a service to
+   give small amounts of money to a web page. See http://carrot.org/
+-  ``SHARE_SHAARLI`` (default: ``FALSE``) : enables sharing via your
+   Shaarli installation (Shaarli is an open-source bookmark manager).
+   Accepted values: ``TRUE`` or ``FALSE``.
+-  ``SHAARLI_URL`` (default: ``'http://myshaarliurl.com'``) : defines
+   your Shaarli installation URL. Accepted values: an URL.
+-  ``FLATTR`` (default: ``TRUE``) : enables the possibility to Flattr an
+   article (`Flattr is a microdonation platform`_). If an article is
+   Flattr-able, an icon will be displayed, allowing you to send a
+   microdonation to the author. Accepted values: ``TRUE`` or ``FALSE``.
+-  ``SHOW_PRINTLINK`` (default: ``'1'``) : enables the Print button for
+   articles. Accepted values: ``'1'`` to enable or ``'0'`` to disable.
+-  ``SHOW_READPERCENT`` (default: ``'1'``) : enables the reading
+   progress on articles (working on the ``default``, ``dark``,
+   ``dmagenta``, ``solarized``, ``solarized-dark`` themes). Accepted
+   values: ``'1'`` to enable or ``'0'`` to disable.
+-  ``PAGINATION`` (default: ``'12'``) : defines the number of articles
+   that are displayed on a list. Accepted values: number.
+
+.. _Flattr is a microdonation platform: http://en.wikipedia.org/wiki/Flattr

docs/en/Administrator/install.rst

@@ -0,0 +1,200 @@
+Download and install wallabag
+=============================
+
+I don’t want to install wallabag
+--------------------------------
+
+If you can’t or don’t want to install Wallabag on your server, we
+suggest you create a free account on `Framabag`_ which uses our
+software (see :ref:`Framabag account creation`).
+
+I want to install wallabag
+--------------------------
+
+I want to download wallabag manually
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`Download the latest wallabag version`_ and unpack it:
+
+::
+
+    wget http://wllbg.org/latest
+    unzip latest
+    mv wallabag-version-number wallabag
+
+Copy the files on your web server. For Ubuntu/Debian, it is the
+directory /var/www/html/ :
+
+::
+
+    sudo mv wallabag /var/www/html/
+
+Then, jump off to next section.
+
+I want to download wallabag via composer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You need to install composer:
+
+::
+
+    curl -s http://getcomposer.org/installer | php
+
+Next, on your web server, run this command:
+
+::
+
+    composer create-project wallabag/wallabag . dev-master
+
+All is downloaded into the current folder.
+
+Prerequisites for your web server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Wallabag requires that several components to be installed on your web
+server. To make sure your server has all the prerequisites, open in your
+browser the page ``http://monserveur.com/wallabag/install/index.php``.
+
+The components are:
+
+-  `PHP 5.3.3 or above`_ **with `PDO`_ support**
+-  `XML for PHP`_
+-  `PCRE`_
+-  `ZLib`_ (otherwise, the processing of compressed pages will be
+   affected)
+-  `mbstring`_ anb/or `iconv`_ (otherwise some pages will not be read -
+   even in English)
+-  The `DOM/XML`_ extension
+-  `Data filtering`_
+-  `GD`_ (otherwise, pictures will not be saved)
+-  `Tidy for PHP`_ (otherwise, you may encounter problems with some
+   pages)
+-  `cURL`_ with ``Parallel URL fetching`` (optionnal)
+-  `Parse ini file`_
+-  `allow\_url\_fopen`_ (optionnal if cURL is installed)
+-  `gettext`_ (required for multi-language support)
+
+Install the missing components before to proceed. For example, to
+install Tidy on Ubuntu/Debian:
+
+::
+
+    sudo apt-get install php5-tidy
+    sudo service apache2 reload
+
+Note : if you’re using IIS as a webserver, you have to disable
+*Anonymous Authentication* and `enable *Basic Authentication*`_ in order
+to be able to login.
+
+Twig installation
+^^^^^^^^^^^^^^^^^
+
+wallabag is build with Twig, a template library. You have to download it
+for wallabag to work. If you cannot install ``composer`` (for example in
+the case of shared hosting), we offer you to download a file which
+includes ``Twig``. This file can be downloaed from the page
+``http://myservur.com/wallabag/install/index.php`` (section TWIG
+INSTALLATION) or directly at http://wllbg.org/vendor. Uncompress it in
+your wallabag directory.
+
+Otherwise, you can use Composer to install ``Twig`` by launching
+``composer`` from your wallabag directory (in the case of Ubuntu/Debian
+too: /var/www/html/wallabag/) by following the commands written on
+screen:
+
+::
+
+    curl -s http://getcomposer.org/installer | php
+    php composer.phar install
+
+Creation of the database.
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Wallabag can be installed on different types of databases:
+
+-  `SQLite`_. The easiest system of all. No extra configuration needed.
+-  `MySQL`_. A well known database system, which is in most cases more
+   efficient than SQLite.
+-  `PostgreSQL`_. Some people found it better than MySQL.
+
+We advice you to use MySQL because it is more efficient. In this case,
+you should create a new database (for example ``wallabag``), a new user
+(for example ``wallabag``) and a password (here ``YourPassWord``). To do
+this, you can use ``phpMyAdmin``, or launch the following commands:
+
+::
+
+    mysql -p -u root
+    mysql> CREATE DATABASE wallabag;
+    mysql> GRANT ALL PRIVILEGES ON `wallabag`.* TO 'wallabag'@'localhost' IDENTIFIED BY 'VotreMotdePasse';
+    mysql> exit
+
+*Note:* If you’re using MySQL or Postgresql, you have to **fill all the
+fields**, otherwise the installation will not work and an error message
+will tell you what’s wrong. You must create the database that you will
+use for wallabag manually with a tool like PHPMyAdmin or the console.
+
+Permissions
+~~~~~~~~~~~
+
+Your web server needs a writing access to the ``assets``, ``cache`` and
+``db`` directories. Otherwise, a message will report that the
+installation is impossible:
+
+::
+
+    sudo chown -R www-data:www-data /var/www/html/wallabag
+
+Installation of wallabag. At last.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Access to wallabag from your web browser:
+``http://votreserveur.com/wallabag``. If your server is correctly
+configured, you directly reach the setup screen.
+
+Select the type of database (``sqlite``, ``mysql`` or ``postgresql``)
+and fill the information about your database. In the case of the databse
+MySQL created before, the standard configuration will be:
+
+::
+
+    Database engine:    MySQL
+    Server:             localhost
+    Database:           wallabag
+    Username:           wallabag
+    Password:           YourPassWord
+
+Finally, Create your first user and his/her password (different from the
+database user).
+
+Wallabag is now installed.
+
+Login
+-----
+
+From your web browser, you reach the login screen: fill your username
+and your password to connect to your account.
+
+Enjoy!
+
+.. _SQLite: http://php.net/manual/fr/book.sqlite.php
+.. _MySQL: http://php.net/manual/fr/book.mysql.php
+.. _PostgreSQL: http://php.net/manual/fr/book.pgsql.php
+.. _Framabag: https://framabag.org/
+.. _Download the latest wallabag version: http://wllbg.org/latest
+.. _PHP 5.3.3 or above: http://php.net/manual/fr/install.php
+.. _PDO: http://php.net/manual/en/book.pdo.php
+.. _XML for PHP: http://php.net/fr/xml
+.. _PCRE: http://php.net/fr/pcre
+.. _ZLib: http://php.net/en/zlib
+.. _mbstring: http://php.net/en/mbstring
+.. _iconv: http://php.net/en/iconv
+.. _DOM/XML: http://php.net/manual/en/book.dom.php
+.. _Data filtering: http://php.net/manual/fr/book.filter.php
+.. _GD: http://php.net/manual/en/book.image.php
+.. _Tidy for PHP: http://php.net/fr/tidy
+.. _cURL: http://php.net/fr/curl
+.. _Parse ini file: http://uk.php.net/manual/en/function.parse-ini-file.php
+.. _allow\_url\_fopen: http://www.php.net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen
+.. _gettext: http://php.net/manual/fr/book.gettext.php
+.. _enable *Basic Authentication*: https://technet.microsoft.com/en-us/library/cc772009%28v=ws.10%29.aspx

docs/en/Administrator/multiusers.rst

@@ -0,0 +1,47 @@
+.. _`Multi users`:
+
+Multi users
+===========
+
+Create a new account
+--------------------
+
+Administrator mode
+------------------
+
+If you want to use wallabag with several persons, you can create new
+accounts from the configuration page.
+
+At the bottom of this page there is a form where you should input a user
+name and a password.
+
+It is now possible to login to this account from the login page of
+wallabag.
+
+No information are shared among the accounts.
+
+Open registration mode
+----------------------
+
+Starting from version 1.9, the administrator can let users register by
+themselves. This is done by changing the following lines in the
+configuration file:
+
+::
+
+    // registration
+    @define ('ALLOW_REGISTER', FALSE);
+    @define ('SEND_CONFIRMATION_EMAIL', FALSE);
+
+Then, a user will be able to enter his/her user name and password to
+create his/her own account. Depending on the configuration, a
+confimation email can be sent to users who gave an email address.
+
+Remove an account
+-----------------
+
+It is possible to remove your own account from the configuration page.
+You simply have to enter your password and to ask for the removal.
+
+Of course, when there is only one account, it is impossible to remove
+it.

docs/en/Administrator/sessions.rst

@@ -0,0 +1,26 @@
+Session issues
+==============
+
+If you end up disconnected even while checking the *Stay signed in
+checkbox*, please run the following commands as root (or with sudo) :
+
+::
+
+    mkdir /var/lib/wallabag-sessions
+    chown www-data:www-data /var/lib/wallabag-sessions
+
+*NOTE : The www-data user and group may not exist, you may use
+``chown http:http /var/lib/wallabag-sessions`` instead*
+
+Then, using apache add:
+``php_admin_value session.save_path /var/lib/wallabag-sessions`` to your
+apache vhost, for instance ``wallabag-apache.conf`` Finally, restart
+apache, for instance like this : ``/etc/init.d/apache2 restart``
+
+If you’re using nginx, add
+``php_admin_value[session.save_path] = /var/lib/wallabag-sessions`` in
+your nginx configuration file. Then, restart nginx :
+``/etc/init.d/nginx restart``
+
+*NOTE : If you’re using systemd, you should do
+``systemctl restart apache2`` (or nginx).*

docs/en/Administrator/update.rst

@@ -0,0 +1,30 @@
+Update wallabag
+===============
+
+Update an existing wallabag installation
+----------------------------------------
+
+In order to update your installation, download and unzip the archive
+into your installation folder. For example on Ubuntu/Debian:
+
+::
+
+    wget http://wllbg.org/latest
+    unzip latest
+    rsync -ur wallabag-version-number/* /var/www/html/wallabag/ # could be another location such as /srv/html, /usr/share/nginx/html
+
+After that, just access wallabag in your browser and follow the
+instructions to finish the update.
+
+You can verify at the bottom of the configuration page that you’re
+running the last version.
+
+**If it fails**, just delete the ``install`` folder and clear the cache:
+
+::
+
+    cd /var/www/html/wallabag/
+    rm -r cache/* install/
+
+Clearing the cache is also possible in the configuration page, clicking
+on the link ``Delete Cache``.

docs/en/Developer/create_new_theme.rst

@@ -0,0 +1,4 @@
+Create new theme
+================
+
+TODO

docs/en/Developer/git_repo.rst

@@ -0,0 +1,29 @@
+Git repository
+==============
+
+If you wish to contribute to the project by suggesting new features or
+by fixing some bugs, please follow the recommendations below regarding
+the git repository available at https://github.com/wallabag/wallabag.
+
+Current state
+-------------
+
+To manage the different versions of wallabag, we use Git.
+
+There are multiple branches for the source code of wallabag web app:
+
+-  ``master`` branch : this is the stable branch, downloaded by those
+   who wish to install wallabag for their own use.
+-  ``dev`` branch : before being added on ``master`` branch, all bug
+   fixes and new features must go on that branch. This branch is not
+   recommended for production use.
+-  ``v2`` branch : this is the branch for a revamp of wallabag.
+   A whole chapter is to be focused on it.
+
+Workflow
+--------
+
+All the rules for contributing to the git repository are in the
+`CONTRIBUTING.md file of
+wallabag <https://github.com/wallabag/wallabag/blob/master/CONTRIBUTING.md>`__.
+Please read carefully this file before you make any change.

docs/en/Developer/write_config_files.rst

@@ -0,0 +1,52 @@
+Write config files
+==================
+
+wallabag can use specific site config files to parse website articles.
+These files are stored in the
+```inc/3rdparty/site_config/standard`` <https://github.com/wallabag/wallabag/tree/master/inc/3rdparty/site_config/standard>`__
+folder.
+
+The format used for these files is
+`XPath <http://www.w3.org/TR/xpath20/>`__. Look at some examples in the
+folder.
+
+Automatic config files generation
+---------------------------------
+
+Fivefilters has created a `very useful
+tool <http://siteconfig.fivefilters.org/>`__ to create config files. You
+just type in the adress of the article to work on with, and you select
+the area containing the content you want.
+
+.. figure:: https://lut.im/RNaO7gGe/l9vRnO1b
+   :alt: siteconfig
+
+   siteconfig
+| You should confirm this area by trying with other articles.
+| When you got the right area, just click on *Download Full-Text RSS
+site config* to download your file.
+
+Manual config file generation
+-----------------------------
+
+If Fivefilters tool doesn't work correctly, take a look at the source
+(Ctrl + U on Firefox and Chromium). Search for your content and get the
+``class`` or the ``id`` attribute of the area containing what you want.
+
+Once you've got the id or class, you can write for example one or
+another of these lines:
+
+::
+
+    body: //div[@class='myclass']
+    body: //div[@id='myid']
+
+Then, test you file. If you got the right content but you want to strip
+unnecessary parts, do:
+
+::
+
+    strip: //div[@class='hidden']
+
+You can look at other options for siteconfig files
+`here <http://help.fivefilters.org/customer/portal/articles/223153-site-patterns>`__.

docs/en/User/configure_wallabag.rst

@@ -0,0 +1,118 @@
+.. _`Configure wallabag`:
+
+Configure wallabag
+==================
+
+From the configuration menu, you can change some of wallabag's options.
+
+Some parts won't be detailed here, as they have a dedicated chapter in
+the documentation (:ref:`RSS feeds`, :ref:`Import / Export`, :ref:`ePub conversion` and :ref:`Multi users`).
+
+Saving articles
+---------------
+
+You'll find help about the different ways to save articles to your
+wallabag here.
+
+Save article field
+~~~~~~~~~~~~~~~~~~
+
+Enter a link in the field and click “bag it!” to save.
+
+Browser extensions
+~~~~~~~~~~~~~~~~~~
+
+Links to download extensions for your favourite browser, Firefox or
+Chrome.
+
+Mobile apps
+~~~~~~~~~~~
+
+Links to download mobile apps, Android, iOS or Windows Phone.
+
+For Android, you have the choice to download either from Google's Play
+Store of from the Free and Open Source market
+`F-Droid <https://f-droid.org>`__
+
+Bookmarklet
+~~~~~~~~~~~
+
+Lastly, you can use the bookmarklet. A bookmarklet is a simple link you
+can drag to your browser's bookmarks. Once it's in your bookmarks,
+simply clicking on it will save the webpage you're currently viewing to
+your wallabag.
+
+Feeds
+-----
+
+Plese refer to `RSS feeds <rss_feed.html>`__ for more details.
+
+.. _`Howto change theme`:
+
+Theme
+-----
+
+As they say, “all tastes and colors are found in nature”. That's why
+wallabag allows you to change its appearance through the use of themes,
+in order to please everyone.
+
+Select the theme of your choice from the drop down list and confirm by
+clicking on **Update**.
+
+Language
+--------
+
+Select the language of your choice in the drop down list and confirm by
+clicking on **Update**.
+
+Import
+------
+
+Please refer to `Import/Export <import_export.html>`__ for more details.
+
+Export
+------
+
+Please refer to `Import/Export <import_export.html>`__ for more details.
+
+Clear the cache
+---------------
+
+The cache allows wallabag perform certain functions faster.
+
+After updating wallabag, it is advised to clear the cache.
+
+Click on “delete cache” to do so (no confirmation will be asked).
+
+Password
+--------
+
+Fill in your new password in the two dedicated fields and confirm by
+clicking on **Update**.
+
+You will be disconnected and will have to enter your new password to
+access your wallabag.
+
+User
+----
+
+Add a user here by entering their name, password and (optionnaly) email
+in the corresponding fields.
+
+You may not be able to add a user if don't have the rights to do so.
+
+Remind newly created users to change their password the first time they
+connect to wallabag!
+
+Delete
+------
+
+Delete your user account on wallabag here.
+
+If there is only one account, you won't be able to delete the account.
+
+Upgrade
+-------
+
+Wallabag will check its curent version and if there is a new version
+available and display this information here.

docs/en/User/epub_conversion.rst

@@ -0,0 +1,32 @@
+.. _`ePub conversion`:
+
+ePub conversion
+===============
+
+To enable you to read your articles on a e-reader, wallabag can convert
+them to the ePub format, and hence create an eBook for your long winter
+evenings.
+
+A word of caution
+-----------------
+
+Be careful, the creation of ePub files can be very resource demanding
+for the server on which wallabag is installed. It depends on the number
+of articles and on their length. Do not create a really big eBook if
+this is not necessary.
+
+Where to convert the articles
+-----------------------------
+
+You can convert your articles at various places in wallabag:
+
+-  on the reading page of an article: the ePub link will convert this
+   article only
+-  from the list of articles (unread, favorite or archived articles,
+   articles with a tag): a link at the bottom of the page allows you to
+   convert all the article of this category
+-  from a search: the link is at the bottom of the page
+-  from the configuration page: you can convert all your articles,
+   whatever the category to which they belong
+
+TODO talk about calibre

docs/en/User/framabag_account_creation.rst

@@ -0,0 +1,49 @@
+.. _`Framabag account creation`:
+
+Framabag account creation
+=========================
+
+If you do not want to install and update wallabag, or if you do not have
+the know-how to install it, it is possible to create an account for free
+at `Framabag.org <https://www.framabag.org>`__.
+
+Account creation
+----------------
+
+Click on the button **Créez votre compte / Create your account**.
+
+You have to input some information: your username, your password and
+your email address. Your address is used only to validate your account,
+except if you check the box to subscribe the newsletter (3 to 4 messages
+per year).
+
+Once this form validated, you will receive an email with the
+confirmation link. Click on it to create your account.
+
+You will receive a last email with the address of your Framabag account,
+which will look like ``https://www.framabag.org/u/Your-username``.
+
+Information storage
+-------------------
+
+Framabag use one database per user. We do not and will not use your
+stored data.
+
+You have forgotten your password
+--------------------------------
+
+| If you have forgotten your password to get connected to Framabag, a
+form is available `on the main page of the
+service <https://www.framabag.org>`__.
+| Fill it, and a confirmation will be sent to you and will allow you to
+input a new password.
+
+Account deletion
+----------------
+
+If you wish to delete your account, contact us by email:
+hello@wallabag.org using the address your created your account with, and
+state your username.
+
+We will answer you after your account has been deleted: then, no
+information about you will be stored by Framabag.

docs/en/User/import_export.rst

@@ -0,0 +1,107 @@
+.. _`Import / Export`:
+
+Import and export data
+======================
+
+Import
+------
+
+To import data in wallabag, go to the page **Configuration**.
+
+Caution
+~~~~~~~
+
+Data import can be a **demanding process** for your server. Hence, it is
+done in two steps:
+
+-  Insertion of the URL in the wallabag database
+-  in the second step, the retrieval, for each article, of its full
+   content.
+
+These two steps cannot be done concurrently, because it let us the
+possibility to import thousands of links, but today, wallabag does not
+have sufficient technical capabilities to do this task automatically.
+
+From Pocket
+~~~~~~~~~~~
+
+Export your data from Pocket
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+From your Pocket account, go to the options. TODO
+
+Import your Pocket data
+^^^^^^^^^^^^^^^^^^^^^^^
+
+From the configuration page of wallabag, section **Import**, select the
+file ``ril_export.html`` generated by Pocket, then click on **Import**.
+Wallabag only insert these links in the database. Now, you have to get
+the content of each article.
+
+For this, click on ``Click to finish import``: wallabag will fetch the
+content of 10 articles at a time.
+
+TODO
+
+TODO new ticket: why when a click is done, this does not load in a loop?
+I believe this was doing this ping @mariroz
+
+From Instapaper
+~~~~~~~~~~~~~~~
+
+Export your data from Instapaper
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+Import your Instapaper data
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+From Readability
+~~~~~~~~~~~~~~~~
+
+Export your data from Readability
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+Import your Readability data
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+From wallabag
+~~~~~~~~~~~~~
+
+Since you can export your data from wallabag (see below), it is of
+course possible to re-import them.
+
+In the import form, select your wallabag-exported file (format JSON).
+Start the import, et voilà.
+
+Unlike the above imports, this process is shorter because all the data
+(title and content of the articles) are already included in the file.
+Hence wallabag does not have to access each URL. However, the import
+file is necessarily bigger.
+
+From a HTML or JSON file
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+Export
+------
+
+It is possible to export your data from the page **Configuration** of
+wallabag. Several reasons to do this:
+
+-  re-install of wallabag
+-  leave the Framabag service to install your own wallabag
+-  a user with an account on a multi-user wallabag want to have his/her
+   own wallabag installation
+-  ...
+
+This will lead you to download a file `at the JSON
+format <http://en.wikipedia.org/wiki/JavaScript_Object_Notation>`__. As detailed above, you can import this file in wallabag.

docs/en/User/issue_with_article.rst

@@ -0,0 +1,36 @@
+.. _`Article is not displayed properly`:
+
+My article is not displayed properly in wallabag
+================================================
+
+If you think wallabag do not copy well the content of an article (empty
+or incomplete text), here are some suggestions.
+
+Ask for help
+------------
+
+Via an email or a ticket, do not forget to give some information that
+are important for us to better solve the problem:
+
+-  The URL of the article
+-  What wallabag displays
+-  What you were expecting
+-  The wallabag version of if you use Framabag
+
+Open a ticket on github
+~~~~~~~~~~~~~~~~~~~~~~~
+
+To open a new ticket, you should `go to
+github <https://github.com/wallabag/wallabag/issues/new>`__. An account
+is required. Do not forget to send us the information listed above.
+
+Send us an email
+~~~~~~~~~~~~~~~~
+
+Send us the link in a email to the address
+`hello@wallabag.org <mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag>`__. Do not forget to send us the information listed above.
+
+Solve this display problem
+--------------------------
+
+TODO

docs/en/User/organize_articles.rst

@@ -0,0 +1,109 @@
+.. _`Organize articles`:
+
+Organize articles
+=================
+
+To be able to find more easily your articles, several methods are
+available.
+
+Tags
+----
+
+Assign a tag
+~~~~~~~~~~~~
+
+When saving an article
+^^^^^^^^^^^^^^^^^^^^^^
+
+To tag an article when saving it, just click on the tag icon next to the
+URL field before hitting the Save button. At the moment, it is possible
+only to do this from the web interface, but it could come to some apps
+or extensions.
+
+From the article
+^^^^^^^^^^^^^^^^
+
+To tag an already-saved article, go to the reading page of the article.
+There is a part ``tags`` followed with a pencil. Click on the pencil.
+
+Input in the box the tags you want to assign. Add as many tags as you
+want. They need to be separated by commas and not spaces.
+Auto-completion is available here: when you type the first letters of an
+existing tag, it is not necessary to type the whole word. Select it in
+the drop-down list. Once all your tags are inputted, click on the button
+**Tag**.
+
+Then, you can go back to your article and read it.
+
+From the search
+^^^^^^^^^^^^^^^
+
+A full chapter on search is available. Here, we will describe only how
+to assign a tag from your search.
+
+When your search displays results, there is a link
+``Apply the tag ABCD to this search`` at the bottom of the page. Click
+on it: a tad depending on your search (here ``ABCD``) will be assigned
+to all the articles found.
+
+Find all the articles with a given tag
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the wallabag menu, click on **Tags**. Then, all the tags you have
+created are displayed, sorted by the number of articles for each tag.
+Click on one of these tags to find all the articles with this tag.
+
+Preferred articles
+------------------
+
+When you wish to set aside an article, you can mark it as preferred.
+
+Set an article as favorite
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+From the reading page of an article, or from a list of articles (such as
+the list of unread articles), you can set an article as favorite simply
+by a click on the star which is displayed. Click again on the star will
+remove the **favorite** status of this article.
+
+Find all the favorite articles
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the wallabag menu, click on **Favorites** to display the list of all
+the articles that you have set as favorite.
+
+Archived articles
+-----------------
+
+When you have read an article, you can archive it: hence it will not be
+displayed in your list of unread articles.
+
+Archiving an article does not remove it from wallabag.
+
+Archive an article
+~~~~~~~~~~~~~~~~~~
+
+| From the reading page of an article, or from a list of articles (such
+as the list of unread articles), you can archive an article simply by
+clicking on the icon ✓.
+| Click again on this icon will set back the **unread** status of the
+article.
+
+Find all the archived articles
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the wallabag menu, click on **Archive** to find all the articles that
+you have archived.
+
+Delete an article
+-----------------
+
+Be cautious: the deletion of an article is **definitive**. It is deleted
+from the wallabag database.
+
+To delete an article, a trash icon is displayed on the page of an
+article or of a list of articles (unread articles, favorites or
+archived, for example).
+
+We trust you: that is why there is no confirmation message during the
+deletion.

docs/en/User/read_an_article.rst

@@ -0,0 +1,63 @@
+Read an article
+===============
+
+Reading an article is not difficult in wallabag: you only have to click on the title of the article for it to be displayed.
+
+Back to where you left the article
+----------------------------------
+
+If you stop reading an article halfway through, the next time wallabag will open it right where you left off.
+
+This feature only works with web applications and not with smartphone applications.
+
+Possible actions in an article
+------------------------------
+
+The following actions can be performed through the icons displayed at the top of the page. We assume here that you are using the Baggy theme (see the section on :ref:`Howto change theme`). Icons in other themes are very similar.
+
+Here are the actions, in the order of appearance of the icons.
+
+Read the original article
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Open the article on its original location.
+
+Mark the article as read
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Archive the article, which will be placed into the **Archive** category of the wallabag menu. Clicking again on this button will move the article back to the **unread** category.
+
+Mark the article as favorite
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mark the article as favorite, and it will be placed into the **Favorites** category of the wallabag menu. Clicking again on this button will remove the favorite status.
+
+Delete the article
+~~~~~~~~~~~~~~~~~~
+
+Delete the article from wallabag permanently. It cannot be restored. Be careful: no confirmation message is displayed.
+
+Share through twitter
+~~~~~~~~~~~~~~~~~~~~~
+
+Share the title and the original link of the article on twitter.
+
+Share via email
+~~~~~~~~~~~~~~~
+
+Share the title and the original link of the article via e-mail.
+
+Print the article
+~~~~~~~~~~~~~~~~~
+
+Open the print window of the browser.
+
+Convert into ePub
+~~~~~~~~~~~~~~~~~
+
+Convert the article into ePub format: see the section on :ref:`ePub conversion`.
+
+Notify us that the article appears wrong
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Notify the wallabag developers that an article is not displayed as expected (see the section on :ref:`Article is not displayed properly`).

docs/en/User/rss_feed.rst

@@ -0,0 +1,41 @@
+.. _`RSS feeds`:
+
+RSS feeds
+=========
+
+The RSS feeds allow you to:
+
+-  read your articles from your favorite RSS feed reader.
+-  to activate the reading features for smartphone softwares
+
+| First, you must activate the RSS feature by generating a feed token.
+| Go to **config** in wallabag and generate a token in the section
+**Feeds**. You can generate a new token at any time.
+
+Read articles
+-------------
+
+Once the token created, you have access to three RSS feeds:
+
+-  the one of the unread articles
+-  the one of the favorites articles
+-  the one of the archived articles
+
+Add the feed you want to your RSS feed reader. Be careful: when you will
+be reading an article from your feed reader, this will not set it as
+read in wallabag.
+
+Share your readings
+~~~~~~~~~~~~~~~~~~~
+
+If you wish to share your readings with somebody, send him for example
+the RSS feed of your favorite articles. Hence, as soon as an article
+will be set as favorite in wallabag, this person will be able to read it
+too.
+
+Activate the features for smartphones
+-------------------------------------
+
+You ave created an RSS feed token. It will also be useful to you to
+configure your smartphone software. For more information about
+smartphone sofwares, you can read :ref:`Save your first article`.

docs/en/User/save_your_first_article.rst

@@ -0,0 +1,226 @@
+.. _`Save your first article`:
+
+Save your first article
+=======================
+
+Once connected on wallabag, you have many ways to save an article.
+
+From the web application
+------------------------
+
+Let’s see first how to do from the web application. In the menu, you
+have a link **save a link**. Clicking on it, a form shows up: you simply
+have to type the web adress of the article you want to save.
+
+Confirm to store the content of the article.
+
+By default, only the text is saved. If you want to store a copy of the
+images on your server, you have to enable the setting
+*DOWNLOAD\_PICTURES*. Read the chapter on hidden options for more
+information.
+
+From the bookmarklet
+--------------------
+
+From `Wikipedia’s definition`_
+
+    A bookmarklet is a `bookmark`_ stored in a `web browser`_ that
+    contains `JavaScript`_\ commands to extend the browser’s
+    functionality.
+
+    Bookmarklets are unobtrusive scripts stored as the URL of a bookmark
+    in a web browser or as a hyperlink on a web page.
+
+    When clicked, a bookmarklet performs some function, one of a wide
+    variety such as a search query or data extraction. Bookmarklets are
+    usually `JavaScript programs`_.
+
+From the wallabag’s menu, click on **settings**. On the first part of
+this page, we have listed all the ways to save an article. You’ll find
+the bookmarklet (it’s the ``Bag it!`` link) to drag and drop in the
+bookmarks bar of your web browser. From now on, when you want to save
+the article you are browsing, you just have to click on this bookmarklet
+and the article will be automatically saved.
+
+From your smartphone
+--------------------
+
+Above all else
+~~~~~~~~~~~~~~
+
+To use a smartphone application, you have to enable RSS feeds from the
+settings panel of wallabag. Then some information will be displayed,
+like your security token. Read the chapter on RSS feeds for more
+information.
+
+Android
+~~~~~~~
+
+Installation and configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can download the android application from the `Google Play Store`_
+and from `F-droid`_. It’s the exact same application on those two
+stores.
+
+Once installed, start the application, go to the **settings** part et
+fill in the **URL (complete address of your wallabag installation or
+your Framabag account)** and **User ID (in most cases, you’ll have to
+put 1)** fields. If you have created multiple accounts from wallabag,
+you will have to to fill the user account you want to connect to your
+application and your security **Token** (enter properly all the token’s
+letters as seen in the settings part of wallabag).
+
+Saving of an article
+^^^^^^^^^^^^^^^^^^^^
+
+Now that everything is correctly set up, as soon as you browse on your
+smartphone’s web browser, you can share an article in wallabag at any
+time from the **Share** menu: you’ll find a **Bag it!** entry which will
+add your article in wallabag.
+
+Reading
+^^^^^^^
+
+When you open the application, click on Synchronize: your recently saved
+articles will be downloaded on your smartphone.
+
+You don’t need an internet connection anymore: click on **List
+articles** to start your reading.
+
+At the end of each article, a **Mark as read** button allows you to
+archive the article.
+
+To date, the synchronisation occurs in one direction (from wallabag to
+the application), thus preventing mark as read an article on wallabag
+from your smartphone.
+
+iOS
+~~~
+
+Installation and configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can download the iOS application from the `AppStore`_.
+
+Once installed, configure the app by filling following fields inside the
+settings: the **URL (complete address of your wallabag installation or
+your Framabag account)** and **User ID (in most cases, you’ll have to
+put 1)** field. If you have created multiple accounts from wallabag, you
+will have to to fill the user account you want to connect to your
+application and your security **Token** (enter properly all the token’s
+letters as seen in the settings part of wallabag).
+
+Usage
+^^^^^
+
+If the app is configured correctly, the app will automatically download
+the articles from your wallabag (use **pull-to-refresh** to trigger this
+update manually). Once an article is downloaded, it’ll be available
+offline from your app.
+
+Unfortunately you can only locally mark an article as read (it will not
+synchronise to your online wallabag).
+
+Saving articles
+~~~~~~~~~~~~~~~
+
+If you’re browsing a website and want to add the current article to your
+wallabag, simply tap the **Share**-button and select **Bag it!** (if you
+don’t find the wallabag icon, have a look in the **more**-menu). If
+everything is set up correctly, your article will be saved (you may have
+to login from time to time).
+
+Windows Phone
+~~~~~~~~~~~~~
+
+Installation and configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can download the Windows Phone application from the `Windows Store`_
+or directly from your smartphone’s Store.
+
+Once installed, the application will show you a notification on the
+first launch, asking the configuration of your wallabag server. Go to
+the **Settings** part of the application by pressing the three dots menu
+at the bottom of the screen, then fill in the **URL (complete address of
+your wallabag installation or your Framabag account)** and **User ID (in
+most cases, you’ll have to put 1)** fields.
+
+If you have created multiple accounts from wallabag, you will have to to
+fill the user account you want to connect to your application and your
+security **Token** (enter properly all the token’s letters as seen in
+the setting part of wallabag).
+
+From your web browser
+---------------------
+
+Firefox Classic Add-on
+~~~~~~~~~~~~~~~~~~~~~~
+
+Download the Firefox add-on at `addons.mozilla.org`_ and install it like
+any other Firefox add-on.
+
+In the add-on’s settings, fill the complete URL of your installation of
+wallabag or your Framabag account.
+
+Personalize the Firefox toolbar to add wallabag (**W** icon). When you
+find an article you want to save, click on this icon: a new window will
+open to add the article and will close itself automatically.
+
+Firefox Social API Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*Available from wallabag v1.9.1 only*
+
+You will need an https connection to use this. It’s a Firefox
+`requirement`_, sorry.
+
+With Firefox 29+ versions, your browser comes with an integrated
+interface to share things to multiple social services directly from your
+browser. In the Firefox interface, it is shown a paper plane-like icon
+that you will use to share a page, which means here, save an article.
+You can add the service by going into the Config page of wallabag, then
+click on Mozilla Services Social API Extension. You must also accept to
+use Firefox Services.
+
+Chrome
+~~~~~~
+
+Download the Chrome add-on `on the dedicated website`_ and install it
+like any other Chrome add-on.
+
+In the add-on’s settings, fill the complete URL of your installation of
+wallabag or your Framabag account.
+
+During the addon’s installation, a new icon appear in Chrome toolbar (a
+**W** icon). When you find an article you want to save, click on this
+icon: a popup will appear to confirm that your article has been saved.
+
+Opera
+~~~~~
+
+The recent versions of Opera (15+) allow to install add-ons compatible
+with Chrome.
+
+First, install the add-on named `Download Chrome Extensions`_ which will
+allow you to install add-ons from the Chrome Web Store. Then, go `to to
+Google site`_ and get the Chrome add-on by clicking on *Add to Opera*. A
+message will invite you to confirm this action because this add-on is
+not coming from a certified source. The behavior will be the same as for
+Chrome (see above).
+
+.. _Wikipedia’s definition: http://fr.wikipedia.org/wiki/Bookmarklet
+.. _bookmark: http://en.wikipedia.org/wiki/Internet_bookmark
+.. _web browser: http://en.wikipedia.org/wiki/Web_browser
+.. _JavaScript: http://en.wikipedia.org/wiki/JavaScript
+.. _JavaScript programs: http://en.wikipedia.org/wiki/Computer_program
+.. _Google Play Store: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
+.. _F-droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
+.. _AppStore: https://itunes.apple.com/app/id828331015
+.. _Windows Store: https://www.microsoft.com/en-us/store/apps/wallabag/9nblggh11646
+.. _addons.mozilla.org: https://addons.mozilla.org/firefox/addon/wallabag/
+.. _requirement: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Manifest#Manifest_Contents
+.. _on the dedicated website: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj
+.. _Download Chrome Extensions: https://addons.opera.com/en/extensions/details/download-chrome-extension-9/
+.. _to to Google site: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj

docs/en/User/search.rst

@@ -0,0 +1,21 @@
+Search content in wallabag
+==========================
+
+To enable you to find an article quickly, we set up a full search
+engine.
+
+Click on **Search** in the wallabag menu. Then, enter your search terms.
+
+Wallabag will go through all your articles, and lists the ones
+containing the search terms in their title, their content or their URL.
+
+Convert this search into ePub format
+------------------------------------
+
+You can convert the listed articles to the ePub format, so that you can
+read them in your e-reader, for example. Look at :ref:`ePub conversion` for more about this.
+
+Assign a tag to your search results
+-----------------------------------
+
+You can create a tag based on your search criteria. Loot at :ref:`Organize articles` for more about this.

docs/en/conf.py

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag'
+copyright = u'2013-2015, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagdoc'
+latex_elements = {
+
+}
+
+latex_documents = [
+  ('index', 'wallabag.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabag', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")
+
+# Guzzle theme options (see theme.conf for more information)
+html_theme_options = {
+
+    # Set the path to a special layout to include for the homepage
+    # "index_template": "homepage.html",
+
+    # Allow a separate homepage from the master_doc
+    # homepage = index
+
+    # Set the name of the project to appear in the nav menu
+    # "project_nav_name": "Guzzle",
+
+    # Set your Disqus short name to enable comments
+    # "disqus_comments_shortname": "my_disqus_comments_short_name",
+
+    # Set you GA account ID to enable tracking
+    # "google_analytics_account": "my_ga_account",
+
+    # Path to a touch icon
+    # "touch_icon": "",
+
+    # Specify a base_url used to generate sitemap.xml links. If not
+    # specified, then no sitemap will be built.
+    #"base_url": "http://guzzlephp.org"
+
+    # Allow the "Table of Contents" page to be defined separately from "master_doc"
+    # tocpage = Contents
+
+    # Allow the project link to be overriden to a custom URL.
+    # projectlink = http://myproject.url
+}

docs/en/index.rst

@@ -0,0 +1,58 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** is a read-it-later application: it saves a web page by
+keeping content only. Elements like navigation or ads are deleted.
+
+The main documentation for the site is organized into a couple sections:
+
+* :ref:`user-docs`
+* :ref:`admin-docs`
+* :ref:`dev-docs`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: User Documentation
+
+   user/create_account
+   user/login
+   user/configuration
+   user/first_article
+   user/import
+
+user/organize
+user/filters
+User/read_an_article
+User/search
+User/epub_conversion
+User/issue_with_article
+User/rss_feed
+User/import_export
+
+.. _admin-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Admin Documentation
+
+   Administrator/install
+   Administrator/update
+   Administrator/hidden_options
+   Administrator/multiusers
+   Administrator/sessions
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Developer Documentation
+
+   Developer/write_config_files
+   Developer/create_new_theme
+   Developer/git_repo

docs/en/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

docs/en/user/configuration.rst

@@ -0,0 +1,61 @@
+Configuration
+=============
+
+Now you're logged in, it's time to configure your account as you want.
+
+Click on ``Config`` menu. You have four tabs: ``Settings``, ``RSS``, ``User information`` and ``Password``.
+
+Settings
+--------
+
+Theme
+~~~~~
+
+wallabag is customizable. You can choose your prefered theme here. You can also create a new one, a chapter is dedicated for this. The default theme is ``Material``, it's the theme used in the documentation screenshots. 
+
+Items per page
+~~~~~~~~~~~~~~
+
+You can change the number of articles displayed on each page.
+
+Language
+~~~~~~~~
+
+You can change the language of wallabag interface.
+
+RSS
+---
+
+wallabag provides RSS feeds for each article status: unread, starred and archive.
+
+Firstly, you need to create a personal token: click on ``Create your token``.
+It's possible to change your token by clicking on ``Reset your token``.
+
+Now you have three links, one for each status: add them into your favourite RSS reader.
+
+You can also define how many articles you want in each RSS feed (default value: 50).
+
+User information
+----------------
+
+You can change your name, your email address and enable ``Two factor authentication``.
+
+Two factor authentication
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components.
+
+https://en.wikipedia.org/wiki/Two-factor_authentication
+
+If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email. You have to put this code on the following form.
+
+.. image:: ../../img/user/2FA_form.png
+   :alt: Two factor authentication
+   :align: center
+
+If you don't want to receive a code each time you want to login, you can check the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
+
+Password
+--------
+
+You can change your password here.

docs/en/user/create_account.rst

@@ -0,0 +1,43 @@
+Create an account
+=================
+
+On the login page, click on ``Register`` button.
+
+.. image:: ../../img/user/registration_form.png
+   :alt: Registration form
+   :align: center
+
+You have to fill the form. Please sure to type a valid email address, we'll send you an activation email.
+
+.. image:: ../../img/user/sent_email.png
+   :alt: Email was sent to activate account
+   :align: center
+
+Check your inbox, you now have a new mail with a link like this ``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``. Click on it to activate your account.
+
+Your account is now activated.
+
+.. image:: ../../img/user/activated_account.png
+   :alt: Welcome on board!
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I can't valid the registration form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure that all fields are well filled:
+
+* valid email address
+* same passwords in two fields
+
+I don't receive my activation email
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Are you sure your email address was correct? Did you check your spams folder?
+
+When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+~~~~~~~~~~~~~~~
+
+You already enabled your account or the URL of the activation email is wrong.

docs/en/user/first_article.rst

@@ -0,0 +1,79 @@
+Save your first article
+=======================
+
+The main purpose of wallabag is to save web articles. You have many ways to do it.
+
+By using a bookmarklet
+----------------------
+
+On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser.
+
+Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved.
+
+By using the classic form
+-------------------------
+
+In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Top bar
+   :align: center
+
+Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved.
+
+By using a browser add-on
+-------------------------
+
+Firefox
+~~~~~~~
+
+Firefox Classic Add-on
+^^^^^^^^^^^^^^^^^^^^^^
+
+Download the Firefox add-on at `addons.mozilla.org`_ and install it like
+any other Firefox add-on.
+
+In the add-on’s settings, fill the complete URL of your installation of
+wallabag or your Framabag account.
+
+Personalize the Firefox toolbar to add wallabag (**W** icon). When you
+find an article you want to save, click on this icon: a new window will
+open to add the article and will close itself automatically.
+
+Firefox Social API Service
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Available from wallabag v1.9.1 only*
+
+You will need an https connection to use this. It’s a Firefox
+`requirement`_, sorry.
+
+With Firefox 29+ versions, your browser comes with an integrated
+interface to share things to multiple social services directly from your
+browser. In the Firefox interface, it is shown a paper plane-like icon
+that you will use to share a page, which means here, save an article.
+You can add the service by going into the Config page of wallabag, then
+click on Mozilla Services Social API Extension. You must also accept to
+use Firefox Services.
+
+Chrome
+~~~~~~
+
+By using your smarphone application
+-----------------------------------
+
+Android
+~~~~~~~
+
+Firefox OS
+~~~~~~~~~~
+
+Windows Phone
+~~~~~~~~~~~~~
+
+iOS
+~~~
+
+
+.. _addons.mozilla.org: https://addons.mozilla.org/firefox/addon/wallabag/
+.. _requirement: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Manifest#Manifest_Contents

docs/en/user/import.rst

@@ -0,0 +1,39 @@
+Migrate to wallabag
+===================
+
+From wallabag 1.x
+-----------------
+
+Export your data from your wallabag 1.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
+
+.. image:: ../../img/user/export_wllbg_1.png
+   :alt: Export from wallabag 1.x
+   :align: center
+
+You will have a ``wallabag-export-1-1970-01-01.json`` file.
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on  ``Import`` link in the menu, select your export file on your computer and import it.
+
+.. image:: ../../img/user/import_wllbg.png
+   :alt: Import from wallabag 1.x
+   :align: center
+
+All your wallabag 1.x articles will be imported.
+
+From Pocket
+-----------
+
+From Instapaper
+---------------
+
+From Readability
+----------------
+
+From HTML or JSON file
+----------------------

docs/en/user/login.rst

@@ -0,0 +1,20 @@
+Login
+=====
+
+Your account is now enabled, congratulations!
+
+To login to wallabag, fill the form on login page.
+
+If you are on your personal computer and you want to stay connected, you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
+
+.. image:: ../../img/user/login_form.png
+   :alt: Login form
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I forgot my password
+~~~~~~~~~~~~~~~~~~~~
+
+You can reset your password by clicking on ``Forgot your password?`` link, on the login page. Then, fill the form with your email address

docs/fr/Administrateur/MAJ_wallabag.md

@@ -0,0 +1,22 @@
+---
+language: Français
+currentMenu: upgrade
+subTitle: Mettre à jour wallabag
+---
+
+# Mettre à jour wallabag
+
+ Pour mettre à jour votre installation, téléchargez et décompressez l’archive dans votre installation (ici `/var/www/html/wallabag/`) :
+
+    wget http://wllbg.org/latest
+    unzip latest
+    rsync -ur wallabag-version-number/* /var/www/html/wallabag/
+
+Supprimez le répertoire `install` et videz le cache :
+
+    cd /var/www/html/wallabag/
+    rm -r cache/* install/
+
+Pour vider le cache, il est également possible d'aller dans la page de configuration et de cliquer sur le lien pour supprimer le cache.
+
+Vérifiez dans le bas de la page de configuration que la dernière version est bien installée.

docs/fr/Administrateur/Multi-utilisateurs.md

@@ -0,0 +1,35 @@
+---
+language: Français
+currentMenu: multiusers
+subTitle: wallabag multi-utilisateurs
+---
+
+# wallabag multi-utilisateurs
+
+## Créer un nouveau compte
+
+### Mode administrateur
+
+Si vous souhaitez utiliser wallabag pour plusieurs personnes, il est possible de créer de nouveaux comptes depuis la page de configuration.
+
+En bas de cette page se trouve un formulaire où vous devez saisir un nom d'utilisateur et un mot de passe.
+
+Il est maintenant possible de se connecter avec ce compte depuis la page d'identification de wallabag.
+
+Aucune information n'est partagée entre les différents comptes.
+
+### Mode libre
+
+A partir de la version 1.9, l'administrateur peut laisser libre la création de nouveaux comptes. Il doit pour cela l'autoriser en modifiant les lignes suivantes dans le fichier de configuration :
+
+    // registration
+    @define ('ALLOW_REGISTER', FALSE);
+    @define ('SEND_CONFIRMATION_EMAIL', FALSE);
+
+Ensuite, l'utilisateur rentrera lui-même son nom d'utilisateur et son mot de passe pour se créer un compte. Selon la configuration, un courriel de confirmation peut être envoyé aux utilisateurs ayant fourni une adresse électronique.
+
+## Supprimer un compte
+
+Il est possible de supprimer son propre compte, depuis la page de configuration. Il suffit de saisir son mot de passe et de demander la suppression.
+
+Bien évidemment, lorsqu'il ne reste plus qu'un seul compte, il est impossible de le supprimer.

docs/fr/Administrateur/Options_cachees.md

@@ -0,0 +1,40 @@
+---
+language: Français
+currentMenu: hidden
+subTitle: Options cachées
+---
+
+# Options cachées
+
+## Mise en garde
+
+**Attention**, cette partie concerne les utilisateurs avancés. Nous allons modifier un fichier important de wallabag, `inc/poche/config.inc.php`, il est donc conseillé de faire une sauvegarde de celui-ci avant toute modification.  
+**Toute erreur lors d'une modification d'un fichier de wallabag pourra entrainer des dysfonctionnements**.
+
+Ce fichier est créé lorsque vous installez wallabag.  
+Installez donc d'abord wallabag, faites une copie du fichier et ouvrez-le avec ~~Sublime Text~~ votre éditeur de texte préféré.
+
+Dans ce fichier sont définis des paramètres qui ne sont, aujourd'hui, pas encore disponibles dans la page **Configuration** de wallabag.
+
+## Modification des options avancées
+
+Chaque paramètre est défini de cette façon :
+
+    @define ('NOM_DU_PARAMETRE', 'Valeur du paramètre');
+
+Pour chaque ligne, vous ne pouvez modifier que la partie `Valeur du paramètre`.
+
+Listons maintenant les différents paramètres que vous pouvez changer :
+
+* `HTTP_PORT` (par défaut, `80`) : correspond au port HTTP de votre serveur web. À changer si votre serveur web est derrière un proxy. Valeur attendue : un nombre.
+* `SSL_PORT` (par défaut, `443`) : correspond au port SSL de votre serveur web. À changer si votre serveur web utilises SSLH. Valeur attendue : un nombre.
+* `DEBUG_POCHE` (par défaut, `FALSE`) : si vous rencontrez des problèmes avec wallabag, nous vous demanderons peut-être d'activer le mode Debug. Valeurs attendues : `TRUE` ou `FALSE`.
+* `DOWNLOAD_PICTURES` (par défaut, `FALSE`) : permet de télécharger sur votre serveur les images des articles. Ce paramètre est désactivé par défaut pour ne pas surcharger votre serveur web. Nous préférons vous laisser activer vous-même ce paramètre. Valeurs attendues : `TRUE` ou `FALSE`.
+* `SHARE_TWITTER` (par défaut, `TRUE`) : permet d'activer le partage vers twitter. Valeurs attendues : `TRUE` ou `FALSE`.
+* `SHARE_MAIL` (par défaut, `TRUE`) : permet d'activer le partage par email. Valeurs attendues : `TRUE` ou `FALSE`.
+* `SHARE_SHAARLI` (par défaut, `FALSE`) : permet d'activer le partage vers votre installation de Shaarli (gestionnaire de favoris). Valeurs attendues : `TRUE` ou `FALSE`.
+* `SHAARLI_URL` (par défaut, `'http://myshaarliurl.com'`) : définit l'URL de votre installation de Shaarli. Valeur attendue : une URL.
+* `FLATTR` (par défaut, `TRUE`) : permet d'activer la possibilité de flattrer un article ([Flattr est une plateforme de micro-dons](http://fr.wikipedia.org/wiki/Flattr)). Si un article est flattrable, une icône s'affichera et vous permet d'envoyer un micro-don à l'auteur de l'article. Valeurs attendues : `TRUE` ou `FALSE`.
+* `SHOW_PRINTLINK` (par défaut, `'1'`) : permet d'afficher le lien pour imprimer un article. Valeurs attendues : `'0'` pour désactiver ou `'1'` pour activer.
+* `SHOW_READPERCENT` (par défaut, `'1'`) : permet d'afficher (sur les thèmes `default`, `dark`, `dmagenta`, `solarized`, `solarized-dark`) le pourcentage de lecture de l'article. Valeurs attendues : `'0'` pour désactiver ou `'1'` pour activer.
+* `PAGINATION` (par défaut, `'12'`) : définit le nombre d'articles affichés sur une liste. Valeur attendue : un nombre.

docs/fr/Administrateur/Telechargement_et_installation.md

@@ -0,0 +1,121 @@
+---
+language: Français
+currentMenu: install
+subTitle: Télécharger et installer wallabag
+---
+
+# Télécharger et installer wallabag
+
+## Je ne souhaite pas installer wallabag
+
+Puisque vous ne voulez pas ou ne pouvez pas installer wallabag, nous vous proposons de créer un compte gratuit sur [Framabag](https://framabag.org/), lequel utilise notre logiciel. [Lisez la documentation complète](../Utilisateur/Framabag.md).
+
+## Je souhaite installer wallabag
+
+### Je souhaite télécharger wallabag manuellement
+
+[Télécharger la dernière version de wallabag](http://wllbg.org/latest) et décompresser-là :
+
+    wget http://wllbg.org/latest
+    unzip latest
+    mv wallabag-version-number wallabag
+
+Copiez les fichiers sur votre serveur web. Dans le cas d'Ubuntu/Debian, il s'agit de /var/www/html/ :
+
+    sudo mv wallabag /var/www/html/
+
+Puis sautez le paragraphe suivant.
+
+### Je souhaite télécharger wallabag via composer
+
+Vous devez installer composer : 
+
+    curl -s http://getcomposer.org/installer | php
+
+Ensuite, sur votre serveur web, exécutez cette commande : 
+
+    composer create-project wallabag/wallabag . dev-master
+
+Tout est téléchargé dans le répertoire courant.
+
+#### Pré-requis pour votre serveur web
+
+Wallabag nécessite qu'un certain nombre de composants soient installées sur votre serveur web.
+Pour être sûr que votre serveur possède tous les pré-requis, ouvrez dans votre navigateur la page `http://monserveur.com/wallabag/install/index.php`.
+
+Les composants sont :   
+ 
+* [PHP 5.3.3 ou plus](http://php.net/manual/fr/install.php) **avec support [PDO](http://php.net/manual/en/book.pdo.php)**
+* [XML pour PHP](http://php.net/fr/xml)
+* [PCRE](http://php.net/fr/pcre)
+* [ZLib](http://php.net/en/zlib) (son absence affectera le traitement des pages compressées)
+* [mbstring](http://php.net/en/mbstring) et/ou [iconv](http://php.net/en/iconv) (sinon, certaines pages ne pourront pas être lues - même en anglais)
+* L'extension [DOM/XML](http://php.net/manual/en/book.dom.php)
+* [Filtrage des données](http://php.net/manual/fr/book.filter.php)
+* [GD](http://php.net/manual/en/book.image.php) (son absence empèchera la sauvegarde des images)
+* [Tidy pour PHP](http://php.net/fr/tidy) (son absence peut poser problème avec certaines pages)
+* [cURL](http://php.net/fr/curl) avec `Parallel URL fetching` (optionel)
+* [Parse ini file](http://uk.php.net/manual/en/function.parse-ini-file.php) 
+* [allow_url_fopen](http://www.php.net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen) (optionel si cURL présent)
+* [gettext](http://php.net/manual/fr/book.gettext.php) (nécessaire pour le support multilingues)
+
+Installez les composants manquants avant de poursuivre. Par exemple pour installer Tidy sur Ubuntu/Debian :
+
+    sudo apt-get install php5-tidy
+    sudo service apache2 reload
+    
+Note : si voux utilisez IIS comme serveur web, vous devez interdire l'*Authentification Anonyme* et [permettre L'*Authentification de base*](https://technet.microsoft.com/fr-fr/library/cc772009%28v=ws.10%29.aspx) pour autoriser la connexion.
+
+#### Twig installation
+
+Pour pouvoir fonctionner, wallabag a besoin de `Twig`, une bibliothèque de modèles.
+Si vous ne pouvez pas installer `composer` (dans le cas d'hébergement mutualisé par exemple), nous vous proposons un fichier
+incluant `Twig`. Ce fichier peut être télécharger depuis la page `http://monserveur.com/wallabag/install/index.php` (section INSTALLATION TWIG) ou directement ici [http://wllbg.org/vendor](http://wllbg.org/vendor). Décompressez-le dans votre répertoire wallabag.
+
+Alternativement, vous pouvez installer `Twig` en lançant `composer` depuis votre dossier wallabag (toujours dans le cas d'Ubuntu/Debian : <code>/var/www/html/wallabag/</code>) en exécutant les commandes :
+
+    curl -s http://getcomposer.org/installer | php
+    php composer.phar install
+
+### Création de la base de données
+
+Wallabag peut s'installer sur différents types de bases de données :
+
+* [SQLite](http://php.net/manual/fr/book.sqlite.php). Le plus simple de tous. Rien de particulier à configurer.
+* [MySQL](http://php.net/manual/fr/book.mysql.php). Un système de base de données bien connu, qui est dans la plupart des cas plus efficace que SQLite.
+* [PostgreSQL](http://php.net/manual/fr/book.pgsql.php). Certaines personnes l'ont trouvé mieux que MySQL.
+
+Nous vous conseillons d'utiliser MySQL, plus performante. Il est alors nécessaire de créer une nouvelle base (par exemple `wallabag`), un nouvel utilisateur (par exemple  `wallabag`) et un mot de passe (ici `VotreMotdePasse`). Vous pouvez pour cela utiliser `phpMyAdmin`, ou exécuter les commandes suivantes :
+
+    mysql -p -u root
+    mysql> CREATE DATABASE wallabag;
+    mysql> GRANT ALL PRIVILEGES ON `wallabag`.* TO 'wallabag'@'localhost' IDENTIFIED BY 'VotreMotdePasse';
+    mysql> exit
+    
+*Note :* Si vous utilisez MySQL ou Postgresql, vous devrez **remplir tous les champs**, sinon l'installation ne fonctionera pas et un message d'erreur vous dira ce qui ne va pas. Vous devez créer manuellement la base de données qui sera utilisée par wallabag avec un outil comme PHPMyAdmin ou en ligne de commande.
+
+### Permissions
+
+Le serveur web doit avoir accès en écriture aux répertoires `assets`, `cache` et `db`. Sans cela, un message vous indiquera que l'installation est impossible :
+
+    sudo chown -R www-data:www-data /var/www/html/wallabag
+
+### Installation de wallabag. Enfin.
+
+Accédez à wallabag depuis votre navigateur : `http://votreserveur.com/wallabag`. Si votre serveur est bien configuré, vous arrivez sur l'écran d'installation.
+
+Renseignez le type de votre base de données (`sqlite`, `mysql` ou `postgresql`) et les informations de votre base de données. Dans le cas de la base MySQL créée plus haut, la configuration standard sera :
+
+    Database engine:    MySQL
+    Server:             localhost
+    Database: 	        wallabag
+    Username:	        wallabag
+    Password:	        VotreMotdePasse
+
+Créez enfin votre premier utilisateur et son mot de passe (différents de l'utilisateur de la base de données).
+
+wallabag est maintenant installé.
+
+### Connexion
+
+Depuis votre navigateur, vous arrivez sur l'écran d'identification : saisissez votre identifiant et votre mot de passe et vous voici connecté.

docs/fr/Administrateur/sessions.md

@@ -0,0 +1,26 @@
+---
+language: Français
+currentMenu: sessions
+subTitle: Problème de sessions
+---
+
+Si vous vous retrouvez à être déconnecté même après avoir valider le *Stay signed in checkbox*,
+lancez les commandes suivantes comme administrateur (ou avec sudo) :
+
+```
+mkdir /var/lib/wallabag-sessions
+chown www-data:www-data /var/lib/wallabag-sessions
+```
+
+*NOTE : L'utilisateur et le groupe www-data pourrait ne pas exister.
+Vous pouvez alors utiliser ```chown http:http /var/lib/wallabag-sessions``` à la place.*
+
+Ensuite, en utilisant apache, ajoutez : `php_admin_value session.save_path /var/lib/wallabag-sessions` 
+à votre vhost apache, tel que `wallabag-apache.conf`.
+Enfin, redémarrez apache, en lançant par exemple : ```/etc/init.d/apache2 restart``` 
+
+Si vous utilisez nginx, ajoutez  `php_admin_value[session.save_path] = /var/lib/wallabag-sessions`
+à votre fichier de configuration de nginx.
+Ensuite, redémarrez nginx : ```/etc/init.d/nginx restart```
+
+*NOTE : si vous utilisez systemd, vous devriez faire  `systemctl restart apache2` (ou nginx).*

docs/fr/Contribuer_au_projet.md

@@ -0,0 +1,52 @@
+---
+language: Français
+currentMenu: help_us
+subTitle: Contribuer au projet
+---
+
+# Contribuer au projet
+## Soumettre des bugs
+### Demande de support
+
+Si vous avez un problème lors de l'installation ou de l'utilisation de wallabag (que ça soit l'application web ou les applications pour smartphone), utilisez le site de support [http://support.wallabag.org](http://support.wallabag.org).
+
+Nous verrons alors si nous pouvons vous dépanner rapidement ou alors s'il s'agit un nouveau bug qu'il nous faudra corriger.
+
+Il est préférable d'utiliser le site de support plutôt que de nous envoyer un mail : le suivi est plus pratique pour vous comme pour nous et la résolution de votre problème pourra resservir pour un autre utilisateur.
+
+### Créer un nouveau ticket
+
+Si vous avez trouvé un bug lors de votre utilisation de wallabag, merci d'ouvrir un nouveau ticket sur Github (un compte est nécessaire).
+
+**Avant toute chose**, pensez à lire [les recommandations nécessaires pour la rédaction d'un nouveau ticket](https://github.com/wallabag/wallabag/blob/master/CONTRIBUTING.md). Au mieux vous renseignez votre ticket, au mieux nous pourrons vous aider.
+
+* si c'est un bug avec l'application web, [ouvrez un nouveau ticket ici](https://github.com/wallabag/wallabag/issues/new)
+* si c'est un bug avec l'application Android, [ouvrez un nouveau ticket ici](https://github.com/wallabag/android-app/issues/new)
+* si c'est un bug avec l'application Windows Phone, [ouvrez un nouveau ticket ici](https://github.com/wallabag/windowsphone-app)
+* si c'est un bug avec l'application iOS, [ouvrez un nouveau ticket ici](https://github.com/wallabag/ios-app/issues/new)
+* si c'est un bug avec l'extension Firefox, [ouvrez un nouveau ticket ici](https://github.com/wallabag/firefox-ext/issues/new)
+* si c'est un bug avec l'extension Chrome, [ouvrez un nouveau ticket ici](https://github.com/wallabag/chrome-ext/issues/new)
+
+## Écrire et corriger la documentation
+
+La documentation que vous êtes en train de lire n'est sûrement pas complète, à jour, traduite dans votre langue. C'est pourquoi nous vous invitons à participer à sa rédaction.
+
+Le dépôt Github se trouve ici : [https://github.com/wallabag/documentation](https://github.com/wallabag/documentation).
+
+## Corriger les bugs, résoudre les problèmes : faire du support
+
+Deux possibilités :
+* lorsqu'un utilisateur de wallabag pose une nouvelle question [sur le site de support](http://support.wallabag.org), en tant qu'utilisateur avancé de wallabag, vous pouvez lui répondre.
+* sur Github, des tickets correspondent sûrement à vos compétences. [Parcourez la liste des tickets](https://github.com/wallabag/wallabag/issues) et servez-vous.
+
+Si vous souhaitez proposer une modification dans le code de wallabag, vous êtes le bienvenu. [N'oubliez pas de lire les recommandations pour proposer vos modifications](https://github.com/wallabag/wallabag/blob/master/CONTRIBUTING.md).
+
+## Communiquer
+
+Rien de compliqué ici, parlez de wallabag autour de vous. Utilisez le mot-clé #wallabag sur tous vos réseaux sociaux préférés : twitter, Facebook, Diaspora*, Google+, etc.
+
+D'ailleurs, voici la liste de nos comptes sur ces réseaux, si jamais vous voulez nous citer dans un de vos messages :
+* [Diaspora*](https://framasphere.org/people/2335ff202f920132196e2a0000053625)
+* [twitter](https:/twitter.com/wallabagapp)
+* [Facebook](https://www.facebook.com/wallabag)
+* [Google+](https://plus.google.com/+WallabagOrg/)

docs/fr/Developpeur/Creer_un_nouveau_theme.md

@@ -0,0 +1,9 @@
+---
+language: Français
+currentMenu: theme
+subTitle: Créer un nouveau thème
+---
+
+# Créer un nouveau thème
+
+TODO

docs/fr/Developpeur/Depot_git.md

@@ -0,0 +1,23 @@
+---
+language: Français
+currentMenu: repo
+subTitle: Dépôt git de wallabag
+---
+
+# Dépôt git de wallabag
+
+Si vous souhaitez contribuer au projet en proposant de nouvelles fonctionnalités ou en corrigeant des bugs, il faut suivre les recommandations que vous lirez ci-dessous concernant le dépôt Git disponible à cette adresse : [https://github.com/wallabag/wallabag](https://github.com/wallabag/wallabag).
+
+## État des lieux
+
+Pour la gestion des différentes versions de wallabag, nous utilisons Git.
+
+Nous utilisons plusieurs branches pour le code source de l'application web de wallabag :
+
+* la branche `master` : c'est la branche stable, celle qui est téléchargée pour tous ceux qui souhaitent installer wallabag pour leur utilisation.
+* la branche `dev` : avant d'être sur la branche `master`, toutes les corrections de bugs et nouvelles fonctionnalités doivent passer par cette branche. Cette branche n'est pas conseillée pour une utilisation en production.
+* la branche `v2-symfony` : c'est la branche de la refonte de wallabag. Un chapitre complet lui est consacré.
+
+## Workflow
+
+Toutes les consignes concernant le dépôt Git se trouve dans [le fichier CONTRIBUTING.md de wallabag](https://github.com/wallabag/wallabag/blob/master/CONTRIBUTING.md). Merci de le lire attentivement avant toute modification.

docs/fr/Developpeur/Docker.md

@@ -0,0 +1,9 @@
+---
+language: Français
+currentMenu: docker
+subTitle: Docker
+---
+
+# Docker
+
+TODO

docs/fr/Developpeur/Ecrire_fichier_configuration.md

@@ -0,0 +1,39 @@
+---
+language: Français
+currentMenu: site_config
+subTitle: Écrire un fichier de configuration
+---
+
+# Écrire un fichier de configuration
+
+wallabag peut utiliser des fichiers de configuration spécifiques à un site pour lire les articles de ce site. Ces fichiers sont stockés dans le répertoire [`inc/3rdparty/site_config/standard`](https://github.com/wallabag/wallabag/tree/master/inc/3rdparty/site_config/standard).
+
+Le format utilisé pour ces fichiers est [XPath](http://www.w3.org/TR/xpath20/). Inspirez-vous des exemples dans le répertoire pour en créer de nouveaux.
+
+## Génération automatique de fichiers de configuration
+
+@FiveFilters a créé un [outil très utile](http://siteconfig.fivefilters.org/) pour créer des fichiers de configuration. Vous devez taper l'adresse d'un article qui vous intéresse. puis vous sélectionnez le contenu que vous souhaitez.
+
+![siteconfig](https://lut.im/RNaO7gGe/l9vRnO1b)
+
+Vous devez confirmer cette zone en essayant avec d'autres articles.
+Quand vous avez trouvé la bonne zone, cliquez simplement sur *Download Full-Text RSS site config* (Téléchargez la configuration du site Full-Text RSS) pour télécharger le fichier à inclure dans le répertoire.
+
+## Génération manuelle de fichiers de configuration
+
+Si l'outil de FiveFilters ne marche pas tel qu´attendu, regardez la source d'un article (Ctrl+U sur Firefox ou Chromium). Cherchez votre contenu parmi le code source et repérez l'attribut `class` ou `id` de la zone que vous souhaitez.
+
+Une fois que vous avez obtenu l'attribut `id` ou `class`, vous pouvez écrire par exemple l'une ou l'autre de ces lignes :
+
+```
+body: //div[@class='myclass']
+body: //div[@id='myid']
+```
+
+Ensuite, testez votre fichier de configuration avec d'autres articles du même site. Si vous avez trouvé le bon contenu mais que vous voulez enlever des parties inutiles, ajoutez la ligne suivante (avec l'attribut `class` correspondant à la partie inutile) :
+
+```
+strip: //div[@class='hidden']
+```
+
+Vous pouvez regarder d'autres options pour les fichiers de configuration de sites [sur l'aide du site de  FiveFilters](http://help.fivefilters.org/customer/portal/articles/223153-site-patterns).

docs/fr/Developpeur/Vagrant.md

@@ -0,0 +1,34 @@
+---
+language: Français
+currentMenu: vagrant
+subTitle: Vagrant
+---
+
+# Vagrant
+
+Pour vous permettre de mettre en place rapidement la configuration requise pour wallabag, nous vous proposons un fichier Vagrantfile.
+
+[Définition Wikipedia](http://fr.wikipedia.org/wiki/Vagrant)
+
+    Vagrant est un logiciel libre et open-source pour la création et la configuration des environnements de développement virtuel. Il peut être considéré comme un wrapper autour du logiciel de virtualisation comme VirtualBox.
+
+## Utiliser Vagrant pour wallabag
+
+Voici la procédure pour exécuter wallabag au sein d'un conteneur Vagrant :
+
+    wget -O wallabag-dev.zip https://github.com/wallabag/wallabag/archive/dev.zip
+    unzip wallabag-dev.zip
+    cd wallabag-dev
+    vagrant up
+
+Accédez maintenant à `http://localhost:8003` et à vous de jouer !
+
+## Qu'a installé le Vagrantfile ?
+
+Le script installe un serveur LAMP, à savoir :
+
+* Ubuntu 14.04
+* Un serveur web Apache2
+* PHP5
+* SQLite ou MySQL ou PostgreSQL pour PHP
+* XDebug pour PHP

docs/fr/Developpeur/v2.md

@@ -0,0 +1,9 @@
+---
+language: Français
+currentMenu: v2
+subTitle: wallabag v2 / symfony2
+---
+
+# wallabag v2 / symfony2
+
+TODO

docs/fr/Utilisateur/Classer_ses_articles.md

@@ -0,0 +1,68 @@
+---
+language: Français
+currentMenu: sort_article
+subTitle: Classer ses articles
+---
+
+# Classer ses articles
+
+Pour pouvoir retrouver plus facilement vos articles, plusieurs méthodes existent.
+
+## Tags
+### Assigner un tag
+#### Depuis l'article
+
+Aujourd'hui, il n'est pas encore possible d'assigner un tag lorsque vous sauvegardez un nouvel article.
+
+Tout ajout de tag se fera donc sur un article déjà sauvegardé.
+
+Sur la page de lecture de l'article, se trouve une partie `tags` suivie d'un crayon. Cliquez sur ce crayon.
+
+Saisissez dans la case les tags que vous souhaitez assigner. Saisissez autant de tags que vous le voulez. Ils doivent être séparés par des virgules et non par des espaces. L'auto-complétion existe ici : si vous tapez les premières lettres d'un tag déjà existant, inutile de taper le mot en entier, sélectionnez-le dans la liste déroulante. Une fois tous vos tags saisis, cliquez sur le bouton **Tag**.
+
+Vous pouvez ensuite retourner lire votre article.
+
+#### Depuis la recherche
+
+Un chapitre complet sur la recherche existe. Ici, nous verrons uniquement comment assigner un tag depuis votre recherche.
+
+Lorsque votre recherche vous affiche les résultats, vous avez un lien en bas de page `Apply the tag ABCD to this search`. Cliquez dessus : un tag en fonction de la recherche que vous venez d'effectuer (ici `ABCD`) sera assigné à tous les articles trouvés.
+
+### Retrouver tous les articles d'un même tag
+
+Dans le menu de wallabag, cliquez sur **Tags**. Ici s'affichent tous les tags que vous avez créés, triés par nombre d'articles au sein de chaque tag. Cliquez sur l'un de ces tags pour retrouver tous les articles correspondants à ce tag.
+
+## Articles favoris
+
+Lorsque vous souhaitez mettre de côté un article, vous pouvez le marquer comme favori.
+
+### Marquer un article comme favori
+
+Depuis la page de lecture d'un article, ou depuis une liste d'articles (par exemple, la liste des articles non lus), vous pouvez mettre un article comme favori juste en cliquant sur l'étoile qui apparait.  
+Recliquer sur cette étoile enlèvera le statut **favori** de cet article.
+
+### Retrouver tous ses articles favoris
+
+Dans le menu de wallabag, cliquez sur **Favoris** pour retrouver tous les articles que vous avez déjà mis en favori.
+
+## Articles archivés
+
+Lorsque vous avez lu un article, vous pouvez l'archiver : ainsi il n'apparaitra plus dans votre liste d'articles non lus.  
+Le fait d'archiver un article ne le supprime pas de wallabag.
+
+### Archiver un article
+
+Depuis la page de lecture d'un article, ou depuis une liste d'articles (par exemple, la liste des articles non lus), vous pouvez archiver un article juste en cliquant sur l'icône ✓.  
+Recliquer sur cette icône remettra l'article en statut **non lu**.
+
+### Retrouver tous ses articles archivés
+
+Dans le menu de wallabag, cliquez sur **Archive** pour retrouver tous les articles que vous avez déjà archivés.
+
+## Supprimer l'article
+
+Attention, la suppression d'un article est **définitive** : il est supprimé de la base de données de wallabag.
+
+Pour supprimer un article, une icône de corbeille se trouve sur la page d'un article ou sur une liste d'articles (articles non lus, favoris ou archivés par exemple).
+
+Nous vous faisons confiance : c'est pourquoi il n'y a aucune demande de confirmation lors de la suppression.

docs/fr/Utilisateur/Configurer_wallabag.md

@@ -0,0 +1,30 @@
+---
+language: Français
+currentMenu: configure
+subTitle: Configurer wallabag
+---
+
+# Configurer wallabag
+
+Depuis le menu **configuration**, vous avez la possibilité de changer quelques options de wallabag.
+
+Certaines parties ne seront pas présentées ici car elles bénéficient d'un chapitre complet dans la documentation ([flux RSS](flux_rss.html), [l'import depuis un service tiers](importer_exporter.html), [l'export de vos données](importer_exporter.html), [la conversion en ePub](convertir_en_epub.html) et [le mode multi-utilisateurs](../Administrateur/multi-utilisateurs.html)).
+
+## Thème
+
+Des goûts et des couleurs, on ne discute pas. C'est pourquoi wallabag vous propose de changer son habillage pour plaire à chacun.  
+Sélectionnez le thème de votre choix dans la liste déroulante et validez en cliquant sur **Mettre à jour**.
+
+## Langue
+
+Sélectionnez la langue de votre choix dans la liste déroulante et validez en cliquant sur **Mettre à jour**.
+
+## Mot de passe
+
+Saisissez votre nouveau mot de passe dans les deux champs prévus et validez en cliquant sur **Mettre à jour**.  
+Vous serez alors déconnecté et devrez saisir votre nouveau mot de passe pour accéder à wallabag.
+
+## Vider le cache
+
+Le cache permet à wallabag d'effectuer certains traitements plus rapidement.  
+Après une mise à jour de wallabag, il est conseillé de vider le cache. Vous n'avez qu'un clic à faire pour le vider.

docs/fr/Utilisateur/Convertir_en_ePub.md

@@ -0,0 +1,25 @@
+---
+language: Français
+currentMenu: epub
+subTitle: Convertir en ePub
+---
+
+# Convertir en ePub
+
+Pour que vous puissiez lire vos articles sauvegardés depuis votre liseuse, wallabag vous permet de les convertir au format ePub et ainsi vous créer un eBook pour vos longues soirées d'hiver.
+
+## Mise en garde
+
+Attention, la génération de fichiers ePub peut être très consommatrice de ressources pour le serveur sur lequel est installé wallabag. Cela dépend du nombre d'articles et de leur longueur.  
+Ne générez pas un eBook trop important si cela n'est pas nécessaire.
+
+## Où convertir les articles
+
+Vous pouvez convertir vos articles depuis différents endroits de wallabag :
+
+* sur la page de lecture d'un article : le lien ePub convertira ce seul article
+* depuis une liste d'articles (articles non lus, favoris ou archivés, articles d'un tag) : un lien en bas de page vous permet de convertir tous les articles de cette catégorie
+* depuis une recherche : le lien se trouve en bas de page
+* depuis la page de configuration : vous allez pouvoir convertir tous vos articles, peu importe la catégorie dans laquelle ils se trouvent
+
+TODO parler de calibre

docs/fr/Utilisateur/Flux_RSS.md

@@ -0,0 +1,35 @@
+---
+language: Français
+currentMenu: rss
+subTitle: Flux RSS
+---
+
+# Flux RSS
+
+Les flux RSS vous permettent :
+
+* de lire vos articles depuis votre lecteur de flux RSS préféré
+* d'activer les fonctionnalités de lecture pour les applications smartphones
+
+Tout d'abord, vous devez activer la fonctionnalité RSS en générant votre jeton de flux.  
+Rendez-vous dans **configuration** de wallabag et créez le jeton dans la partie **Flux**.
+À tout moment, vous pouvez générer un nouveau jeton.
+
+## Lire les articles
+
+Une fois le jeton créé, vous avez accès à trois flux RSS :
+
+* celui des articles non lus
+* celui des articles favoris
+* celui des articles archivés
+
+Ajoutez le flux de votre choix dans votre lecteur de flux RSS.  
+Attention, lorsque vous lirez un article depuis votre lecteur de flux, ça ne le marquera pas comme lu dans wallabag.
+
+### Partager vos lectures
+
+Si vous souhaitez partager vos lectures avec quelqu'un, envoyez-lui par exemple le flux RSS de vos articles préférés. Ainsi, dès qu'un article sera mis en favori dans wallabag, cette personne pourra également le lire.
+
+## Activer les fonctionnalités pour smartphones
+
+Vous avez créé le jeton de flux RSS : il va vous être utile pour configurer votre application smartphone. Pour en savoir sur les applications smartphones, vous pouvez lire [Sauvegarder son premier article](Sauvegarder_son_premier_article.md).

docs/fr/Utilisateur/Framabag.md

@@ -0,0 +1,34 @@
+---
+language: Français
+currentMenu: framabag
+subTitle: Se créer un compte sur Framabag
+---
+
+# Se créer un compte sur Framabag
+
+Puisque vous ne souhaitez peut-être pas gérer l'installation et la mise à jour de wallabag, ou puisque vous n'avez peut-être pas les connaissances pour l'installer, il vous est possible de vous créer un compte gratuit sur [Framabag.org](https://www.framabag.org).
+
+## Création du compte
+
+Cliquez sur le bouton **Créez votre compte / Create your account**.
+
+Vous devez saisir certaines informations : votre nom d'utilisateur, votre mot de passe et votre adresse email. Votre adresse n'est utilisée que pour la validation de votre compte, sauf si vous cochez la case pour recevoir la newsletter (3 à 4 envois par an).
+
+Une fois ce formulaire validé, vous recevez un email avec un lien de confirmation. Cliquez dessus, votre compte sera alors créé.
+
+Vous recevrez un dernier email avec l'adresse de votre compte Framabag, de la forme `https://www.framabag.org/u/votre-nom-d'utilisateur`.
+
+## Stockage de vos informations
+
+Framabag utilise une base de données par utilisateur. Nous ne faisons et ne ferons aucune utilisation de vos données stockées.
+
+## Vous avez oublié votre mot de passe
+
+Si vous avez oublié votre mot de passe pour vous connecter à Framabag, un formulaire est disponible [depuis la page d'accueil du service](https://www.framabag.org).  
+Remplissez-le, un email de confirmation vous sera envoyé et vous permettra de saisir votre nouveau mot de passe.
+
+## Suppression de votre compte
+
+Si vous souhaitez supprimer votre compte, contactez-nous par email : [hello@wallabag.org](mailto:hello@wallabag.org) avec l'adresse de création de votre compte, en nous indiquant votre nom d'utilisateur.
+
+Nous vous répondrons quand votre compte sera supprimé : dès cet instant, plus aucune information vous concernant ne sera stockée sur Framabag.

docs/fr/Utilisateur/Importer_exporter.md

@@ -0,0 +1,78 @@
+---
+language: Français
+currentMenu: import
+subTitle: Importer ou exporter ses données
+---
+
+# Importer ou exporter ses données
+## Importer
+
+Pour importer des données dans wallabag, vous devez vous rendre dans la page **Configuration**.
+
+### Mise en garde
+
+L'import de données peut être une **opération gourmande** pour votre serveur. C'est pourquoi elle s'effectue en deux étapes :
+
+* l'insertion des URL dans la base de données de wallabag
+* dans un second temps, la récupération, pour chaque article, du contenu complet
+
+Ces deux actions ne peuvent pas être effectuées simultanément, car nous vous donnons la possibilité d'importer des milliers de liens, mais aujourd'hui, wallabag n'a pas les possibilités techniques nécessaires pour effectuer tout ce travail automatiquement.
+
+### Depuis Pocket
+#### Exporter ses données depuis Pocket
+
+Depuis votre compte Pocket, rendez-vous dans vos options.
+TODO
+
+#### Importer ses données Pocket
+
+Depuis la page de configuration de wallabag, partie **Import**, sélectionnez le fichier `ril_export.html` que Pocket a généré puis cliquez sur **Import**.  
+wallabag ne fait qu'insérer les liens dans sa base de données. Il faut maintenant lui faire récupérer le contenu de chaque article.
+
+Pour cela, cliquez sur `Click to finish import` : wallabag récupèrera alors le contenu de 10 articles à la fois.
+
+TODO
+
+TODO nouveau ticket : pourquoi quand on clique une fois, ça ne charge pas en boucle ? Il me semblait que ça faisait ça ping @mariroz
+
+### Depuis Instapaper
+#### Exporter ses données depuis Instapaper
+
+TODO
+
+#### Importer ses données Instapaper
+
+TODO
+
+### Depuis Readability
+#### Exporter ses données depuis Readability
+
+TODO
+
+#### Importer ses données Readability
+
+TODO
+
+### Depuis wallabag
+
+Puisque vous pouvez exporter vos données de wallabag (lire ci-dessous), il est évidemment possible de les réimporter.
+
+Dans le formulaire d'import, sélectionnez votre fichier d'export wallabag (au format JSON). Démarrez l'import et voila.
+
+Contrairement aux imports ci-dessus, le traitement est moins long car toutes les données (titre et contenu des articles) sont déjà présentes dans le fichier, il n'est pas nécessaire pour wallabag d'accéder à chacune des URL.  
+Par contre, le fichier d'import est forcément plus conséquent.
+
+### Depuis un fichier HTML ou JSON
+
+TODO
+
+## Exporter
+Il est possible d'exporter ses données depuis la page **Configuration** de wallabag. Plusieurs raisons possibles :
+
+* réinstaller wallabag
+* quitter le service Framabag pour installer soi-même wallabag
+* un compte sur un wallabag multi-utilisateurs souhaite avoir sa propre installation de wallabag
+* ...
+
+Vous téléchargerez alors un fichier [au format JSON](http://fr.wikipedia.org/wiki/JavaScript_Object_Notation).  
+Comme nous l'avons vu ci-dessus, il est possible d'importer ce fichier dans wallabag.

docs/fr/Utilisateur/Lire_un_article.md

@@ -0,0 +1,58 @@
+---
+language: Français
+currentMenu: read_article
+subTitle: Lire un article
+---
+
+# Lire un article
+
+Lire un article n'est pas la chose la plus compliquée dans wallabag. Vous n'avez qu'à cliquer sur le titre d'un article pour l'afficher.
+
+## Revenir là où vous avez laissé votre article
+
+Si vous quittez un article alors que vous n'êtes qu'à la moitié de celui-ci par exemple, lorsque vous reviendrez, wallabag vous renverra là où vous avez laissé l'article.
+
+Cette astuce ne fonctionne qu'avec l'application web et pas les applications smartphones.
+
+## Actions possibles depuis l'article
+
+Ces actions sont possibles grâce aux icônes affichés en haut de la page. Nous partons du principe que vous utilisez le thème Baggy ([lire la documentation pour changer de thème](Configurer_wallabag.md)), les icônes dans les autres thèmes sont sensiblement les mêmes.  
+Voici donc ces actions, par ordre d'apparition des icônes.
+
+### Lire l'article original
+
+Renvoie vers l'article original.
+
+### Marquer l'article comme lu
+
+Archive l'article, qui se retrouvera dans la catégorie **Archive** du menu de wallabag.  
+Recliquer dessus permet de replacer cet article en état non lu.
+
+### Mettre l'article en favori
+
+Marque l'article comme favori, qui se retrouvera dans la catégorie **Favoris** du menu de wallabag.  
+Recliquer dessus permet d'enlever le statut de favori.
+
+### Supprimer l'article
+
+Supprime complètement l'article de wallabag. Il ne pourra être restauré. Attention, aucune confirmation n'est demandée.
+
+### Partager vers twitter
+
+Partage le titre et le lien original de l'article sur twitter.
+
+### Partager par email
+
+Partage le titre et le lien original de l'article par email.
+
+### Imprimer l'article
+
+Ouvre la fenêtre d'impression du navigateur.
+
+### Convertir en ePub
+
+Convertit l'article au format ePub. [Un chapitre complet existe](Convertir_en_ePub.md).
+
+### Signaler que l'article s'affiche mal
+
+Permet de signaler qu'un article ne s'affiche pas comme attendu. [Un chapitre complet existe](Un_article_est_mal_affiche.md).

docs/fr/Utilisateur/Rechercher.md

@@ -0,0 +1,21 @@
+---
+language: Français
+currentMenu: search
+subTitle: Rechercher du contenu dans wallabag
+---
+
+# Rechercher du contenu dans wallabag
+
+Pour que vous puissiez retrouver un article au plus vite, nous avons mis en place un moteur de recherche complet.
+
+Cliquez sur **Rechercher** dans le menu de wallabag. Là, saisissez un terme de recherche.
+
+wallabag ira parcourir tous vos articles et affichera ceux qui contiennent le terme de recherche dans son titre, son contenu ou son URL.
+
+## Convertir cette recherche au format ePub
+
+Vous pouvez convertir les articles retournés au format ePub, pour les lire sur une liseuse par exemple. Lisez [Convertir en ePub](Convertir_en_ePub.md) pour en savoir plus.
+
+## Assigner un tag aux résultats de cette recherche
+
+Vous pouvez créer un tag en fonction du critère de recherche. Lisez [Classer ses articles](Classer_ses_articles.md) pour en savoir plus.

docs/fr/Utilisateur/Sauvegarder_son_premier_article.md

@@ -0,0 +1,101 @@
+---
+language: Français
+currentMenu: save_article
+subTitle: Sauvegarder son premier article
+---
+
+# Sauvegarder son premier article
+
+Une fois connecté sur wallabag, vous avez plusieurs moyens pour sauvegarder un article.
+
+## Depuis l'application web
+
+Voyons d'abord comment faire depuis l'application web. Dans le menu, vous avez un lien **Sauvegarder un lien**. En cliquant dessus, un formulaire s'affiche : vous n'avez qu'à saisir l'adresse internet de l'article concerné.
+
+Validez et le contenu de l'article est enregistré.
+
+Par défaut, seul le texte est sauvegardé. Si vous souhaitez également conserver une copie des images sur votre serveur, il faut activer le paramètre `DOWNLOAD_PICTURES`. Lisez le chapitre [Les options cachées](../Administrateur/Options_cachees.md) pour en savoir plus.
+
+## Depuis le bookmarklet
+
+[Définition Wikipedia](http://fr.wikipedia.org/wiki/Bookmarklet)
+
+    Un bookmarklet est un petit programme JavaScript pouvant être stocké :
+    * soit en tant qu'URL dans un signet (marque-page ou lien favori) avec la plupart des navigateurs Web ;
+    * soit en tant qu'hyperlien dans une page web.
+
+Depuis le menu de wallabag, cliquez sur **configuration**. Dans la première partie de cette page, nous avons listé les différents moyens de sauvegarder un article. Vous trouverez ainsi le bookmarklet (c'est le lien `bag it !`) à glisser / déposer dans la barre de favoris de votre navigateur.
+
+Dorénavant, lorsque vous souhaitez sauvegarder un article sur lequel vous êtes en train de surfer, vous n'avez qu'à cliquer sur ce bookmarklet et l'article sera automatiquement enregistré.
+
+## Depuis son smartphone
+### Avant toute chose
+
+Pour pouvoir utiliser une application smartphone, vous devez activer les flux RSS depuis la partie **configuration** de wallabag. Certaines informations seront ainsi affichées, comme votre **token** (jeton de sécurité). Lisez le chapitre [Flux RSS](Flux_RSS.md) pour en savoir plus.
+
+### Android
+#### Installation et configuration
+
+Vous pouvez télécharger l'application Android depuis le [Google Play Store](https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche) et depuis [F-droid](https://f-droid.org/app/fr.gaulupeau.apps.InThePoche). C'est exactement la même application sur ces deux plateformes de téléchargement.
+
+Une fois installée, démarrez l'application, rendez-vous dans la partie **settings** et renseignez les champs **URL** (Adresse complète de votre installation de wallabag ou de votre compte Framabag), **User ID** (très souvent, il vous faudra mettre 1 comme valeur). Si vous avez créé plusieurs comptes depuis wallabag, il faudra saisir l'identifiant du compte que vous souhaitez connecter à votre application) et **Token** (recopiez bien tous les caractères du token, disponible dans la **configuration** de wallabag).
+
+#### Sauvegarde d'un article
+
+Maintenant que tout est bien configuré, dès que vous naviguerez avec le navigateur de votre smartphone, vous pourrez à tout moment partager un article dans wallabag depuis le menu **Partager** : vous trouverez une entrée **Bag it!** qui ajoutera l'article dans wallabag.
+
+#### Lecture
+
+Lorsque vous ouvrez l'application, cliquez sur **Synchronize** : vos articles dernièrement sauvegardés seront ainsi téléchargés sur votre smartphone.
+
+Vous n'avez maintenant plus besoin de connexion internet : cliquez sur le bouton **List articles** pour commencer votre lecture.
+
+En bas de chaque article, un bouton **Mark as read** vous permet d'archiver l'article.
+
+Aujourd'hui, la synchronisation ne s'effectue que dans un sens (de wallabag vers l'application), ce qui empêche de marquer comme lu un article sur wallabag depuis votre smartphone.
+
+### iOS
+#### Installation et configuration
+TODO
+
+#### Utilisation
+TODO
+
+### Windows Phone
+#### Installation et configuration
+
+Vous pouvez télécharger l'application Windows Phone depuis le [Windows Store](http://www.windowsphone.com/fr-fr/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450) ou directement dans le Store de votre smartphone.
+
+Une fois installée, l'application affichera une notification au premier lancement, demandant la configuration du serveur wallabag. Rendez-vous dans la partie **Configuration** de l'application en appuyant sur les 3 petits points du menu en bas de l'écran, puis renseignez les champs **URL** (Adresse complète de votre installation de wallabag ou de votre compte Framabag), **User ID** (très souvent, il vous faudra mettre 1 comme valeur).  
+Si vous avez créé plusieurs comptes depuis wallabag, il faudra saisir l'identifiant du compte que vous souhaitez connecter à votre application) et **Token** (recopiez bien tous les caractères du token, disponible dans la **configuration** de wallabag).  
+Enfin, sauvegardez les paramètres entrés.
+
+## Depuis son navigateur
+### Extension Firefox classique
+
+Téléchargez l'extension Firefox [sur le site addons.mozilla.org](https://addons.mozilla.org/firefox/addon/wallabag/) et installez-la comme toute autre extension Firefox.
+
+Dans les préférences de l'extension, renseignez l'URL complète de votre installation de wallabag ou de votre compte Framabag.
+
+Personnalisez la barre d'outils de Firefox pour ajouter wallabag (icône `w`). Lorsque vous vous trouvez sur un article que vous souhaitez sauvegarder, cliquez sur cette icône : une nouvelle fenêtre s'ouvrira pour ajouter l'article et elle se refermera automatiquement.
+
+### Extension Mozilla Services (Social API)
+
+*Disponible uniquement à compter de wallabag 1.9.1*
+
+Avec les versions 29 et supérieures de Firefox, votre navigateur possède une interface intégrée permettant le partage direct vers de multiples réseaux sociaux. Dans l'interface de Firefox, elle est symbolisée par un icône en forme d'avion en papier que vous pourrez utiliser pour partager une page, ce qui signifie ici enregistrer un article dans wallabag.
+Vous pouvez ajouter ce service depuis la page de configuration de wallabag en cliquant sur Extension Mozilla Services (Social API). Vous devez aussi accepter l'utilisation des Services Firefox.
+
+### Chrome
+
+Téléchargez l'extension Chrome [sur le site dédié](https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj) et installez-la comme toute autre extension Chrome.
+
+Dans les options de l'extension, renseignez l'URL complète de votre installation de wallabag ou de votre compte Framabag.
+
+Lors de l'installation de l'extension, une nouvelle icône est apparue dans la barre d'outils de Chrome, une icône `w`. Lorsque vous vous trouvez sur un article que vous souhaitez sauvegarder, cliquez sur cette icône : une popup s'ouvrira et vous confirmera que l'article a bien été sauvegardé.
+
+### Opera
+
+Les dernières versions d'Opera (15+) permettent d'installer des extensions compatibles avec Chrome.
+
+Il faut tout d'abord installer l'extension [Download Chrome Extensions](https://addons.opera.com/en/extensions/details/download-chrome-extension-9/) pour installer des extensions à partir du Chrome Web Store. Ensuite, on peut se rendre [sur le site de Google](https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj) et récupérer l'extension Chrome en cliquant sur *Add to Opera*. Vous obtiendrez un message qui vous invitera à confirmer l'action car l'extension ne provient pas d'une source approuvée. Le comportement sera ensuite le même que pour Chrome (ci-dessus).

docs/fr/Utilisateur/Un_article_est_mal_affiche.md

@@ -0,0 +1,32 @@
+---
+language: Français
+currentMenu: issue
+subTitle: Mon article s'affiche mal dans wallabag
+---
+
+# Mon article s'affiche mal dans wallabag
+
+Si vous pensez que wallabag récupère mal le contenu d'un article (texte absent ou incomplet), nous vous proposons plusieurs possibilités.
+
+## Demande d'aide
+
+Que ça soit par mail ou via un ticket, n'oubliez pas de nous donner certaines informations qui sont importantes pour que nous puissions résoudre le problème au mieux :
+
+* l'URL de l'article concerné
+* ce que wallabag affiche
+* ce à quoi vous vous attendiez
+* la version de wallabag ou alors si vous utilisez Framabag
+
+### Ouvrir un ticket sur github
+
+Pour ouvrir un nouveau ticket, il faut [aller sur github](https://github.com/wallabag/wallabag/issues/new). Un compte est nécessaire.  
+N'oubliez pas de nous envoyer les informations ci-dessus.
+
+### Nous envoyer un email
+
+Envoyez-nous un lien à l'adresse [hello@wallabag.org](mailto:hello@wallabag.org?subject=Mauvais%20affichage%20dans%20wallabag).  
+N'oubliez pas de nous envoyer les informations ci-dessus.
+
+## Résoudre ce problème d'affichage
+
+TODO

docs/fr/conf.py

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag-fr'
+copyright = u'2013-2015, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagfrdoc'
+
+latex_elements = {
+}
+
+latex_documents = [
+  ('index', 'wallabag-fr.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabagfr', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabagfr', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabagfr', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")
+
+# Guzzle theme options (see theme.conf for more information)
+html_theme_options = {
+
+    # Set the path to a special layout to include for the homepage
+    # "index_template": "homepage.html",
+
+    # Allow a separate homepage from the master_doc
+    # homepage = index
+
+    # Set the name of the project to appear in the nav menu
+    # "project_nav_name": "Guzzle",
+
+    # Set your Disqus short name to enable comments
+    # "disqus_comments_shortname": "my_disqus_comments_short_name",
+
+    # Set you GA account ID to enable tracking
+    # "google_analytics_account": "my_ga_account",
+
+    # Path to a touch icon
+    # "touch_icon": "",
+
+    # Specify a base_url used to generate sitemap.xml links. If not
+    # specified, then no sitemap will be built.
+    #"base_url": "http://guzzlephp.org"
+
+    # Allow the "Table of Contents" page to be defined separately from "master_doc"
+    # tocpage = Contents
+
+    # Allow the project link to be overriden to a custom URL.
+    # projectlink = http://myproject.url
+}