Release wallabag 2.0.0-alpha.2

Few fixes

.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,9 +1,40 @@
-.DS_Store
-assets/*
-cache/*
-vendor
-composer.phar
-db/poche.sqlite
-inc/poche/config.inc.php
-inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
-.vagrant
+# Cache, logs & sessions
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
+
+# Parameters
+/app/config/parameters.yml
+
+# Managed by Composer
+/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
+
+# Docker container logs and data
+docker/logs/
+docker/data/
+
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock

.scrutinizer.yml

@@ -0,0 +1,28 @@
+filter:
+    paths:
+        - src/*
+    excluded_paths:
+        - 'vendor/*'
+        - 'app/*'
+        - 'var/*'
+        - '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,51 @@
+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:
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
+    - composer self-update --no-progress
+    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
+
+script:
+    - travis_wait composer update --no-interaction --no-progress
+    - ant prepare-$DB
+    - bin/phpunit -v

CONTRIBUTING.md

@@ -6,8 +6,8 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 To fix the bug quickly, we need some infos:
 * your wallabag version (on top of the ./index.php file, and also on config page)
 * your webserver installation :
-  * type of hosting (shared or dedicaced)
-  * in case of a dedicaced server, the server and OS used
+  * 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
@@ -27,4 +27,4 @@ Note : If you have large portions of text, use [Github's Gist service](https://g
 ## 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**.
 
-[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).
+[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

COPYING.md

@@ -1,19 +1,19 @@
-Copyright (c) 2013-2014 Nicolas Lœuillet
-
-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:
-
-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.
+Copyright (c) 2013-2016 Nicolas Lœuillet
+
+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:
+
+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,17 +1,3 @@
-wallabag is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* 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
-* PHPePub https://github.com/Grandt/PHPePub/
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
 
-wallabag is mainly developed by Nicolas Lœuillet under the MIT License
-
-Thank you so much to @tcitworld and @mariroz.
-
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

Capfile

@@ -0,0 +1,13 @@
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/deploy'
+
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+require 'capistrano/symfony'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

GUIDELINES.md

@@ -1,53 +0,0 @@
-# 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,9 +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 and 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 **unstable** branch, everything can be broken :)
+
+If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
+
+```
+composer create-project wallabag/wallabag wallabag 2.0.*@alpha
+php bin/console wallabag:install
+php bin/console server:run
+```
+
 ## License
-Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

TRANSLATION.md

@@ -1,67 +0,0 @@
-# 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

@@ -1,71 +0,0 @@
-
-$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,7 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
+{
+}

app/AppKernel.php

@@ -0,0 +1,68 @@
+<?php
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = [
+            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(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+        ];
+
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
+            $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 getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/var/logs';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+    }
+}

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([$loader, 'loadClass']);
+
+return $loader;

app/config/capistrano/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'

app/config/capistrano/deploy/staging.rb

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

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:  session.handler.native_file
+        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
+    fragments:       ~
+    http_method_override: true
+    assets: ~
+
+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"
+    form_themes:
+        - "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
+
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
+# 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:
+        bundle_resource:
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+
+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,44 @@
+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
+            channels: [!event]
+        console:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: INFO
+                VERBOSITY_VERY_VERBOSE: DEBUG
+            channels: [!event, !doctrine]
+        console_very_verbose:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: NOTICE
+                VERBOSITY_VERY_VERBOSE: NOTICE
+                VERBOSITY_DEBUG: DEBUG
+            channels: [doctrine]
+
+assetic:
+    use_controller: true
+
+swiftmailer:
+    # see http://mailcatcher.me/
+    transport: smtp
+    host: 'localhost'
+    port: 1025

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,75 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    # Uncomment these settings or manually update your parameters.yml
+    # to use docker-compose
+    #
+    # database_driver: %env.database_driver%
+    # database_host: %env.database_host%
+    # database_port: %env.database_port%
+    # database_name: %env.database_name%
+    # database_user: %env.database_user%
+    # database_password: %env.database_password%
+
+    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,14 @@
+_wdt:
+    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    prefix:   /_wdt
+
+_profiler:
+    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    prefix:   /_profiler
+
+_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,60 @@
+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:
+        # disables authentication for assets and the profiler, adapt it according to your needs
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        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_token_generator: security.csrf.token_manager
+
+            anonymous:    true
+            remember_me:
+                secret:   "%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

bin/console

@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+// 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);
+
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);

bin/doctrine

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine

bin/doctrine-dbal

@@ -0,0 +1 @@
+../vendor/doctrine/dbal/bin/doctrine-dbal

bin/doctrine-migrations

@@ -0,0 +1 @@
+../vendor/doctrine/migrations/bin/doctrine-migrations

bin/doctrine.php

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine.php

bin/phpunit

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

bin/security-checker

@@ -0,0 +1 @@
+../vendor/sensiolabs/security-checker/security-checker

bin/symfony_requirements

@@ -0,0 +1,143 @@
+#!/usr/bin/env php
+<?php
+
+require_once dirname(__FILE__).'/../var/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;
+}

build.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/var/cache"/>
+    </target>
+
+    <target name="prepare" description="Prepare for build">
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/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}/bin/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}/bin/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}/bin/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_essentials.php

@@ -1,14 +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_setup.php

@@ -1,12 +0,0 @@
-<?php
-
-// Check if /cache is writeable
-if (! is_writable('cache')) {
-    die('The directory "cache" 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

@@ -16,6 +16,11 @@
             "name": "Thomas Citharel",
             "homepage": "http://tcit.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "homepage": "http://www.j0k3r.net",
+            "role": "Developer"
         }
     ],
     "support": {
@@ -23,9 +28,92 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.3.3",
-        "twig/twig": "1.*",
-        "twig/extensions": "1.0.*",
-        "umpirsky/twig-gettext-extractor": "1.1.*"
-    }
+        "php": ">=5.5.9",
+        "symfony/symfony": "3.0.*",
+        "doctrine/orm": "^2.5",
+        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-cache-bundle": "^1.2",
+        "twig/extensions": "~1.0",
+        "symfony/assetic-bundle": "~2.3",
+        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/monolog-bundle": "^2.8",
+        "sensio/distribution-bundle": "^5.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
+        "incenteev/composer-parameter-handler": "^2.0",
+        "nelmio/cors-bundle": "~1.4.0",
+        "friendsofsymfony/rest-bundle": "~1.4",
+        "jms/serializer-bundle": "~1.0",
+        "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": "~1.0",
+        "htmlawed/htmlawed": "~1.1.19",
+        "liip/theme-bundle": "~1.1",
+        "pagerfanta/pagerfanta": "~1.0.3",
+        "lexik/form-filter-bundle": "~5.0",
+        "j0k3r/graby": "~1.0",
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "scheb/two-factor-bundle": "~2.0",
+        "grandt/phpepub": "~4.0",
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10",
+        "guzzlehttp/guzzle": "^5.2.0",
+        "doctrine/doctrine-migrations-bundle": "^1.0",
+        "paragonie/random_compat": "~1.0"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "sensio/generator-bundle": "^3.0",
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "^2.7"
+    },
+    "scripts": {
+        "build-parameters": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+        ],
+        "post-cmd": [
+            "@build-parameters",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+        ],
+        "post-install-cmd": [
+            "@post-cmd"
+        ],
+        "post-update-cmd": [
+            "@post-cmd"
+        ]
+    },
+    "extra": {
+        "symfony-app-dir": "app",
+        "symfony-bin-dir": "bin",
+        "symfony-var-dir": "var",
+        "symfony-web-dir": "web",
+        "symfony-tests-dir": "tests",
+        "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-4": { "": "src/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

db/.htaccess

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

docker-compose.yml

@@ -0,0 +1,42 @@
+nginx:
+    image: nginx
+    ports:
+        - "8080:80"
+    volumes:
+        - ./docker/nginx/nginx.conf:/nginx.conf
+        - ./docker/logs/nginx:/var/log/nginx
+        - .:/var/www/html
+    links:
+        - php:php
+    command: nginx -c /nginx.conf
+php:
+    build: docker/php
+    ports:
+        - "9000:9000"
+    volumes:
+        - .:/var/www/html
+    #links:
+        # - "postgres:rdbms"
+        # - "mariadb:rdbms"
+    env_file:
+        - ./docker/php/env
+        # Comment non-used DBMS lines
+        # If all DBMS are commented out, sqlite will be used as default
+        # - ./docker/postgres/env
+        # - ./docker/mariadb/env
+#postgres:
+#    image: postgres:9
+#    ports:
+#        - "5432:5432"
+#    volumes:
+#        - ./docker/data/pgsql:/var/lib/postgresql/data
+#    env_file:
+#        - ./docker/postgres/env
+#mariadb:
+#    image: mariadb:10
+#    ports:
+#        - "3306:3306"
+#    volumes:
+#        - ./docker/data/mariadb:/var/lib/mysql
+#    env_file:
+#        - ./docker/mariadb/env

docker/mariadb/env

@@ -0,0 +1,10 @@
+MYSQL_ROOT_PASSWORD=wallaroot
+MYSQL_USER=wallabag
+MYSQL_PASSWORD=wallapass
+MYSQL_DATABASE=wallabag
+SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+SYMFONY__ENV__DATABASE_HOST=rdbms
+SYMFONY__ENV__DATABASE_PORT=3306
+SYMFONY__ENV__DATABASE_NAME=wallabag
+SYMFONY__ENV__DATABASE_USER=wallabag
+SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docker/nginx/nginx.conf

@@ -0,0 +1,89 @@
+user  nginx;
+worker_processes  1;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  2048;
+    multi_accept on;
+    use epoll;
+}
+
+http {
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    server_tokens off;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 15;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log off;
+    error_log off;
+    gzip on;
+    gzip_disable "msie6";
+    open_file_cache max=100;
+
+
+    upstream php-upstream {
+        server php:9000;
+    }
+
+    server {
+        #server_name domain.tld www.domain.tld;
+        root /var/www/html/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        # DEV
+        # This rule should only be placed on your development environment
+        # In production, don't include this and don't deploy app_dev.php or config.php
+        location ~ ^/(app_dev|config)\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+        }
+        # PROD
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            # Prevents URIs that include the front controller. This will 404:
+            # http://domain.tld/app.php/some-path
+            # Remove the internal directive to allow URIs like this
+            internal;
+        }
+
+        error_log /var/log/nginx/project_error.log;
+        access_log /var/log/nginx/project_access.log;
+    }
+
+}
+
+daemon off;

docker/php/Dockerfile

@@ -0,0 +1,10 @@
+FROM php:fpm
+
+RUN apt-get update && apt-get install -y \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
+    && docker-php-ext-install \
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
+
+RUN usermod -u 1000 www-data
+
+CMD ["php-fpm"]

docker/php/env

@@ -0,0 +1,6 @@
+SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite
+SYMFONY__ENV__DATABASE_HOST=127.0.0.1
+SYMFONY__ENV__DATABASE_PORT=~
+SYMFONY__ENV__DATABASE_NAME=symfony
+SYMFONY__ENV__DATABASE_USER=root
+SYMFONY__ENV__DATABASE_PASSWORD=~

docker/postgres/env

@@ -0,0 +1,9 @@
+POSTGRES_USER=wallabag
+POSTGRES_PASSWORD=wallapass
+POSTGRES_DB=wallabag
+export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
+export SYMFONY__ENV__DATABASE_HOST=rdbms
+export SYMFONY__ENV__DATABASE_PORT=5432
+export SYMFONY__ENV__DATABASE_NAME=wallabag
+export SYMFONY__ENV__DATABASE_USER=wallabag
+export SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docs/CNAME

@@ -1 +0,0 @@
-doc.wallabag.org

docs/_index.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - user, admin and developer documentation</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    user, admin and developer documentation
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <p><strong>Welcome on wallabag documentation</strong>. Thanks to this tool, we hope that you can easily use wallabag and work with it. </p>
-<p>Today, we have two documentations: for <strong>users</strong> and for <strong>developers</strong>. Just select your language and good reading!<br />
-Feel free to <a href="https://github.com/wallabag/documentation">contribute to this documentation</a>. It's your documentation. </p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/css/highlight.tomorrow-night.css

@@ -1,45 +0,0 @@
-/* Tomorrow Night Theme */
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
-/* Original theme - https://github.com/chriskempson/tomorrow-theme */
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
-.tomorrow-comment, pre .comment, pre .title {
-  color: #969896;
-}
-
-.tomorrow-red, pre .variable, pre .attribute, pre .tag, pre .regexp, pre .ruby .constant, pre .xml .tag .title, pre .xml .pi, pre .xml .doctype, pre .html .doctype, pre .css .id, pre .css .class, pre .css .pseudo {
-  color: #cc6666;
-}
-
-.tomorrow-orange, pre .number, pre .preprocessor, pre .built_in, pre .literal, pre .params, pre .constant {
-  color: #de935f;
-}
-
-.tomorrow-yellow, pre .class, pre .ruby .class .title, pre .css .rules .attribute {
-  color: #f0c674;
-}
-
-.tomorrow-green, pre .string, pre .value, pre .inheritance, pre .header, pre .ruby .symbol, pre .xml .cdata {
-  color: #b5bd68;
-}
-
-.tomorrow-aqua, pre .css .hexcolor {
-  color: #8abeb7;
-}
-
-.tomorrow-blue, pre .function, pre .python .decorator, pre .python .title, pre .ruby .function .title, pre .ruby .title .keyword, pre .perl .sub, pre .javascript .title, pre .coffeescript .title {
-  color: #81a2be;
-}
-
-.tomorrow-purple, pre .keyword, pre .javascript .function {
-  color: #b294bb;
-}
-
-pre code {
-  display: block;
-  background: #1d1f21;
-  color: #c5c8c6;
-  font-family: Menlo, Monaco, Consolas, monospace;
-  line-height: 1.5;
-  border: 1px solid #ccc;
-  padding: 10px;
-}

docs/css/main.css

@@ -1,99 +0,0 @@
-body {
-    font-size: 19px;
-}
-
-main {
-    margin-top: 90px;
-}
-
-section {
-    margin-bottom: 50px;
-}
-
-h1, h2, h3, h4 {
-    color: #df691a;
-}
-h3 {
-    font-size: 23px;
-}
-
-li {
-    margin-bottom: 3px;
-}
-
-img {
-    max-width: 100%;
-}
-
-header.navbar {
-    opacity: 0.9;
-}
-.navbar .navbar-brand {
-    font-size: 28px;
-    height: auto;
-    line-height: 50px;
-    margin-left: 20px;
-    color: #df691a;
-}
-.navbar a.navbar-brand:hover {
-    color: #df691a;
-}
-.navbar .navbar-brand small {
-    font-size: 18px;
-    font-weight: 300;
-    margin-left: 10px;
-    color: white;
-}
-
-@media (min-width: 768px) {
-    #sidebar {
-        /*position:fixed;*/
-    }
-}
-@media (max-width: 960px) {
-    body {
-        font-size: 17px;
-    }
-    pre {
-        font-size: 12px;
-    }
-}
-
-#sidebar {
-    font-size: 16px;
-}
-
-.page-header {
-    margin-top: 0;
-}
-
-#sidebar .github-star {
-    margin-top: 20px;
-    margin-left: 50px;
-}
-
-#sidebar .text-muted {
-    color: #859AAF;
-}
-
-pre {
-    padding: 0;
-    border-color: #3D5166;
-    background-color: #1D2B3A;
-    border-radius: 4px;
-    margin: 15px;
-}
-pre code {
-    border: none;
-    background-color: #1D2B3A;
-}
-
-code {
-    font-size: 85%;
-    padding: 4px 4px 1px;
-    margin: 0 4px;
-    border-radius: 3px;
-    color: #c5c8c6;
-    border: solid 1px #3D5166;
-    background-color: #1D2B3A;
-}

docs/de/Administrator/herunterladen_und_installieren.html

@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - wallabag herunterladen und installieren</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    wallabag herunterladen und installieren
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="wallabag-herunterladen-und-installieren">wallabag herunterladen und installieren</h1>
-<h2 id="ich-mchte-wallabag-nicht-installieren">Ich möchte wallabag nicht installieren</h2>
-<p>Wenn du wallabag nicht auf einem eigenen Server installieren kannst oder möchtest, solltest du ein kostenloses Benutzerkonto auf Framabag erstellen, wo wallabag genutzt wird.</p>
-<h2 id="ich-mchte-wallabag-installieren">Ich möchte wallabag installieren</h2>
-<p><a href="http://www.wallabag.org/download">Lade die neueste Version von wallabag herunter</a> und entpacke sie. Kopiere die entpackten Dateien und Verzeichnisse auf deinen Webserver.</p>
-<h2 id="voraussetzungen-fr-den-webserver">Voraussetzungen für den Webserver</h2>
-<ul>
-<li><a href="http://php.net/manual/de/install.php">PHP 5.3.3 oder höher</a></li>
-<li><a href="http://php.net/manual/de/book.sqlite.php">SQLite</a> oder <a href="http://php.net/manual/de/book.mysql.php">MySQL</a> oder <a href="http://php.net/manual/de/book.pgsql.php">PostgreSQL</a></li>
-<li><a href="http://php.net/de/xml">XML for PHP</a></li>
-<li><a href="http://php.net/de/pcre">PCRE</a></li>
-<li><a href="http://php.net/manual/de/book.filter.php">Data filtering</a></li>
-<li><a href="http://php.net/de/tidy">Tidy for PHP</a></li>
-<li><a href="http://php.net/de/curl">cURL</a></li>
-<li><a href="http://www.php.net/manual/de/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></li>
-<li><a href="http://php.net/manual/de/book.gettext.php">gettext</a></li>
-</ul>
-<p>Um zu überprüfen, ob dein Server die Voraussetzungen erfüllt, kannst du <code>wallabag_compatibility_test.php</code> ausführen. Diese Datei liegt im <code>install</code>-Verzeichnis von wallabag.</p>
-<h2 id="installation-der-abhngigkeiten">Installation der Abhängigkeiten</h2>
-<p>Damit wallabag ordnungsgemäß funktioniert, müssen einige Abhängigkeiten erfüllt werden. Um diese zu installieren, muss <code>composer</code> verwendet werden. Führe folgende Kommandos in deinem wallabag-Verzeichnis aus:</p>
-<pre><code>curl -s http://getcomposer.org/installer | php
-php composer.phar install</code></pre>
-<p>Falls du <code>composer</code> nicht installieren kannst, kannst du alternativ <a href="http://wllbg.org/vendor">vendor.zip</a> herunterladen und in deinem wallabag-Verzeichnis entpacken. </p>
-<h2 id="berechtigungen">Berechtigungen</h2>
-<p>Dein Webserver braucht Schreibrechte in den Verzeichnissen <code>assets</code>, <code>cache</code>, und <code>db</code>. Bei fehlenden Schreibrechten kann die Installation nicht ausgeführt werden.</p>
-<h2 id="wallabag-installieren-endlich">wallabag installieren. Endlich.</h2>
-<p>Rufe wallabag in deinem Browser auf. Wenn dein Server richtig konfiguriert ist, wird die Setup-Seite angezeigt.</p>
-<p>Gib dort deinen Datenbank-Typ an (<code>sqlite</code>, <code>mysql</code> oder <code>postgresql</code>) und die Angaben für dein Benutzerkonto</p>
-<p>wallabag ist jetzt fertig installiert.</p>
-<h2 id="anmelden">Anmelden</h2>
-<p>Rufe wallabag in deinem Webbrowser auf und gib deinen Benutzernamen und dein Passwort ein, um dich anzumelden.</p>
-<p>Viel Spaß!</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/artikel_lesen.html

@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Artikel lesen</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Artikel lesen
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="artikel-lesen">Artikel lesen</h1>
-<p>Zum Lesen eines Artikels klicke einfach auf den zugehörigen Link.</p>
-<h2 id="weiterlesen-von-artikeln">Weiterlesen von Artikeln</h2>
-<p>Wenn du einen Artikel schließt, merkt sich wallabag die Stelle, an der du aufgehört hast zu lesen. So kannst du dort weiterlesen, wo du aufgehört hast.
-Das funktioniert nur in der Web-Anwendung.</p>
-<h2 id="mgliche-aktionen-fr-artikel">Mögliche Aktionen für Artikel</h2>
-<p>Die hier beschriebenen Aktionen können mit Hilfe der am oberen Seitenrand angezeigten Symbole ausgeführt werden.
-Die Beschreibung hier orientiert sich am Theme &quot;Baggy&quot; (<a href="wallabag_konfigurieren.html">Theme ändern</a>), die Symbole in den anderen Themes sind im Wesentlichen gleich.
-Die Aktionen in Reihenfolge der Symbole sind:</p>
-<h3 id="den-originalartikel-lesen">Den Originalartikel lesen</h3>
-<p>Ein Klick auf dieses Symbol öffnet den Originalartikel.</p>
-<h3 id="artikel-als-gelesen-markieren">Artikel als gelesen markieren</h3>
-<p>Markiert den Artikel als gelesen und verschiebt ihn ins Archiv (zu erreichen über den Eintrag <em>Archiv</em> im Menü).
-Ein erneuter Klick auf das Symbol setzt den Zustand des Artikels zurück auf &quot;ungelesen&quot;.</p>
-<h3 id="artikel-favorisieren">Artikel favorisieren</h3>
-<p>Ein Klick auf dieses Symbol markiert den Artikel als Lieblngsartikel. Eine Liste aller so favorisierten Artikel kann über den Punkt &quot;Favoriten&quot; im wallabag-Menü aufgerufen werden.</p>
-<p>Durch einen erneuten Klick auf das Symbol kann der Favoriten-Status wieder aufgehoben werden</p>
-<h3 id="artikel-lschen">Artikel löschen</h3>
-<p>Löscht den Artikel aus deiner wallabag. Diese Aktion kann nicht rückgängig gemacht werden. </p>
-<p><strong>Achtung</strong>: Es wird keine Bestätigung zum Löschen angefordert!</p>
-<h3 id="twitter">Twitter</h3>
-<p>Teile den Titel und Link zum Original-Artikel auf Twitter.</p>
-<h3 id="per-e-mail">Per E-Mail</h3>
-<p>Teile den Titel und Link zum Original-Artikel per E-Mail.</p>
-<h3 id="artikel-drucken">Artikel drucken</h3>
-<p>Öffnet den Druckdialog des Browsers zum Drucken des Artikels.</p>
-<h3 id="epub-erstellen">EPUB erstellen</h3>
-<p>Wandelt den Artikel ins EPUB-Format um. Eine genauere Beschreibung dazu gibt es im Kapitel (<a href="/de/Anwenderdokumentation/ePub_erstellen">ePub erstellen</a>).</p>
-<h3 id="fehlerhafte-anzeige-des-artikels-melden">Fehlerhafte Anzeige des Artikels melden</h3>
-<p>Hiermit kann gemeldet werden, dass der Artikel nicht wie erwartet angezeigt wird. Eine genauere Beschreibung dazu gibt es im Kapitel <a href="/de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt">Eine vollständige oder Kapitel existieren</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/den_ersten_artikel_speichern.html

@@ -1,175 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Den ersten Artikel speichern</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Den ersten Artikel speichern
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="den-ersten-artikel-speichern">Den ersten Artikel speichern</h1>
-<p>Einmal angemeldet, gibt es viele Möglichkeiten, Artikel zu speichern.</p>
-<h2 id="in-der-webanwendung">In der Webanwendung</h2>
-<p>Klicke in der Menüleiste auf den Eintrag &quot;Speichere einen Link&quot;, gib in das erscheinende Popup-Fenster den Link ein und klicke auf &quot;Link speichern!&quot;.</p>
-<p>Das Standardverhalten von wallabag ist, nur den Text des Artikels zu speichern. Wenn du möchtest, dass wallabag auch Kopien der im Artikel enthaltenen Bilder auf deinem Server speichert, musst du die Einstellung <em>DOWNLOAD_PICTURES</em> aktivieren. Lies dazu das Kapitel über die versteckten Einstellungen.</p>
-<h2 id="mit-dem-bookmarklet">Mit dem Bookmarklet</h2>
-<p><a href="https://de.wikipedia.org/wiki/Bookmarklet">Aus Wikipedia</a></p>
-<pre><code>Ein Bookmarklet (auch Favelet) ist ein kleines in JavaScript geschriebenes Makro, das als Bookmark abgespeichert wird und dadurch die Funktionen eines Webbrowsers erweitert.</code></pre>
-<h2 id="auf-deinem-smartphone">Auf deinem Smartphone</h2>
-<h3 id="vorbereitung">Vorbereitung</h3>
-<p>Um Artikel vom Smartphone aus zu lesen, musst du in den wallabag-Einstellungen RSS-Feeds aktivieren. Nach der Aktivierung werden benötigte Informationen wie das Sicherheits-Token angezeigt. Weiterführende Informationen findest du im Kapitel über RSS-Feeds.</p>
-<h3 id="android">Android</h3>
-<h4 id="installation-und-konfiguration">Installation und Konfiguration</h4>
-<p>Du findest die wallabag-Android-App im <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">Google Play Store</a> oder bei <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche">F-droid</a>. Es gibt keinen Unterschied zwischen der im Google Play Store und der bei F-Droid angebotenen Version.</p>
-<p>Nach der Installation musst du auf <strong>Einstellungen</strong> tippen, deine wallabag <strong>URL (gesamte Adresse deiner wallabag-Installation oder deines Framabag-Kontos)</strong> und deine <strong>User ID (im Normalfall 1)</strong> in die entsprechenden Felder eingeben. Wenn du mehrere Accounts angelegt hast, musst du den Account angeben, mit dem du die App verbinden willst, sowie das zugehörige Sicherheits-<strong>Token</strong> (achte darauf, alle Buchstaben und Ziffern des Tokens anzugeben, so wie es auf der Konfigurationsseite von wallabag angegeben ist).</p>
-<h4 id="einen-artikel-speichern">Einen Artikel speichern</h4>
-<p>Wenn du alles richtig eingestellt hast, kannst du beim Surfen im Webbrowser Artikel ganz einfach speichern. Wähle im <strong>Teilen</strong>-Menü deines Browsers den Eintrag <strong>Bag it!</strong> und der Artikel wir deiner wallabag hinzugefügt.</p>
-<h4 id="lesen">Lesen</h4>
-<p>Um die Liste deiner Artikel zu laden, klicke in der wallabag-App auf <strong>Synchronisieren</strong>. Die Artikel werden nun auf dein Telefon heruntergeladen. Nun brauchst du zum Lesen der Artikel keine Internetverbindung mehr. Klicke auf <strong>Artikelliste</strong>, um einen Artikel zum Lesen auszuwählen.</p>
-<p>Am Ende jedes Artikels wird eine <strong>Als gelesen markieren</strong>-Schaltfläche angezeigt, mit der der Artikel archiviert werden kann.</p>
-<p>Momentan funktioniert die Synchronisation nur in eine Richtung (von wallabag zur Android-App), so dass auf dem Smartphone archivierte Artikel nicht auch in wallabag auf dem Server archiviert werden.</p>
-<h3 id="ios">iOS</h3>
-<h4 id="installation-und-konfiguration-1">Installation und Konfiguration</h4>
-<p>Du kannst die wallabag App im <a href="https://itunes.apple.com/app/id828331015">AppStore</a> herunterladen.</p>
-<p>Nach der Installation kannst du die App mit deiner wallabag verbinden, indem du folgende Daten konfigurierst: deine wallabag <strong>URL (gesamte Adresse deiner wallabag-Installation oder deines Framabag-Kontos)</strong> und deine <strong>User ID (im Normalfall 1)</strong> in die entsprechenden Felder eingeben. Wenn du mehrere Accounts angelegt hast, musst du den Account angeben, mit dem du die App verbinden willst, sowie das zugehörige Sicherheits-<strong>Token</strong> (achte darauf, alle Buchstaben und Ziffern des Tokens anzugeben, so wie es auf der Konfigurationsseite von wallabag angegeben ist).</p>
-<h4 id="anwendung">Anwendung</h4>
-<p>Nach erfolgreicher Konfiguration werden deine Artikel in die App geladen und in der Liste angezeigt (Ziehe diese Liste mit der pull-to-refresh Geste herunter, um ein manuelles Update zu starten). Alle geladenen Artikel stehen in der App nun auch offline zur Verfügung.</p>
-<p>Zurzeit können Artikel leider nur lokal als gelesen markiert werden (es wird nicht mit der wallabag synchronisiert).</p>
-<h4 id="artikel-speichern">Artikel speichern</h4>
-<p>Artikel können z.B. vom Safari-Browser aus in deine wallabag gespeichert werden. Wähle dazu einfach im <strong>Teilen</strong>-Menü den eintrag <strong>Bag it!</strong> aus (falls du das wallabag Icon nicht findest, aktiviere es unter <strong>Mehr</strong>). Wenn alles richtig eingestellt ist wird dein Artikel gespeichert.</p>
-<h3 id="windows-phone">Windows Phone</h3>
-<h4 id="installation-und-konfiguration-2">Installation und Konfiguration</h4>
-<p>Du kannst die Windows Phone-App aus dem <a href="http://www.windowsphone.com/fr-fr/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450">Windows Store</a> oder direkt aus dem Store deines Smartphones.</p>
-<p>Nach der Installation wirst du über eine Benachrichtigung dazu aufgefordert, die App zu konfigurieren. Öffne den <strong>Einstellungen</strong>-Abschnitt der App, indem du das Drei-Punkte-Menü am unteren Rand des Bildschirms. Gib nun die <strong>URL (gesamte Adresse deiner wallabag-Installation oder deines Framabag-Kontos)</strong> und deine <strong>User ID (im Normalfall 1)</strong> in die entsprechenden Felder ein.</p>
-<p>Wenn du mehrere Accounts angelegt hast, musst du den Account angeben, mit dem du die App verbinden willst, sowie das zugehörige Sicherheits-<strong>Token</strong> (achte darauf, alle Buchstaben und Ziffern des Tokens anzugeben, so wie es auf der Konfigurationsseite von wallabag angegeben ist).</p>
-<h2 id="mit-dem-browser">Mit dem Browser</h2>
-<h3 id="firefox">Firefox</h3>
-<p>Lade das Firefox-Addon von <a href="https://addons.mozilla.org/firefox/addon/wallabag/">addons.mozilla.org</a> herunter und installiere es.</p>
-<p>Gib die URL deiner wallabag-Installation oder deines Framabag-Kontos ein den Einstellungen des Addons ein.</p>
-<p>Um das Addon zu nutzen, musst du die Werkzeugleiste von Firefox anpassen (Menü&gt;Anpassen) und das wallabag (<strong>W</strong>)-Icon hinzufügen. Um einen Artikel zu speichern, klicke auf dieses wallabag-Icon. Ein neues Fenster wird geöffnet, der Artikel wird deiner wallabag hinzugefügt und das Fenster automatisch wieder geschlossen. Das funktioniert am Besten, wenn du bereits in deiner wallabag angemeldet bist, ansonsten kannst du das in dem gerade geöffneten Fenster nachholen.</p>
-<h3 id="chrome">Chrome</h3>
-<p>Lade das Chrome-Addon aus dem <a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj">Chrome-Webstore</a> herunter und installiere es.</p>
-<p>Gib die URL deiner wallabag-Installation oder deines Framabag-Kontos ein den Einstellungen des Addons ein.</p>
-<p>Während der Installation wird in der Chrome-Werkzeugleiste ein neues <strong>W</strong>-Icon erscheinen. Ein neues Fenster wird geöffnet, der Artikel wird deiner wallabag hinzugefügt und das Fenster automatisch wieder geschlossen. Das funktioniert am Besten, wenn du bereits in deiner wallabag angemeldet bist, ansonsten kannst du das in dem gerade geöffneten Fenster nachholen.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html

@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Ein Artikel wird nicht korrekt angezeigt</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Ein Artikel wird nicht korrekt angezeigt
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="ein-artikel-wird-nicht-korrekt-angezeigt">Ein Artikel wird nicht korrekt angezeigt</h1>
-<p>Wenn du meinst, dass wallabag einen Artikel nicht korrekt anzeigt (z.B. fehlender oder unvollständiger Text, nur eine von mehreren Artikelseiten oder störende Werbung im Text), gibt es mehrere Möglichkeiten, wie du helfen kannst, wallabag besser zu machen.</p>
-<h2 id="melden-des-anzeigeproblems">Melden des Anzeigeproblems</h2>
-<p>Egal ob du uns per Mail oder über ein Ticket auf GitHub über die fehlerhafte Anzeige informierst: folgende Angaben helfen uns, das Problem zu lösen.</p>
-<ul>
-<li>Die URL des Artikels.</li>
-<li>Wie stellt wallabag den Artikel momentan dar?</li>
-<li>Was hättest du stattdessen erwartet?</li>
-<li>Deine wallabag-Version bzw. ob du Framabag verwendest.</li>
-</ul>
-<h3 id="variante-1-ein-ticket-auf-github-erffnen">Variante 1: Ein Ticket auf GitHub eröffnen</h3>
-<p>Um ein <a href="https://github.com/wallabag/wallabag/issues/new">Ticket auf GitHub zu eröffnen</a>, benötigst du dort ein Benutzerkonto. Bitte vergiss nicht, in der Ticketbeschreibung die oben genannten Angaben zu machen.
-Danke!</p>
-<h3 id="variante-2-e-mail">Variante 2: E-Mail</h3>
-<p>Sende uns eine E-Mail mit dem Betreff <code>Wrong display in wallabag</code> an [hello@wallabag.org](mailto: hello@wallabag.org).
-Bitte vergiss nicht, in der E-Mail die oben genannten Angaben zu machen.
-Danke!</p>
-<h2 id="lsung-des-anzeigeproblems">Lösung des Anzeigeproblems</h2>
-<p>TODO</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/epub-konvertierung.html

@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - EPUB-Konvertierung</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    EPUB-Konvertierung
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="e-book-im-epub-format-erstellen">E-Book im EPUB-Format erstellen</h1>
-<p>Damit die gespeicherten Artikel auch bei langen Winterabenden unter dem Leselicht genossen werden können, kann wallabag sie in ein E-Book im EPUB-Format umwandeln.</p>
-<h2 id="warnung">Warnung</h2>
-<p>Bitte beachte jedoch, dass das Erstellen der EPUB-Datei sehr ressourcenintensiv für den Server, auf dem wallabag installiert ist, sein kann.
-Es hängt von der Anzahl der Elemente und deren Länge ab. Daher ist es empfehlenswert, keine übermäßig großen E-Books zu erstellen, sofern dies nicht erforderlich ist.</p>
-<h2 id="wo-kann-ich-meine-artikel-konvertieren">Wo kann ich meine Artikel konvertieren?</h2>
-<p>Sie können Ihre Artikel aus verschiedenen Orten in wallabag konvertieren:</p>
-<ul>
-<li>Bei dem Lesen eines Artikel: wallabag wird nur diesen einen Artikel konvertieren.</li>
-<li>Bei einer Artikelliste (ungelesen, Favoriten, Archiv): Alle Artikel aus dieser Kategorie werden konvertiert.</li>
-<li>Aus der Suche heraus: Am Ende der Seite ist ein Link, der alle Suchergebnisse konvertiert.</li>
-<li>Auf der Konfigurationsseite: Alle Artikel, egal welche Kategorie, können hier in ein E-Book konvertiert werden.</li>
-</ul>
-<p>TODO Calibre mit wallabag verwenden</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/framabag.html

@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Framabag-Account erstellen</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Framabag-Account erstellen
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="framabag-account-erstellen">Framabag-Account erstellen</h1>
-<p>Da du eventuell dich nicht das Wissen hast, um wallabag zu installieren, oder nicht für Installation und Aktualisierung zuständig sein möchtest, ist es möglich, ein kostenloses Konto bei <a href="https://www.framabag.org">Framabag.org</a> zu erstellen.</p>
-<h2 id="benutzerkonto-erstellen">Benutzerkonto erstellen</h2>
-<p>Klicke auf die Schaltfläche <strong>Créez votre compte / Create your account</strong>.
-Danach musst du einige Informationen angeben: Benutzernamen, Passwort und E-Mail-Adresse. Deine E-Mail-Adresse wird nur dazu verwendet, um dein Konto zu bestätigen oder wenn du den Newsletter (3-4 E-Mails jährlich) abonniert hast.</p>
-<p>Sobald alle Daten überprüft worden, erhältst du eine E-Mail mit einem Bestätigungslink. Klicke darauf, um das Konto zu erstellen.</p>
-<p>Du wirst eine letzte E-Mail mit der Adresse deines Framabag-Kontos in dieser Form <code>https://www.framabag.org/u/votre-nom-d'utilisateur</code>.</p>
-<h2 id="speicherung-ihrer-daten">Speicherung Ihrer Daten</h2>
-<p>Framabag verwendet eine Benutzerdatenbank. Aber wir werden keinen Gebrauch von deinen Daten machen.</p>
-<h2 id="passwort-vergessen">Passwort vergessen</h2>
-<p>Wenn du dein Passwort vergessen hast, um dich mit Framabag zu verbinden, ist ein Formular <a href="https://www.framabag.org">auf der Service-Homepage verfügbar</a>.
-Du erhältst einen Bestätigungslink und kannst über ihn dein neues Passwort festlegen.</p>
-<h2 id="lschen-des-kontos">Löschen des Kontos</h2>
-<p>Wenn du dein Konto löschen möchtest, kontaktiere uns per E-Mail: [hello@wallabag.org](mailto: hello@wallabag.org)
-Gib hierbei deinen Benutzernamen an, damit wir dich identifizieren können.</p>
-<p>Von dem Moment an, wo dein Konto gelöscht wurde, werden keine weiteren Informationen über dich auf Framabag gespeichert werden.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/versteckte_einstellungen.html

@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - user, admin and developer documentation</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    user, admin and developer documentation
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h2 id="vorsicht">Vorsicht!</h2>
-<p>Dieser Teil ist nur für fortgeschrittene Anwender.
-<strong>Solltest du beim Bearbeiten einer der Dateien etwas falsch machen, kann es sein, dass wallabag nicht mehr funktioniert.</strong>
-Es muss eine wichtige Datei von wallabag bearbeitet werden, <code>inc/poche/config.inc.php</code>, deshalb mache unbedingt eine Sicherungskopie dieser Datei, bevor du etwas änderst!</p>
-<p>Die Datei wird während der Installation von wallabag erzeugt und mit Standardeinstellungen initialisiert. Durch Anpassen der Datei kann das Verhalten von wallabag in einigen Punkten angepasst werden, die nicht über die nicht über der Konfigurationsseite verfügbar sind.</p>
-<h2 id="fortgeschrittene-einstellungen">Fortgeschrittene Einstellungen</h2>
-<p>Jeder der in <code>inc/poche/config.inc.php</code> definierten Parameter ist folgendermaßen angegeben:</p>
-<pre><code>@define ('PARAMETER_NAME', 'Parameter-Wert');</code></pre>
-<p>Es darf in jeder Zeile ausschließlich <code>Parameter-Wert</code> geändert werden.
-Ändere keine anderen in der Datei angegebenen Parameter!</p>
-<p>Änderbare Parameter: </p>
-<table>
-<thead>
-<tr>
-<th>PARAMETER_NAME</th>
-<th>Standardwert</th>
-<th>Beschreibung</th>
-<th style="text-align: center;">erwarteter Wert</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>HTTP_PORT</code></td>
-<td><code>80</code></td>
-<td>entspricht dem HTTP-Port auf deinem Webserver. Nur ändern, wenn sich dein Web-Server hinter einem Proxy befindet.</td>
-<td style="text-align: center;">ganze Zahl</td>
-</tr>
-<tr>
-<td><code>SSL_PORT</code></td>
-<td><code>443</code></td>
-<td>entspricht dem SSL-Port auf deinem Webserver. Ändern, wenn du sslh verwendest.</td>
-<td style="text-align: center;">ganze Zahl</td>
-</tr>
-<tr>
-<td><code>DEBUG_POCHE</code></td>
-<td><code>FALSE</code></td>
-<td>Wenn du Probleme mit wallabag hast, kann es bei der Fehlersuche helfen, den Debug-Modus zu aktivieren.</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>DOWNLOAD_PICTURES</code></td>
-<td><code>FALSE</code></td>
-<td>Damit kannst du Bilder aus Artikeln herunterladen (zusätzlich zum Artikeltext). Diese Einstellung ist standardmäßig deaktiviert, um eine Überlastung des Webservers zu vermeiden. Wir bevorzugen, dich diese Einstellung selbst aktivieren zu lassen.</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_TWITTER</code></td>
-<td><code>TRUE</code></td>
-<td>ermöglicht die gemeinsame Nutzung mit Twitter</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_MAIL</code></td>
-<td><code>TRUE</code></td>
-<td>ermöglicht den Austausch per E-Mail</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_SHAARLI</code></td>
-<td><code>FALSE</code></td>
-<td>ermöglicht die gemeinsame Nutzung mit einer Shaarli-Installation (ein Lesezeichen-Manager)</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHAARLI_URL</code></td>
-<td><code>'http://myshaarliurl.com'</code></td>
-<td>Definiert die URL Ihrer Installation Shaarli.</td>
-<td style="text-align: center;">URL</td>
-</tr>
-<tr>
-<td><code>FLATTR</code></td>
-<td><code>TRUE</code></td>
-<td>Aktiviert die Möglichkeit, einen Artikel zu flattrn ([Flattr ist eine Plattform für Mikrospenden] (<a href="http://de.wikipedia.org/wiki/Flattr">http://de.wikipedia.org/wiki/Flattr</a>)). Wenn ein Artikel flattrbar ist, wird ein Symbol angezeigt und ermöglicht es, eine Mikro-Spende an den Autor des Artikels zu senden.</td>
-<td style="text-align: center;"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHOW_PRINTLINK</code></td>
-<td><code>'1'</code></td>
-<td>Zeigt eine Link, um einen Artikel zu drucken.</td>
-<td style="text-align: center;"><code>'0'</code> (deaktiviert), <code>'1'</code> (aktiviert)</td>
-</tr>
-<tr>
-<td><code>SHOW_READPERCENT</code></td>
-<td><code>'1'</code></td>
-<td>Zeige den bereits gelesenen Anteil im Artikel (nur bei den Themes <code>default</code>, <code>dark</code>, <code>dmagenta</code>, <code>solarized</code>, <code>solarized-dark</code>).</td>
-<td style="text-align: center;"><code>'0'</code> (deaktiviert), <code>'1'</code> (aktiviert)</td>
-</tr>
-<tr>
-<td><code>PAGINATION</code></td>
-<td><code>'12'</code></td>
-<td>Definiert die Anzahl der Einträge, die auf einer Seite dargestellt werden.</td>
-<td style="text-align: center;">ganze Zahl</td>
-</tr>
-</tbody>
-</table>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/Anwender/wallabag_konfigurieren.html

@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - wallabag konfigurieren</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    wallabag konfigurieren
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="wallabag-konfigurieren">wallabag konfigurieren</h1>
-<p>Auf Konfigurationsseite kannst du die Einstellungen von wallabag anpassen. </p>
-<p>Einige Punkte der Konfigurationsseite werden hier nicht beschrieben, da für diese eigene Kapitel in der Dokumentation vorgesehen sind (RSS-Feeds, Import von einem Drittanbieter, Datenexport, EPUB-Konvertierung und Mehrbenutzermodus)</p>
-<h2 id="themes">Themes</h2>
-<p>Über Geschmack lässt sich nicht streiten. Deshalb lässt dir wallabag die Wahl zwischen verschiedenen Themes, um das Aussehen deinem Geschmack anzupassen.</p>
-<p>Wähle ein Theme aus der Auswahlliste und bestätige die Änderung durch einen Klick auf <strong>Aktualisieren</strong>.</p>
-<h2 id="sprache">Sprache</h2>
-<p>Wähle die Sprache deiner Wahl in der Auswahlliste und bestätige die Änderung durch Klick auf <strong>Aktualisieren</strong>.</p>
-<h2 id="passwort">Passwort</h2>
-<p>Um dein Passwort zu ändern, gib es in die zwei vorgesehenen Felder ein und bestätige die Änderung durch Klick auf <strong>Aktualisieren</strong>.</p>
-<p>Du wirst abgemeldet und musst für eine erneute Anmeldung dein neues Passwort nutzen.</p>
-<h2 id="den-cache-leeren">Den Cache leeren</h2>
-<p>Mit Hilfe des Caches kann wallabag einige Aufgaben schneller erledigen.</p>
-<p>Nach einem Update von wallabag sollte der Cache geleert werden. Klicke dazu auf den entsprechenden Link.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/index.html

@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Dokumentation (deutsch)</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Dokumentation (deutsch)
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="deutsch-dokumentation">Deutsch dokumentation</h1>
-<p><strong>wallabag</strong> ist eine Read-it-later-Anwendung: sie speichert Webseiten, indem sie lediglich die Inhalte behält. Elemente wie Navigations-Links und Werbung werden entfernt.</p>
-<h2 id="funktionen">Funktionen</h2>
-<ul>
-<li>Inhalte der Webseiten werden gespeichert: Texte und Bilder </li>
-<li>die Webanwendung passt sich dem benutzten Anzeigegerät (Smartphone, PC, ... ) an</li>
-<li>Artikel können als ePub exportiert werden</li>
-<li>dank Smartphone-Apps können Artikel auch offline gelesen werden</li>
-<li>dank Browser-Addons können neue Links schnell hinzugefügt werden</li>
-<li>viele Templates zur individuellen Anpassung des Erscheinungsbild von wallabag sind verfügbar</li>
-<li>... und viele weitere Funktionen! </li>
-</ul>
-<p>Diese Anwenderdokumentation soll zeigen, wie man wallabag nutzen kann.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/de/wallabag_unterstuetzen.html

@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - wallabag unterstuetzen</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    wallabag unterstuetzen
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                                                                                                                            <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/index.html">
-                                                   erste Schritte
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/de/wallabag_unterstuetzen.html">
-                                                   wallabag unterstuetzen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Administrator/herunterladen_und_installieren.html">
-                                                   herunterladen und installieren
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/den_ersten_artikel_speichern.html">
-                                                   Den ersten Artikel speichern
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/artikel_lesen.html">
-                                                   Artikel lesen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/versteckte_einstellungen.html">
-                                                   Versteckte einstellungen
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/wallabag_konfigurieren.html">
-                                                   wallabag konfigurieren
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/epub-konvertierung.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/ein_artikel_wird_nicht_korrekt_angezeigt.html">
-                                                   Ein Artikel wird nicht korrekt angezeigt
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/de/Anwender/framabag.html">
-                                                   Framabag Account erstellen
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                        
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="wallabag-unterstuetzen">wallabag unterstuetzen</h1>
-<h2 id="fehler-melden">Fehler melden</h2>
-<h3 id="den-wallabag-support-kontaktieren">Den wallabag-Support kontaktieren</h3>
-<p>TODO</p>
-<h3 id="einen-fehlerbericht-verfassen">Einen Fehlerbericht verfassen</h3>
-<p>TODO</p>
-<h2 id="die-dokumentation-schreiben-und-verbessern">Die Dokumentation schreiben und verbessern</h2>
-<p>TODO</p>
-<h2 id="fehler-beheben">Fehler beheben</h2>
-<p>TODO</p>
-<h2 id="weitersagen">Weitersagen</h2>
-<p>Es ist gar nicht schwer: sprich einfach über wallabag! Benutze den #wallabag-Hashtag in sozialen Netzwerken: twitter, Facebook, Diaspora*, Google+, etc.</p>
-<p>wallabag in sozialen Netzwerken: </p>
-<ul>
-<li><a href="https://framasphere.org/people/2335ff202f920132196e2a0000053625">Diaspora*</a></li>
-<li><a href="https:/twitter.com/wallabagapp">twitter</a></li>
-<li><a href="https://www.facebook.com/wallabag">Facebook</a></li>
-<li><a href="https://plus.google.com/+WallabagOrg/">Google+</a></li>
-</ul>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Administrator/download_and_install.html

@@ -1,261 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Download and install wallabag</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Download and install wallabag
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="download-and-install-wallabag">Download and install wallabag</h1>
-<h2 id="i-dont-want-to-install-wallabag">I don't want to install wallabag</h2>
-<p>If you can't or don't want to install Wallabag on your server, we suggest you create a free account on <a href="https://framabag.org/">Framabag</a> wich uses our software: read the complete documentation here (TODO write Create a framabag account).</p>
-<h2 id="i-want-to-install-wallabag">I want to install wallabag</h2>
-<h3 id="i-want-to-download-wallabag-the-easiest-way-possible">I want to download wallabag the easiest way possible</h3>
-<p><a href="http://wllbg.org/latest">Download the latest wallabag version</a> and unpack it. Copy the files on your web server. Jump off to next section.</p>
-<h3 id="i-want-to-download-wallabag-via-composer">I want to download wallabag via composer</h3>
-<p>You need to install composer: </p>
-<pre><code>curl -s http://getcomposer.org/installer | php</code></pre>
-<p>Next, on your web server, run this command: </p>
-<pre><code>composer create-project wallabag/wallabag . dev-master</code></pre>
-<p>All is downloaded into <code>wallabag</code> folder.</p>
-<h3 id="permissions">Permissions</h3>
-<p>Your web server needs a writing access to the <code>assets</code>, <code>cache</code> and <code>db</code> directories. Otherwise, a message will report that the installation is impossible.</p>
-<h3 id="installation-of-wallabag-at-last">Installation of wallabag. At last.</h3>
-<p>Access to wallabag from your web browser. If your server is correctly configured, you directly reach the setup screen. </p>
-<h4 id="prerequisites">Prerequisites</h4>
-<p>The installer will tell you which prerequisites are missing. If there's any, jump off to the <a href="#Prerequisites">corresponding session</a> to know how to deal with that problem.</p>
-<h4 id="twig-installation">Twig installation</h4>
-<p>wallabag is build with Twig, a template library. You have to download it for wallabag to work.</p>
-<ul>
-<li>One option is to choose the automatic download of the package which will be automatically downloaded and installed.</li>
-<li>If this option fails, you can choose the second option which is to manually download <a href="http://wllbg.org/vendor">the vendor package</a>, unzip it and copy the vendor directory in your wallabag directory</li>
-<li>
-<p>Finally, you can here also use Composer to install Twig by following the commands written on screen :</p>
-<pre><code>curl -s http://getcomposer.org/installer | php
-php composer.phar install</code></pre>
-</li>
-</ul>
-<h4 id="database-connection">Database connection</h4>
-<p>You have to choose a database system between:</p>
-<ul>
-<li><strong>SQLite</strong>: The easiest system of all. No extra configuration needed.</li>
-<li><strong>MySQL</strong>: A well known database system, which is in most cases more efficient than SQLite</li>
-<li><strong>Postgresql</strong>: Some people found it better than MySQL.</li>
-</ul>
-<p><em>Note :</em> If you're using MySQL or Postgresql, you have to <strong>fill all the fields</strong>, 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.</p>
-<h4 id="user-account">User Account</h4>
-<p>Finally, you need to create an user account. As always, be sure to choose a strong password.
-An email field is present but it is not at all required.</p>
-<p>If you get a green success message, it means wallabag is now installed.</p>
-<h3><a name="Prerequisites"></a>Prerequisites</h3>
-<h4 id="list-of-prerequisites-for-your-web-server">List of prerequisites for your web server</h4>
-<ul>
-<li><a href="http://php.net/manual/en/install.php">PHP 5.3.3 or more</a> <strong>with <a href="http://php.net/manual/en/book.pdo.php">PDO</a> support</strong></li>
-<li><a href="http://php.net/manual/en/book.sqlite.php">SQLite</a> <strong>or</strong> <a href="http://php.net/manual/en/book.mysql.php">MySQL</a> <strong>or</strong> <a href="http://php.net/manual/en/book.pgsql.php">PostgreSQL</a></li>
-<li><a href="http://php.net/en/xml">XML for PHP</a></li>
-<li><a href="http://php.net/en/pcre">PCRE</a></li>
-<li><a href="http://php.net/en/zlib">ZLib</a></li>
-<li><a href="http://php.net/en/mbstring">mbstring</a> and/or <a href="http://php.net/en/iconv">iconv</a></li>
-<li>The <a href="http://php.net/manual/en/book.dom.php">DOM/XML</a> extension</li>
-<li><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></li>
-<li><a href="http://php.net/manual/en/book.gettext.php">gettext</a></li>
-</ul>
-<p>Optionnal:</p>
-<ul>
-<li><a href="http://php.net/en/curl">cURL</a> (with Parallel URL fetching) or <a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></li>
-<li><a href="http://php.net/manual/en/book.image.php">GD</a></li>
-<li><a href="http://php.net/manual/en/book.filter.php">Data filtering</a></li>
-</ul>
-<h2 id="login">Login</h2>
-<p>From your web browser, you reach the login screen: fill your username and your password to connect to your account.</p>
-<p>Enjoy!</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Administrator/hidden_options.html

@@ -1,231 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Hidden options</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Hidden options
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="hidden-options">Hidden options</h1>
-<h2 id="caution">Caution</h2>
-<p><strong>Be careful</strong>, this section is destined to advanced users. We are going to modify an important wallabag configuration file, <code>inc/poche/config.inc.php</code>. It is therefore advised to do a backup of this file before you proceed.
-<strong>Any error occuring during the modification of a wallabag file could lead to malfunctions</strong>.</p>
-<p>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.</p>
-<p>In this file, there are some options that are not, as of now, available in the <strong>config</strong> page of wallabag.</p>
-<h2 id="modification-of-advanced-options">Modification of advanced options</h2>
-<p>Each option is defined this way:</p>
-<pre><code>@define ('OPTION_NAME', 'Value');</code></pre>
-<p>For each line, you can only modify the <code>Value</code> field.</p>
-<p>Here is the list of each option you can change:</p>
-<ul>
-<li><code>HTTP_PORT</code> (default: <code>80</code>) : the HTTP port of your web server. You may need to change it if your server is behind a proxy. Accepted values: number</li>
-<li><code>SSL_PORT</code> (default: <code>443</code>) : the HTTP port of your web server. You may need to change it if your server use SSLH. Accepted values: number</li>
-<li><code>MODE_DEMO</code> (default : <code>FALSE)</code>: If you ever wanted to set up a demonstration server... Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>DEBUG_POCHE</code> (default: <code>FALSE</code>) : if you encounter some problems with wallabag, we may ask you to active Debug mode.  Accepted values: <code>TRUE</code> or <code>FALSE</code>. Check the logs in cache/log.txt after activating that.</li>
-<li><code>ERROR_REPORTING</code> (default : <code>E_ALL &amp; ~E_NOTICE</code>) : Set to <code>E_ALL</code> if needed to look for eventual PHP errors.</li>
-<li><code>DOWNLOAD_PICTURES</code> (default: <code>FALSE</code>) : 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: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>REGENERATE_PICTURES_QUALITY</code> (default : <code>75</code>) : 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.</li>
-<li><code>SHARE_TWITTER</code> (default: <code>TRUE</code>) : enables Twitter sharing. Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_MAIL</code> (default: <code>TRUE</code>) : enables mail sharing. Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_EVERNOTE</code>(default : <code>FALSE</code>) : enables sharing with your Evernote account. Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_DIASPORA</code> (default : <code>FALSE</code>) : enables to share an article on your Diaspora account.</li>
-<li><code>DIASPORA_URL</code> (default : <code>http://diasporapod.com</code>) : The URL of your Diaspora* pod</li>
-<li><code>CARROT</code> (default : <code>FALSE</code>) : Like Flattr, it's a service to give small amounts of money to a web page. See <a href="http://carrot.org/">http://carrot.org/</a></li>
-<li><code>SHARE_SHAARLI</code> (default: <code>FALSE</code>) : enables sharing via your Shaarli installation (Shaarli is an open-source bookmark manager). Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHAARLI_URL</code> (default: <code>'http://myshaarliurl.com'</code>) : defines your Shaarli installation URL. Accepted values: an URL.</li>
-<li><code>FLATTR</code> (default: <code>TRUE</code>) : enables the possibility to Flattr an article (<a href="http://en.wikipedia.org/wiki/Flattr">Flattr is a microdonation platform</a>). If an article is Flattr-able, an icon will be displayed, allowing you to send a microdonation to the author. Accepted values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHOW_PRINTLINK</code> (default: <code>'1'</code>) : enables the Print button for articles. Accepted values: <code>'1'</code> to enable or <code>'0'</code> to disable.</li>
-<li><code>SHOW_READPERCENT</code> (default: <code>'1'</code>) : enables the reading progress on articles (working on the <code>default</code>, <code>dark</code>, <code>dmagenta</code>, <code>solarized</code>, <code>solarized-dark</code> themes). Accepted values: <code>'1'</code> to enable or <code>'0'</code> to disable.</li>
-<li><code>PAGINATION</code> (default: <code>'12'</code>) : defines the number of articles that are displayed on a list. Accepted values: number.</li>
-</ul>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Administrator/multiusers.html

@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Multi users</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Multi users
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="multi-users">Multi users</h1>
-<p>To be translated from <a href="../../fr/Administrateur/multi-utilisateurs.html">Multi-utilisateurs</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Administrator/update.html

@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Update wallabag</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Update wallabag
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="update-wallabag">Update wallabag</h1>
-<h2 id="update-an-existing-wallabag-installation">Update an existing wallabag installation</h2>
-<p>In order to update your installation, download and unzip the archive into your installation folder. For example on Ubuntu/Debian:</p>
-<pre><code>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</code></pre>
-<p>After that, just access wallabag in your browser and follow the instructions to finish the update.</p>
-<p>You can verify at the bottom of the configuration page that you're running the last version.</p>
-<p><strong>If it fails</strong>, just delete the <code>install</code> folder and clear the cache:</p>
-<pre><code>cd /var/www/html/wallabag/
-rm -r cache/* install/</code></pre>
-<p>Clearing the cache is also possible in the configuration page, clicking on the link `Delete Cache.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/create_new_theme.html

@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Create new theme</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Create new theme
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="create-new-theme">Create new theme</h1>
-<p>TODO</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/docker.html

@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Docker</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Docker
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="docker">Docker</h1>
-<p>TODO</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/git_repo.html

@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - git repository</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    git repository
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="git-repository">git repository</h1>
-<p>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 <a href="https://github.com/wallabag/wallabag"><a href="https://github.com/wallabag/wallabag">https://github.com/wallabag/wallabag</a></a>.</p>
-<h2 id="current-state">Current state</h2>
-<p>To manage the different versions of wallabag, we use Git.</p>
-<p>There are multiple branches for the source code of wallabag web app:</p>
-<ul>
-<li><code>master</code> branch : this is the stable branch, downloaded by those who wish to install wallabag for their own use.</li>
-<li><code>dev</code> branch : before being added on <code>master</code> branch, all bug fixes and new features must go on that branch. This branch is not recommended for production use.</li>
-<li><code>v2-symfony</code> branch : this is the branch for a revamp of wallabag. A whole chapter is to be focused on it.</li>
-</ul>
-<h2 id="workflow">Workflow</h2>
-<p>All the rules for contributing to the git repository are in the <a href="https://github.com/wallabag/wallabag/blob/master/contributing.html">CONTRIBUTING.md file of wallabag</a>. Please read carefully this file before you make any change.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/v2.html

@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - wallabag v2 / symfony2</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    wallabag v2 / symfony2
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="wallabag-v2--symfony2">wallabag v2 / symfony2</h1>
-<p>TODO</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/vagrant.html

@@ -1,218 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Vagrant</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Vagrant
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="vagrant">Vagrant</h1>
-<p>In order to allow you to easily set up the required configuration for wallabag, we offer you a Vagrantfile file to be used with <a href="http://www.vagrantup.com">Vagrant</a>.</p>
-<p><a href="https://en.wikipedia.org/wiki/Vagrant_%28software%29">According to Wikipedia,</a></p>
-<pre><code>Vagrant is computer software for creating and configuring virtual development environments. It can be seen as a wrapper around virtualization software such as VirtualBox, KVM, VMware and around configuration management software such as Ansible, Chef, Salt or Puppet.</code></pre>
-<h2 id="use-vagrant-for-wallabag">Use Vagrant for wallabag</h2>
-<p>Here is the procedure to run wallabag inside a Vagrant container:</p>
-<pre><code>wget -O wallabag-dev.zip https://github.com/wallabag/wallabag/archive/dev.zip
-unzip wallabag-dev.zip
-cd wallabag-dev
-vagrant up</code></pre>
-<p>Now, go to <code>http://localhost:8003</code>, wallabag should be available there! (make sure you do not use the port 8003 of your machine for something else before)</p>
-<h2 id="what-did-the-vagrantfile-install-">What did the Vagrantfile install ?</h2>
-<p>The script install a LAMP server, i.e. :</p>
-<ul>
-<li>Ubuntu 14.04</li>
-<li>an Apache2 web server</li>
-<li>PHP5</li>
-<li>SQLite or MySQL or PostgreSQL for PHP</li>
-<li>XDebug for PHP</li>
-</ul>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/Developer/write_config_files.html

@@ -1,214 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Write config files</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Write config files
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="write-config-files">Write config files</h1>
-<p>wallabag can use specific site config files to parse website articles. These files are stored in the <a href="https://github.com/wallabag/wallabag/tree/master/inc/3rdparty/site_config/standard"><code>inc/3rdparty/site_config/standard</code></a> folder.</p>
-<p>The format used for these files is <a href="http://www.w3.org/TR/xpath20/">XPath</a>. Look at some examples in the folder.</p>
-<h2 id="automatic-config-files-generation">Automatic config files generation</h2>
-<p>Fivefilters has created a <a href="http://siteconfig.fivefilters.org/">very useful tool</a> 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.</p>
-<p><img src="https://lut.im/RNaO7gGe/l9vRnO1b" alt="siteconfig" /></p>
-<p>You should confirm this area by trying with other articles.<br />
-When you got the right area, just click on <em>Download Full-Text RSS site config</em> to download your file.</p>
-<h2 id="manual-config-file-generation">Manual config file generation</h2>
-<p>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 <code>class</code> or the <code>id</code> attribute of the area containing what you want.</p>
-<p>Once you've got the id or class, you can write for example one or another of these lines:</p>
-<pre><code>body: //div[@class='myclass']
-body: //div[@id='myid']</code></pre>
-<p>Then, test you file. If you got the right content but you want to strip unnecessary parts, do:</p>
-<pre><code>strip: //div[@class='hidden']</code></pre>
-<p>You can look at other options for siteconfig files <a href="http://help.fivefilters.org/customer/portal/articles/223153-site-patterns">here</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/configure_wallabag.html

@@ -1,212 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Configure wallabag</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Configure wallabag
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="configure-wallabag">Configure wallabag</h1>
-<p>From the configuration menu, you can change some wallabag's options.</p>
-<p>Some parts won't be presented here as they have a complete chapter in the documentation (RSS feeds, import from a third party service, export your data, Epub conversion and multi-user mode).</p>
-<h2 id="theme">Theme</h2>
-<p>Of tastes and colors, we do not discuss. That's why wallabag offers you to change its skin to please everyone.</p>
-<p>Select the theme of your choice from the drop down list and confirm by clicking on <strong>Update</strong>.</p>
-<h2 id="language">Language</h2>
-<p>Select the language of your choice in the drop down list and confirm by clicking on <strong>Update</strong>.</p>
-<h2 id="password">Password</h2>
-<p>Fill in your new password in the two dedicated fields and confirm by clicking on <strong>Update</strong>.</p>
-<p>You will be disconnected and need to enter your new password to access your wallabag.</p>
-<h2 id="clear-the-cache">Clear the cache</h2>
-<p>The cache allows wallabag perform certain functions faster.</p>
-<p>After updating wallabag, it is advised to clear the cache. You only have to click to do so.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/epub_conversion.html

@@ -1,213 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - ePub conversion</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    ePub conversion
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="epub-conversion">ePub conversion</h1>
-<p>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.</p>
-<h2 id="a-word-of-caution">A word of caution</h2>
-<p>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.</p>
-<h2 id="where-to-convert-the-articles">Where to convert the articles</h2>
-<p>You can convert your articles at various places in wallabag:</p>
-<ul>
-<li>on the reading page of an article: the ePub link will convert this article only</li>
-<li>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</li>
-<li>from a search: the link is at the bottom of the page</li>
-<li>from the configuration page: you can convert all your articles, whatever the category to which they belong</li>
-</ul>
-<p>TODO talk about calibre</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/framabag_account_creation.html

@@ -1,214 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Framabag account creation</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Framabag account creation
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="framabag-account-creation">Framabag account creation</h1>
-<p>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 <a href="https://www.framabag.org">Framabag.org</a>.</p>
-<h2 id="account-creation">Account creation</h2>
-<p>Click on the button <strong>Créez votre compte / Create your account</strong>.</p>
-<p>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).</p>
-<p>Once this form validated, you will receive an email with the confirmation link. Click on it to create your account.</p>
-<p>You will receive a last email with the address of your Framabag account, which will look like
-<code>https://www.framabag.org/u/Your-username</code>.</p>
-<h2 id="information-storage">Information storage</h2>
-<p>Framabag use one database per user. We do not and will not use your stored data.</p>
-<h2 id="you-have-forgotten-your-password">You have forgotten your password</h2>
-<p>If you have forgotten your password to get connected to Framabag, a form is available <a href="https://www.framabag.org">on the main page of the service</a>.<br />
-Fill it, and a confirmation will be sent to you and will allow you to input a new password.</p>
-<h2 id="account-deletion">Account deletion</h2>
-<p>If you wish to delete your account, contact us by email: <a href="mailto:hello@wallabag.org">hello@wallabag.org</a> using the address your created your account with, and state your username. </p>
-<p>We will answer you after your account has been deleted: then, no information about you will be stored by Framabag.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/import_export.html

@@ -1,244 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Import and export data</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Import and export data
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="import-and-export-data">Import and export data</h1>
-<h2 id="import">Import</h2>
-<p>To import data in wallabag, go to the page <strong>Configuration</strong>.</p>
-<h3 id="caution">Caution</h3>
-<p>Data import can be a <strong>demanding process</strong> for your server. Hence, it is done in two steps:</p>
-<ul>
-<li>Insertion of the URL in the wallabag database</li>
-<li>in the second step, the retrieval, for each article, of its full content.</li>
-</ul>
-<p>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.</p>
-<h3 id="from-pocket">From Pocket</h3>
-<h4 id="export-your-data-from-pocket">Export your data from Pocket</h4>
-<p>From your Pocket account, go to the options.
-TODO</p>
-<h4 id="import-your-pocket-data">Import your Pocket data</h4>
-<p>From the configuration page of wallabag, section <strong>Import</strong>, select the file <code>ril_export.html</code> generated by Pocket, then click on <strong>Import</strong>.
-Wallabag only insert these links in the database. Now, you have to get the content of each article.</p>
-<p>For this, click on <code>Click to finish import</code>: wallabag will fetch the content of 10 articles at a time.</p>
-<p>TODO</p>
-<p>TODO new ticket: why when a click is done, this does not load in a loop? I believe this was doing this ping @mariroz</p>
-<h3 id="from-instapaper">From Instapaper</h3>
-<h4 id="export-your-data-from-instapaper">Export your data from Instapaper</h4>
-<p>TODO</p>
-<h4 id="import-your-instapaper-data">Import your Instapaper data</h4>
-<p>TODO</p>
-<h3 id="from-readability">From Readability</h3>
-<h4 id="export-your-data-from-readability">Export your data from Readability</h4>
-<p>TODO</p>
-<h4 id="import-your-readability-data">Import your Readability data</h4>
-<p>TODO</p>
-<h3 id="from-wallabag">From wallabag</h3>
-<p>Since you can export your data from wallabag (see below), it is of course possible to re-import them.</p>
-<p>In the import form, select your wallabag-exported file (format JSON). Start the import, et voilà.</p>
-<p>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.</p>
-<h3 id="from-a-html-or-json-file">From a HTML or JSON file</h3>
-<p>TODO</p>
-<h2 id="export">Export</h2>
-<p>It is possible to export your data from the page <strong>Configuration</strong> of wallabag. Several reasons to do this:</p>
-<ul>
-<li>re-install of wallabag</li>
-<li>leave the Framabag service to install your own wallabag</li>
-<li>a user with an account on a multi-user wallabag want to have his/her own wallabag installation</li>
-<li>...</li>
-</ul>
-<p>This will lead you to download a file <a href="http://en.wikipedia.org/wiki/JavaScript_Object_Notation">at the JSON format</a>.<br />
-As detailed above, you can import this file in wallabag.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/issue_with_article.html

@@ -1,216 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Issue with article</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Issue with article
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="my-article-is-not-displayed-properly-in-wallabag">My article is not displayed properly in wallabag</h1>
-<p>If you think wallabag do not copy well the content of an article (empty or incomplete text), here are some suggestions.</p>
-<h2 id="ask-for-help">Ask for help</h2>
-<p>Via an email or a ticket, do not forget to give some information that are important for us to better solve the problem:</p>
-<ul>
-<li>The URL of the article</li>
-<li>What wallabag displays</li>
-<li>What you were expecting</li>
-<li>The wallabag version of if you use Framabag</li>
-</ul>
-<h3 id="open-a-ticket-on-github">Open a ticket on github</h3>
-<p>To open a new ticket, you should <a href="https://github.com/wallabag/wallabag/issues/new">go to github</a>. An account is required.
-Do not forget to send us the information listed above.</p>
-<h3 id="send-us-an-email">Send us an email</h3>
-<p>Send us the link in a email to the address <a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag">hello@wallabag.org</a>.<br />
-Do not forget to send us the information listed above.</p>
-<h2 id="solve-this-display-problem">Solve this display problem</h2>
-<p>TODO</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/organize_articles.html

@@ -1,232 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Organize articles</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Organize articles
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="organize-articles">Organize articles</h1>
-<p>To be able to find more easily your articles, several methods are available. </p>
-<h2 id="tags">Tags</h2>
-<h3 id="assign-a-tag">Assign a tag</h3>
-<h4 id="when-saving-an-article">When saving an article</h4>
-<p>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.</p>
-<h4 id="from-the-article">From the article</h4>
-<p>To tag an already-saved article, go to the reading page of the article. There is a part <code>tags</code> followed with a pencil. Click on the pencil.</p>
-<p>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 <strong>Tag</strong>.</p>
-<p>Then, you can go back to your article and read it.</p>
-<h4 id="from-the-search">From the search</h4>
-<p>A full chapter on search is available. Here, we will describe only how to assign a tag from your search.</p>
-<p>When your search displays results, there is a link <code>Apply the tag ABCD to this search</code> at the bottom of the page. Click on it: a tad depending on your search (here <code>ABCD</code>) will be assigned to all the articles found.</p>
-<h3 id="find-all-the-articles-with-a-given-tag">Find all the articles with a given tag</h3>
-<p>In the wallabag menu, click on <strong>Tags</strong>. 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.</p>
-<h2 id="preferred-articles">Preferred articles</h2>
-<p>When you wish to set aside an article, you can mark it as preferred.</p>
-<h3 id="set-an-article-as-favorite">Set an article as favorite</h3>
-<p>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 <strong>favorite</strong> status of this article.</p>
-<h3 id="find-all-the-favorite-articles">Find all the favorite articles</h3>
-<p>In the wallabag menu, click on <strong>Favorites</strong> to display the list of all the articles that you have set as favorite.</p>
-<h2 id="archived-articles">Archived articles</h2>
-<p>When you have read an article, you can archive it: hence it will not be displayed in your list of unread articles.</p>
-<p>Archiving an article does not remove it from wallabag.</p>
-<h3 id="archive-an-article">Archive an article</h3>
-<p>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 ✓.<br />
-Click again on this icon will set back the <strong>unread</strong> status of the article.</p>
-<h3 id="find-all-the-archived-articles">Find all the archived articles</h3>
-<p>In the wallabag menu, click on <strong>Archive</strong> to find all the articles that you have archived.</p>
-<h2 id="delete-an-article">Delete an article</h2>
-<p>Be cautious: the deletion of an article is <strong>definitive</strong>. It is deleted from the wallabag database.</p>
-<p>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).</p>
-<p>We trust you: that is why there is no confirmation message during the deletion.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/read_an_article.html

@@ -1,226 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Read an article</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Read an article
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="read-an-article">Read an article</h1>
-<p>To read an article is not the most complex thing in wallabag: you only have to click on the title of the article for it to be displayed.</p>
-<h2 id="back-to-where-you-quit-reading-your-article">Back to where you quit reading your article</h2>
-<p>If you quit reading an article while you are only at half of it (for example), when you will open it again, wallabag will display it at the place you left the article.</p>
-<p>This feature works only with web applications and not with smartphone applications.</p>
-<h2 id="possible-actions-in-an-article">Possible actions in an article</h2>
-<p>These actions are possible through the icons displayed at the top of the page. We suppose that you are using the theme Baggy (<a href="configure_wallabag.html">read the documentation about how to change theme</a>). Icons in other themes are very similar.  </p>
-<p>Here are the actions, in the order of appearance of the icons.</p>
-<h3 id="read-the-original-article">Read the original article</h3>
-<p>Move to the original article.</p>
-<h3 id="mark-the-article-as-read">Mark the article as read</h3>
-<p>Archive the article, that will be put in the category <strong>Archive</strong> of the wallabag menu.
-Clicking again on this button will move the article back to the <strong>unread</strong> category.</p>
-<h3 id="mark-the-article-as-favorite">Mark the article as favorite</h3>
-<p>Mark the article as favorite, and it will be put to the category <strong>Favorites</strong> of the wallabag menu
-Clicking again on this button will remove the favorite status.</p>
-<h3 id="delete-the-article">Delete the article</h3>
-<p>Delete completely the article from wallabag. It cannot be restored. Be careful: no confirmation message is displayed.</p>
-<h3 id="share-through-twitter">Share through twitter</h3>
-<p>Share the title and the original link of the article through twitter.</p>
-<h3 id="share-via-email">Share via email</h3>
-<p>Share the title and the original link of the article via email.</p>
-<h3 id="print-the-article">Print the article</h3>
-<p>Open the print window of the browser.</p>
-<h3 id="convert-into-epub">Convert into ePub</h3>
-<p>Convert the article into ePub format. <a href="convert_into_epub.html">A full chapter about this here</a>.</p>
-<h3 id="notify-us-that-the-article-appears-wrong">Notify us that the article appears wrong</h3>
-<p>Allow to notify us that an article is not displayed as expected. <a href="issue_with_article.html">A full chapter about this here</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/rss_feed.html

@@ -1,221 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - RSS feed</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    RSS feed
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="rss-feed">RSS feed</h1>
-<p>The RSS feeds allow you to:</p>
-<ul>
-<li>read your articles from your favorite RSS feed reader.</li>
-<li>to activate the reading features for smartphone softwares</li>
-</ul>
-<p>First, you must activate the RSS feature by generating a feed token.<br />
-Go to <strong>config</strong> in wallabag and generate a token in the section <strong>Feeds</strong>.
-You can generate a new token at any time.</p>
-<h2 id="read-articles">Read articles</h2>
-<p>Once the token created, you have access to three RSS feeds:</p>
-<ul>
-<li>the one of the unread articles</li>
-<li>the one of the favorites articles</li>
-<li>the one of the archived articles</li>
-</ul>
-<p>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.</p>
-<h3 id="share-your-readings">Share your readings</h3>
-<p>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.</p>
-<h2 id="activate-the-features-for-smartphones">Activate the features for smartphones</h2>
-<p>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 <a href="save_your_first_article.html">Save your first article</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/save_your_first_article.html

@@ -1,250 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Save your first article</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Save your first article
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="save-your-first-article">Save your first article</h1>
-<p>Once connected on wallabag, you have many ways to save an article.</p>
-<h2 id="from-the-web-application">From the web application</h2>
-<p>Let's see first how to do from the web application. In the menu, you have a link <strong>save a link</strong>. Clicking on it, a form shows up: you simply have to type the web adress of the article you want to save.</p>
-<p>Confirm to store the content of the article.</p>
-<p>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 <em>DOWNLOAD_PICTURES</em>. Read the chapter on hidden options for more information.</p>
-<h2 id="from-the-bookmarklet">From the bookmarklet</h2>
-<p>From <a href="http://fr.wikipedia.org/wiki/Bookmarklet">Wikipedia's definition</a></p>
-<blockquote>
-<p>A bookmarklet is a <a href="http://en.wikipedia.org/wiki/Internet_bookmark">bookmark</a> stored in a <a href="http://en.wikipedia.org/wiki/Web_browser">web browser</a> that contains <a href="http://en.wikipedia.org/wiki/JavaScript">JavaScript</a>commands to extend the browser's functionality.</p>
-<p>Bookmarklets are unobtrusive scripts stored as the URL of a bookmark in a web browser or as a hyperlink on a web page.</p>
-<p>When clicked, a bookmarklet performs some function, one of a wide variety such as a search query or data extraction. Bookmarklets are usually <a href="http://en.wikipedia.org/wiki/Computer_program">JavaScript programs</a>.</p>
-</blockquote>
-<p>From the wallabag's menu, click on <strong>settings</strong>. 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 <code>Bag it!</code> 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.</p>
-<h2 id="from-your-smartphone">From your smartphone</h2>
-<h3 id="above-all-else">Above all else</h3>
-<p>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 tokken. Read the chapter on RSS feeds for more information.</p>
-<h3 id="android">Android</h3>
-<h4 id="installation-and-configuration">Installation and configuration</h4>
-<p>You can download the android application from the <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">Google Play Store</a> and from <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche">F-droid</a>. It's the exact same application on those two stores.</p>
-<p>Once installed, start the application, go to the <strong>settings</strong> part et fill in the <strong>URL (complete address of your wallabag installation or your Framabag account)</strong> and <strong>User ID (in most cases, you'll have to put 1)</strong> 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 <strong>Token</strong> (enter properly all the token's letters as seen in the settings part of wallabag).</p>
-<h4 id="saving-of-an-article">Saving of an article</h4>
-<p>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 <strong>Share</strong> menu: you'll find a <strong>Bag it!</strong> entry which will add your article in wallabag.</p>
-<h4 id="reading">Reading</h4>
-<p>When you open the application, click on Synchronize: your recently saved articles will be downloaded on your smartphone.</p>
-<p>You don't need an internet connection anymore: click on <strong>List articles</strong> to start your reading.</p>
-<p>At the end of each article, a <strong>Mark as read</strong> button allows you to archive the article.</p>
-<p>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.</p>
-<h3 id="ios">iOS</h3>
-<h4 id="installation-and-configuration-1">Installation and configuration</h4>
-<p>You can download the iOS application from the <a href="https://itunes.apple.com/app/id828331015">AppStore</a>.</p>
-<p>Once installed, configure the app by filling following fields inside the settings: the <strong>URL (complete address of your wallabag installation or your Framabag account)</strong> and <strong>User ID (in most cases, you'll have to put 1)</strong> 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 <strong>Token</strong> (enter properly all the token's letters as seen in the settings part of wallabag).</p>
-<h4 id="usage">Usage</h4>
-<p>If the app is configured correctly, the app will automatically download the articles from your wallabag (use <strong>pull-to-refresh</strong> to trigger this update manually). Once an article is downloaded, it'll be available offline from your app.</p>
-<p>Unfortunately you can only locally mark an article as read (it will not synchronise to your online wallabag).</p>
-<h3 id="saving-articles">Saving articles</h3>
-<p>If you're browsing a website and want to add the current article to your wallabag, simply tap the <strong>Share</strong>-button and select <strong>Bag it!</strong> (if you don't find the wallabag icon, have a look in the <strong>more</strong>-menu). If everything is set up correctly, your article will be saved (you may have to login from time to time).</p>
-<h3 id="windows-phone">Windows Phone</h3>
-<h4 id="installation-and-configuration-2">Installation and configuration</h4>
-<p>You can download the Windows Phone application from the <a href="http://www.windowsphone.com/fr-fr/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450">Windows Store</a> or directly from your smartphone's Store.</p>
-<p>Once installed, the application will show you a notification on the first launch, asking the configuration of your wallabag server. Go to the <strong>Settings</strong> part of the application by pressing the three dots menu at the bottom of the screen, then fill in the <strong>URL (complete address of your wallabag installation or your Framabag account)</strong> and <strong>User ID (in most cases, you'll have to put 1)</strong> fields.</p>
-<p>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 <strong>Token</strong> (enter properly all the token's letters as seen in the setting part of wallabag).</p>
-<h2 id="from-your-web-browser">From your web browser</h2>
-<h3 id="firefox">Firefox</h3>
-<p>Download the Firefox add-on on <a href="https://addons.mozilla.org/firefox/addon/wallabag/">addons.mozilla.org</a> and install it like any other Firefox add-on.</p>
-<p>In the add-on's settings, fill the complete URL of your installation of wallabag or your Framabag account.</p>
-<p>Personalize the Firefox toolbar to add wallabag (<strong>W</strong> 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.</p>
-<h3 id="chrome">Chrome</h3>
-<p>Download the Chrome add-on <a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj">on the dedicated website</a> and install it like any other Chrome add-on.</p>
-<p>In the add-on's settings, fill the complete URL of your installation of wallabag or your Framabag account.</p>
-<p>During the addon's installation, a new icon appear in Chrome toolbar (a <strong>W</strong> 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.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/User/search.html

@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Search content</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Search content
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="search-content">Search content</h1>
-<p>To be translated from <a href="../../fr/Utilisateur/rechercher.html">Rechercher du contenu dans wallabag</a>.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/conf.py

@@ -0,0 +1,55 @@
+# -*- 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-2016, 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', 'wallabag is an opensource read-it-later.',
+   '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")

docs/en/developer/docker.rst

@@ -0,0 +1,51 @@
+Run Wallabag in docker-compose
+==============================
+
+In order to run your own development instance of wallabag, you may
+want to use the pre-configured docker compose files.
+
+Requirements
+------------
+
+Make sure to have `Docker
+<https://docs.docker.com/installation/ubuntulinux/>`__ and `Docker
+Compose <https://docs.docker.com/compose/install/>`__ availables on
+your system and up to date.
+
+Switch DBMS
+-----------
+
+By default, Wallabag will start with a sqlite database.
+Since Wallabag provide support for Postgresql and MySQL, docker
+containers are also available for these ones.
+
+In ``docker-compose.yml``, for the chosen DBMS uncomment :
+
+- the container definition (``postgres`` or ``mariadb`` root level
+  block)
+- the container link in the ``php`` container
+- the container env file in the ``php`` container
+
+In order to keep running Symfony commands on your host (such as
+``wallabag:install``), you also should :
+
+- source the proper env files on your command line, so variables
+  like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
+- create a ``127.0.0.1 rdbms`` on your system ``hosts`` file
+
+Run Wallabag
+------------
+
+#. Fork and clone the project
+#. Edit ``app/config/parameters.yml`` to replace ``database_*``
+   properties with commented ones (with values prefixed by ``env.``)
+#. ``composer install`` the project dependencies
+#. ``php app/console wallabag:install`` to create the schema
+#. ``docker-compose up`` to run the containers
+#. Finally, browse to http://localhost:8080/ to find your freshly
+   installed wallabag.
+
+At various step, you'll probably run into UNIX permission problems,
+bad paths in generated cache, etc…
+Operations like removing cache files or changing files owners might
+be frequently required, so don't be afraid !

docs/en/help_wallabag.html

@@ -1,234 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - Help wallabag</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    Help wallabag
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="help-wallabag">Help wallabag</h1>
-<h2 id="report-bugs">Report bugs</h2>
-<h3 id="contact-wallabag-support">Contact wallabag support</h3>
-<p>If you have a problem while installation or using wallabag (either with the web application or the smartphone applications), use the support site <a href="http://support.wallabag.org"><a href="http://support.wallabag.org">http://support.wallabag.org</a></a>.</p>
-<p>We will look if we can do to help you promptly, or if it is an new bug that we will need to correct.</p>
-<p>It is better to use the support site than sending us an email: the followup is easier for us and the solution to your problem may help another user.</p>
-<h3 id="create-a-new-issue">Create a new issue</h3>
-<p>If you find a bug during wallabag use, thanks for opening a new issue on Github (an account is required).</p>
-<p><strong>First of all</strong>, read the <a href="https://github.com/wallabag/wallabag/blob/master/contributing.html">advices about the submission of a new issue</a>. The better you report the issue, the more we will be able to help you.</p>
-<ul>
-<li>for a bug in the web application, <a href="https://github.com/wallabag/wallabag/issues/new">open a new issue here</a></li>
-<li>for a bug in the Android application, <a href="https://github.com/wallabag/android-app/issues/new">open a new issue here</a></li>
-<li>for a bug in the Windows Phone application, <a href="https://github.com/wallabag/windowsphone-app">open a new issue here</a></li>
-<li>for a bug in the iOS application , <a href="https://github.com/wallabag/ios-app/issues/new">open a new issue here</a></li>
-<li>for a bug in the Firefox extension, <a href="https://github.com/wallabag/firefox-ext/issues/new">open a new issue here</a></li>
-<li>for a bug in the Chrome extension, <a href="https://github.com/wallabag/chrome-ext/issues/new">open a new issue here</a></li>
-</ul>
-<h2 id="write-and-fix-documentation">Write and fix documentation</h2>
-<p>The documentation you are reading is likely to miss some points, to be out-of-date, to require a translation in your language. Hence, we invite you to take part in its writing.</p>
-<p>The Github repository is here: <a href="https://github.com/wallabag/documentation"><a href="https://github.com/wallabag/documentation">https://github.com/wallabag/documentation</a></a>.</p>
-<h2 id="fix-bugs">Fix bugs</h2>
-<p>Two options:</p>
-<ul>
-<li>when a wallabag user asks a new question <a href="http://support.wallabag.org">on the support site</a>, you could answer him directly if you are a more advanced wallabag user.</li>
-<li>on Github, some issues are likely to match your skills. <a href="https://github.com/wallabag/wallabag/issues">Go through the issue list</a> and help yourself.</li>
-</ul>
-<p>You are welcome to suggest changes to the wallabag code. Look at the <a href="https://github.com/wallabag/wallabag/blob/master/contributing.html">advices about the submission of a new issue</a>.</p>
-<h2 id="spread-the-word">Spread the word</h2>
-<p>It's not so complicated: just talk about wallabag! Use #wallabag hashtag on all your social networks: twitter, Facebook, Diaspora*, Google+, etc.</p>
-<p>Here are our accounts on social networks:</p>
-<ul>
-<li><a href="https://framasphere.org/people/2335ff202f920132196e2a0000053625">Diaspora*</a></li>
-<li><a href="https:/twitter.com/wallabagapp">twitter</a></li>
-<li><a href="https://www.facebook.com/wallabag">Facebook</a></li>
-<li><a href="https://plus.google.com/+WallabagOrg/">Google+</a></li>
-</ul>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>

docs/en/index.html

@@ -1,211 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>wallabag - English documentation</title>
-
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/bootstrap.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/font-awesome.min.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/highlight.tomorrow-night.css">
-        <link rel="stylesheet" href="http://doc.wallabag.org/css/main.css">
-    </head>
-    <body>
-
-        <header class="navbar navbar-default navbar-fixed-top">
-
-            <a class="navbar-brand" href="http://doc.wallabag.org/">
-                wallabag
-                <small class="hidden-xs hidden-sm">
-                    English documentation
-                </small>
-            </a>
-            <a href="http://doc.wallabag.org/en">EN</a> - <a href="http://doc.wallabag.org/fr">FR</a> - <a href="http://doc.wallabag.org/de">DE</a> - <a href="http://doc.wallabag.org/ru">RU</a>
-
-            
-        </header>
-
-        <main class="container-fluid">
-            <div class="row">
-
-                
-                    <nav id="sidebar" class="col-sm-3 col-lg-2" role="navigation">
-
-                                                                                    <ul class="nav nav-pills nav-stacked">
-                                    
-                                    <h4 class="text-muted">
-                                        
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test active">
-                                                <a href="http://doc.wallabag.org/en/index.html">
-                                                   Getting started
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/help_wallabag.html">
-                                                   Help us
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Administrator
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/download_and_install.html">
-                                                   Download and installation
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/update.html">
-                                                   Update wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/hidden_options.html">
-                                                   Hidden options
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Administrator/multiusers.html">
-                                                   Multi users
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        User
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/save_your_first_article.html">
-                                                   Save your first article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/read_an_article.html">
-                                                   Read an article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/organize_articles.html">
-                                                   Organize articles
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/configure_wallabag.html">
-                                                   Configure wallabag
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/search.html">
-                                                   Search
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/epub_conversion.html">
-                                                   ePub conversion
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/issue_with_article.html">
-                                                   Issue with article
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/rss_feed.html">
-                                                   RSS feed
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/import_export.html">
-                                                   Import export
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/User/framabag_account_creation.html">
-                                                   Framabag account creation
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                    
-                                    <h4 class="text-muted">
-                                        Developer
-                                    </h4>
-
-                                        <ul class="nav nav-pills nav-stacked">
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/write_config_files.html">
-                                                   Write config files
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/create_new_theme.html">
-                                                   Create a new theme
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/git_repo.html">
-                                                   Git repository
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/docker.html">
-                                                   Docker
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/vagrant.html">
-                                                   Vagrant
-                                                </a>
-                                            </li>
-                                                                                    <li class="test ">
-                                                <a href="http://doc.wallabag.org/en/Developer/v2.html">
-                                                   wallabag v2 / symfony2
-                                                </a>
-                                            </li>
-                                                                                </ul>
-                                                                    </ul>
-                                                                                                                                                                                                                
-                    </nav>
-
-                
-                <section class="col-lg-10">
-                    <h1 id="english-documentation">English documentation</h1>
-<p><strong>wallabag</strong> is a read-it-later application: it saves a web page by keeping content only. Elements like navigation or ads are deleted.</p>
-<h2 id="features">Features</h2>
-<ul>
-<li>content of the web page is saved: text and pictures.</li>
-<li>the web application is responsive</li>
-<li>you can export articles into ePub</li>
-<li>you can read your articles offline thanks to smartphones applications</li>
-<li>you can easily save a new link thanks to browser addons</li>
-<li>many templates are available to change your wallabag as you wish</li>
-<li>and many others great features!</li>
-</ul>
-<p>This user documentation is here to learn to you what you can do with wallabag.</p>
-                </section>
-
-            </div>
-        </main>
-
-        <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-        <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-        <script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
-
-        <script>
-            $(function() {
-                $("section>h1").wrap('<div class="page-header" />');
-                // Syntax highlighting
-                hljs.initHighlightingOnLoad();
-            });
-        </script>
-
-    </body>
-</html>