4 files changed, 32 insertions, 0 deletions

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 34ec7999..590c234a 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -26,6 +26,7 @@ The main documentation for this application is organized into a couple sections:
    user/faq
    user/installation
    user/migration
+   user/upgrade
    user/create_account
    user/login
    user/configuration
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
new file mode 100644
index 00000000..e4735631
--- /dev/null
+++ b/docs/en/user/upgrade.rst
@@ -0,0 +1,24 @@
+Upgrade wallabag
+================
+
+Upgrade on a dedicated web server
+---------------------------------
+
+The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.3`` by the last release number):
+::
+
+    git fetch origin
+    git fetch --tags
+    git checkout 2.0.3
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console cache:clear --env=prod
+    
+
+Upgrade on a shared hosting 
+---------------------------
+
+Backup your ``app/config/parameters.yml`` file. Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
+
+If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
+
+Empty ``var/cache`` folder.
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
index 316d45be..5202c524 100644
--- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
@@ -109,6 +109,7 @@ class WallabagRestController extends FOSRestController
         $this->validateAuthentication();
 
         $url = $request->request->get('url');
+        $title = $request->request->get('title');
         $isArchived = (int) $request->request->get('archive');
         $isStarred = (int) $request->request->get('starred');
 
@@ -121,6 +122,10 @@ class WallabagRestController extends FOSRestController
             );
         }
 
+        if (!is_null($title)) {
+            $entry->setTitle($title);
+        }
+
         $tags = $request->request->get('tags', '');
         if (!empty($tags)) {
             $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
index 839ff386..2f2d92ee 100644
--- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
@@ -152,6 +152,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->client->request('POST', '/api/entries.json', [
             'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html',
             'tags' => 'google',
+            'title' => 'New title for my article',
         ]);
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
@@ -162,6 +163,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
         $this->assertEquals(false, $content['is_archived']);
         $this->assertEquals(false, $content['is_starred']);
+        $this->assertEquals('New title for my article', $content['title']);
         $this->assertEquals(1, $content['user_id']);
         $this->assertCount(1, $content['tags']);
     }