diff --git a/docs/creating_content_basic.md b/docs/creating_content_basic.md
index 3bb8792e..a5982f1a 100644
--- a/docs/creating_content_basic.md
+++ b/docs/creating_content_basic.md
@@ -6,10 +6,10 @@ There are four ways of creating a new Content item:
 
 1. Click **Create** in the right menu while viewing any other content.
 The new item appears under the current Content item in the tree.
+1. Click the **Create** (plus) icon when you *Browse content*.
+Here also you have to choose a location for the new item.
 1. Click **Create** in the upper-right corner of the Dashboard.
 In this case you have to select where the content will be located.
-1. Click the **Create** (plus) icon in the *Content Browser*.
-Here also you have to choose a location for the new item.
 1. Drag files onto the **Sub-items** box when viewing any content or click the upload button and select files to upload.
 In this way you can upload files such as images, videos, PDF documents, etc.
 
@@ -31,6 +31,15 @@ Some Fields, such as *Relation* Fields (which link two Content items), or *Image
 require you to select a different Content item to link to.
 A *Location* Field is a point on the map. You can type the place name, enter its coordinates, or select it on the map.
 
+!!! note "Autosave"
+
+    To help you preserve your work, eZ Platform saves drafts of Content items automatically.
+    For more information, see [Autosave](publishing/publishing.md#autosave).
+
+!!! caution "Draft and autosave limitation"
+
+    Saving drafts and autosave are not available if you create a new Content item in a **Browse content** window, or when you create a new User.
+
 ### Editing Rich Text Fields
 
 Rich Text Fields are filled in using a special Online Editor. Its options appear when you click the Field box.
diff --git a/docs/publishing/publishing.md b/docs/publishing/publishing.md
index e647f5a4..2cc4d3ee 100644
--- a/docs/publishing/publishing.md
+++ b/docs/publishing/publishing.md
@@ -27,6 +27,20 @@ You will also have the option to create a new draft based on the currently publi
 
 Note that you cannot edit an unpublished draft created by another user.
 
+### Autosave
+
+While you edit a Content item or product, eZ Platform saves your work automatically to help you preserve the progress in an event of a failure.
+To recover your work, open the most recent draft in the **Versions** tab of the Content item.
+Alternatively, open the most recent draft of your work on the **My dashboard** page, the **Drafts** table.
+
+Autosave is enabled by default, and set to save a draft every 60 seconds.
+You can toggle autosave or change the time between saving attempts in **User settings**, by changing
+the values in the **Autosave draft** and **Autosave interval** fields.
+
+!!! caution "Draft and autosave limitation"
+
+    Saving drafts and autosave are not available if you create a new Content item in a **Browse content** window, or when you create a new User.
+
 ### Content versions
 
 Content in the repository can have more than one version.
@@ -44,32 +58,32 @@ You can view all versions of a Content item in the **Versions** tab.
 
 ![All versions of a Content item](img/content_item_versions.png "All versions of a Content item")
 
-!!! enterprise 
+!!! enterprise
 
     #### Comparing versions
-    
+
     You can compare two versions of the same Content item by clicking the compare icon
     in the **Versions** tab:
-    
+
     ![](img/compare_icon.png)
-    
+
     Select the two version you want to compare in the drop-down menus at the top of the screen.
-    
+
     ![](img/compare_results_1_col.png "Version comparison in two-column view")
-    
+
     You can choose to view the comparison in two columns, side by side,
     or in one column, with differences highlighted.
-    
+
     ![](img/compare_results_2_col.png "Version comparison in one-column view")
-    
+
     You can also compare media Field Types such as images.
-    
+
     ![](img/compare_results_media.png "Version comparison image")
-    
+
     !!! note
-    
+
         Not all Field Types are available for comparison. You cannot preview the difference in the following Field Types:
-    
+
         - Form
         - Landing Page
         - User account
diff --git a/docs/site_organization/working_with_page.md b/docs/site_organization/working_with_page.md
index eeaaf5b7..d99b5f48 100644
--- a/docs/site_organization/working_with_page.md
+++ b/docs/site_organization/working_with_page.md
@@ -24,6 +24,11 @@
     Before publishing or saving the Page, edit its title and description.
     Switch to the Field view using the [Page Builder toolbar](#page-builder-toolbar).
 
+    !!! note "Autosave"
+
+        To help you preserve your work, eZ Platform saves drafts of Content items automatically.
+        For more information, see [Autosave](../publishing/publishing.md#autosave).
+
     ## Editing Page
 
     You edit Pages using the Page Builder.