diff --git a/media/css/seahub.css b/media/css/seahub.css
index d16e3ef73c..3426cdc1ed 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1980,8 +1980,8 @@ a.sf-popover-item {
 	padding:20px;
 }
 .help-con img {
-    max-width:100%;
-    margin:5px 0;
+    max-width: 80%;
+    margin: 5px 0;
 }
 #right-panel.help-con .hd {
     font-weight:normal;
diff --git a/media/img/help/cloud.png b/media/img/help/cloud.png
new file mode 100644
index 0000000000..7afbf16c85
Binary files /dev/null and b/media/img/help/cloud.png differ
diff --git a/media/img/help/column_view.png b/media/img/help/column_view.png
new file mode 100644
index 0000000000..7a71ac5fff
Binary files /dev/null and b/media/img/help/column_view.png differ
diff --git a/media/img/help/context_menu.png b/media/img/help/context_menu.png
new file mode 100644
index 0000000000..55130caeca
Binary files /dev/null and b/media/img/help/context_menu.png differ
diff --git a/media/img/help/dept_admin.png b/media/img/help/dept_admin.png
new file mode 100644
index 0000000000..536a5c9c4a
Binary files /dev/null and b/media/img/help/dept_admin.png differ
diff --git a/media/img/help/dept_admin_manage_libs.png b/media/img/help/dept_admin_manage_libs.png
new file mode 100644
index 0000000000..af15dd2f92
Binary files /dev/null and b/media/img/help/dept_admin_manage_libs.png differ
diff --git a/media/img/help/dept_admin_manage_members.png b/media/img/help/dept_admin_manage_members.png
new file mode 100644
index 0000000000..2ee9949b52
Binary files /dev/null and b/media/img/help/dept_admin_manage_members.png differ
diff --git a/media/img/help/desktop_lock_file.png b/media/img/help/desktop_lock_file.png
new file mode 100644
index 0000000000..c87e10a709
Binary files /dev/null and b/media/img/help/desktop_lock_file.png differ
diff --git a/media/img/help/desktop_my_locked_file.png b/media/img/help/desktop_my_locked_file.png
new file mode 100644
index 0000000000..8a222a5ac2
Binary files /dev/null and b/media/img/help/desktop_my_locked_file.png differ
diff --git a/media/img/help/desktop_other_locked_file.png b/media/img/help/desktop_other_locked_file.png
new file mode 100644
index 0000000000..08c88411bf
Binary files /dev/null and b/media/img/help/desktop_other_locked_file.png differ
diff --git a/media/img/help/drive-accounts.png b/media/img/help/drive-accounts.png
new file mode 100644
index 0000000000..ab9f6ef78a
Binary files /dev/null and b/media/img/help/drive-accounts.png differ
diff --git a/media/img/help/drive-cache-setting.png b/media/img/help/drive-cache-setting.png
new file mode 100644
index 0000000000..a3eca4a841
Binary files /dev/null and b/media/img/help/drive-cache-setting.png differ
diff --git a/media/img/help/drive-fetch-finish.png b/media/img/help/drive-fetch-finish.png
new file mode 100644
index 0000000000..43d2edb727
Binary files /dev/null and b/media/img/help/drive-fetch-finish.png differ
diff --git a/media/img/help/drive-login.png b/media/img/help/drive-login.png
new file mode 100644
index 0000000000..6e0b30f663
Binary files /dev/null and b/media/img/help/drive-login.png differ
diff --git a/media/img/help/drive.png b/media/img/help/drive.png
new file mode 100644
index 0000000000..686ee84050
Binary files /dev/null and b/media/img/help/drive.png differ
diff --git a/media/img/help/editor_side_bar.png b/media/img/help/editor_side_bar.png
new file mode 100644
index 0000000000..09d7a870f8
Binary files /dev/null and b/media/img/help/editor_side_bar.png differ
diff --git a/media/img/help/file_history.png b/media/img/help/file_history.png
new file mode 100644
index 0000000000..5fec52c841
Binary files /dev/null and b/media/img/help/file_history.png differ
diff --git a/media/img/help/history_setting.png b/media/img/help/history_setting.png
new file mode 100644
index 0000000000..f809122faa
Binary files /dev/null and b/media/img/help/history_setting.png differ
diff --git a/media/img/help/image-1584674198415.png b/media/img/help/image-1584674198415.png
new file mode 100644
index 0000000000..6a0849ad8d
Binary files /dev/null and b/media/img/help/image-1584674198415.png differ
diff --git a/media/img/help/image-1584674764725.png b/media/img/help/image-1584674764725.png
new file mode 100644
index 0000000000..38695c5c77
Binary files /dev/null and b/media/img/help/image-1584674764725.png differ
diff --git a/media/img/help/image-1584675088821.png b/media/img/help/image-1584675088821.png
new file mode 100644
index 0000000000..86a136fc86
Binary files /dev/null and b/media/img/help/image-1584675088821.png differ
diff --git a/media/img/help/libraries_view.png b/media/img/help/libraries_view.png
new file mode 100644
index 0000000000..67b0cc0a5e
Binary files /dev/null and b/media/img/help/libraries_view.png differ
diff --git a/media/img/help/library_browse.png b/media/img/help/library_browse.png
new file mode 100644
index 0000000000..dc348a6b47
Binary files /dev/null and b/media/img/help/library_browse.png differ
diff --git a/media/img/help/locked-by-me.png b/media/img/help/locked-by-me.png
new file mode 100644
index 0000000000..f23eb9c32f
Binary files /dev/null and b/media/img/help/locked-by-me.png differ
diff --git a/media/img/help/locked.png b/media/img/help/locked.png
new file mode 100644
index 0000000000..e661cef662
Binary files /dev/null and b/media/img/help/locked.png differ
diff --git a/media/img/help/markdown_editor.png b/media/img/help/markdown_editor.png
new file mode 100644
index 0000000000..9d97e0597e
Binary files /dev/null and b/media/img/help/markdown_editor.png differ
diff --git a/media/img/help/partial-synced.png b/media/img/help/partial-synced.png
new file mode 100644
index 0000000000..594b3e6e65
Binary files /dev/null and b/media/img/help/partial-synced.png differ
diff --git a/media/img/help/read-only.png b/media/img/help/read-only.png
new file mode 100644
index 0000000000..2224c834f4
Binary files /dev/null and b/media/img/help/read-only.png differ
diff --git a/media/img/help/read_only.png b/media/img/help/read_only.png
new file mode 100644
index 0000000000..3bd5fd70a6
Binary files /dev/null and b/media/img/help/read_only.png differ
diff --git a/media/img/help/related_files.png b/media/img/help/related_files.png
new file mode 100644
index 0000000000..003e4935d8
Binary files /dev/null and b/media/img/help/related_files.png differ
diff --git a/media/img/help/synced.png b/media/img/help/synced.png
new file mode 100644
index 0000000000..ed9fa1a548
Binary files /dev/null and b/media/img/help/synced.png differ
diff --git a/media/img/help/sys_admin_departments.png b/media/img/help/sys_admin_departments.png
new file mode 100644
index 0000000000..b0762cb5ee
Binary files /dev/null and b/media/img/help/sys_admin_departments.png differ
diff --git a/media/img/help/tags_from_file_browser.png b/media/img/help/tags_from_file_browser.png
new file mode 100644
index 0000000000..4d598edaf6
Binary files /dev/null and b/media/img/help/tags_from_file_browser.png differ
diff --git a/media/img/help/tags_from_side_bar.png b/media/img/help/tags_from_side_bar.png
new file mode 100644
index 0000000000..682d1fcc2e
Binary files /dev/null and b/media/img/help/tags_from_side_bar.png differ
diff --git a/media/img/help/tags_summary.png b/media/img/help/tags_summary.png
new file mode 100644
index 0000000000..92bcd20a9b
Binary files /dev/null and b/media/img/help/tags_summary.png differ
diff --git a/media/img/help/web_file_locked.png b/media/img/help/web_file_locked.png
new file mode 100644
index 0000000000..d417ad4cc9
Binary files /dev/null and b/media/img/help/web_file_locked.png differ
diff --git a/media/img/help/web_folder_perm_ro.png b/media/img/help/web_folder_perm_ro.png
new file mode 100644
index 0000000000..1cd39e65b1
Binary files /dev/null and b/media/img/help/web_folder_perm_ro.png differ
diff --git a/media/img/help/web_lock_file.png b/media/img/help/web_lock_file.png
new file mode 100644
index 0000000000..655e665670
Binary files /dev/null and b/media/img/help/web_lock_file.png differ
diff --git a/seahub/help/templates/help/base.html b/seahub/help/templates/help/base.html
index ac2e57eb42..bd41c6d4ee 100644
--- a/seahub/help/templates/help/base.html
+++ b/seahub/help/templates/help/base.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block header_right %}
+{# removed the content on the top right corner #}
+{% endblock %}
+
 {% block extra_style %}
 <style type="text/css">
 .side-nav-con .first-hd {
@@ -8,9 +12,7 @@
 }
 </style>
 {% endblock %}
-
 {% block main_class %}d-flex ovhd{% endblock %}
-
 {% block main_content %}
 <div class="row flex-1 d-flex">
     <div class="side-textnav col-md-3 side-nav">
@@ -20,34 +22,79 @@
             </a>
         </div>
         <div class="side-nav-con">
-            <h3 class="hd first-hd">{% trans "Desktop Client and Syncing" %}</h3>
+
+            <h3 class="hd first-hd">{% trans "Introduction" %}</h3>
             <ul class="side-textnav-tabs">
-                <li class="tab"><a href="{{ SITE_ROOT }}help/install/">{% trans "Install and sync Files" %}</a></li>
-                <li class="tab"><a href="{{ SITE_ROOT }}help/sync_existing/">{% trans "Syncing existing folders" %}</a></li>
-                <li class="tab"><a href="{{ SITE_ROOT }}help/selective_sync/">{% trans "Selective sync sub-folders" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/introduction/">{% trans "Introduction" %}</a></li>
+            </ul>
+
+            <h3 class="hd">{% trans "Managing files and folders" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/libraries_managing/">{% trans "Managing files with libraries" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/restoring_deleted_files/">{% trans "Restoring deleted files" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/finding_older_version_files/">{% trans "Finding old file versions" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/library_history_and_snapshots/">{% trans "Library history and snapshots" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/setting_library_history/">{% trans "Setting history retention period" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/deleting_a_library/">{% trans "Deleting a library" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/viewing_files_within_web_app/">{% trans "Viewing files within Web App" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/full_text_file_search/">{% trans "Full text file search" %}</a></li>
+            </ul>
+
+            <h3 class="hd">{% trans "Sharing and collaboration" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/sharing_files_and_folders/">{% trans "Sharing files and folders" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/groups_managing/">{% trans "Managing groups" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/file_locking/">{% trans "Locking files" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/folder_permission/">{% trans "Folder permission" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/departments/">{% trans "Departments sharing" %}</a></li>
+            </ul>
+
+            <h3 class="hd">{% trans "Wiki and knowledge management" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/manage_library_as_wiki/">{% trans "Manage library as Wiki" %}</a></li>
+            </ul>
+            
+            <h3 class="hd">{% trans "Desktop client and syncing" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/install_sync/">{% trans "Install and sync files" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/syncing_existing_folders/">{% trans "Syncing existing folders" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/selective_sync/">{% trans "Selectively sync sub-folders" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/read-only_syncing/">{% trans "Read-only syncing" %}</a></li>
                 <li class="tab"><a href="{{ SITE_ROOT }}help/unsync_resync/">{% trans "Unsync and resync libraries" %}</a></li>
                 <li class="tab"><a href="{{ SITE_ROOT }}help/sync_interval/">{% trans "Setting sync interval" %}</a></li>
                 <li class="tab"><a href="{{ SITE_ROOT }}help/desktop_proxy/">{% trans "Proxy settings" %}</a></li>
                 <li class="tab"><a href="{{ SITE_ROOT }}help/conflicts/">{% trans "File conflicts" %}</a></li>
                 <li class="tab"><a href="{{ SITE_ROOT }}help/ignore/">{% trans "Excluding files" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/install_linux_client/">{% trans "Install on Linux" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/linux_cli/">{% trans "Seafile client for a CLI server" %}</a></li>
             </ul>
-            <h3 class="hd">{% trans "Security and Encryption" %}</h3>
+
+            <h3 class="hd">{% trans "Drive client" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/using_drive_client/">{% trans "Using Seafile drive client" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/drive_client_2.0_for_windows_10/">{% trans "Using drive client 2.0 on Windows" %}</a></li>
+                <li class="tab"><a href="{{ SITE_ROOT }}help/drive_client_for_linux/">{% trans "Drive client for Linux" %}</a></li>
+            </ul>
+
+            <h3 class="hd">{% trans "Security and encryption" %}</h3>
             <ul class="side-textnav-tabs">
                 <li class="tab"><a href="{{ SITE_ROOT }}help/encrypted_libraries/">{% trans "How to use encrypted libraries" %}</a></li>
             </ul>
+
+            <h3 class="hd">{% trans "FAQ" %}</h3>
+            <ul class="side-textnav-tabs">
+                <li class="tab"><a href="{{ SITE_ROOT }}help/faq/">{% trans "FAQ" %}</a></li>
+            </ul>
         </div>
     </div>
-
     <div class="help-con article col-md-9 ov-auto flex-1" id="right-panel">{% block help_con %}{% endblock %}</div>
-
 </div>
 {% endblock %}
-
 {% block extra_script %}
 <script type="text/javascript">
 $('.side-nav li').each(function() {
     var link_href = $('a', $(this)).attr('href');
-    if (link_href == location.pathname || link_href == location.pathname + 'install/') {
+    if (link_href == location.pathname || link_href == location.pathname + 'introduction/') {
         $(this).addClass('tab-cur');
         if ($(this).offset().top > $(window).height()) {
             $('.side-nav').scrollTop($(this).offset().top + $(this).outerHeight(true) - $(window).height());
diff --git a/seahub/help/templates/help/conflicts.html b/seahub/help/templates/help/conflicts.html
index b338e650ef..2dbe0beacb 100644
--- a/seahub/help/templates/help/conflicts.html
+++ b/seahub/help/templates/help/conflicts.html
@@ -6,5 +6,5 @@
 
 <p>{% trans "Once you and your friends sync a shared file library onto your computers, you may add, delete or edit files in the library together. Every change you make to the library would be automatically synced to others' computers." %}</p>
 
-<p>{% blocktrans %}Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep the first version synced to the cloud unchanged, while rename the other version to a "conflict file". A conflict file's name ends with it's author's email address, plus the current time, e.g. test.txt (SFConflict name@example.com 2015-03-07-11-30-28).{% endblocktrans %}</p>
+<p>{% trans "Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep the first version synced to the cloud unchanged, while rename the other version to a \"conflict file\". A conflict file's name ends with it's author's email address, plus the current time, e.g. test.txt (SFConflict name@example.com 2015-03-07-11-30-28)." %}</p>
 {% endblock %}
diff --git a/seahub/help/templates/help/deleting_a_library.html b/seahub/help/templates/help/deleting_a_library.html
new file mode 100644
index 0000000000..43dd871d3b
--- /dev/null
+++ b/seahub/help/templates/help/deleting_a_library.html
@@ -0,0 +1,12 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Deleting a library" %}</h3>
+<p>{% trans "You can delete a library owned by you. Unlike the files and folders in the library, a deleted library currently cannot be restored by the user. But the Seafile server's administrator can restore a deleted library for users. In the future, we may allow the end users to restore a deleted library." %}</p>
+<p>{% trans "After a library is deleted, it has following effects:" %}</p>
+<ul>
+  <li>{% trans "Share of the files and folders within this library are all canceled." %}</li>
+  <li>{% trans "Desktop clients synced with this library cannot sync with it any more. But the local files on the client won't be deleted." %}</li>
+</ul>
+{% endblock %}
diff --git a/seahub/help/templates/help/departments.html b/seahub/help/templates/help/departments.html
new file mode 100644
index 0000000000..f95e95d6e5
--- /dev/null
+++ b/seahub/help/templates/help/departments.html
@@ -0,0 +1,59 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Managing and using departments" %}</h3>
+<p>{% trans "Some organizations consist of complex department hierarchy. There are usually two common use cases for file management in these organizations:" %}</p>
+<ul>
+  <li>{% trans "There should be a common file sharing space for the organization. The folder hierarchy should map the department hierarchy. There will be separate folder or space assigned to each department." %}</li>
+  <li>{% trans "The sharing space should be owned and managed by the organization, but not individual employees. So that the ownership of files doesn't have to be changed when an employee leaves the organization." %}</li>
+</ul>
+<p>{% trans "Before version 6.3.0, files in Seafile can only be owned by individual users and shared to other users or groups. In 6.3.0, we introduce the \"Departments\" feature to meet the above two use cases. This new feature works side by side with the existing sharing features." %}</p>
+<p>{% trans "We'll introduce this feature from 3 different perspectives:" %}</p>
+<ul>
+  <li><a href="#sys-admin">{% trans "System admin" %}</a></li>
+  <li><a href="#dept-admin">{% trans "Department admin" %}</a></li>
+  <li><a href="#dept-members">{% trans "Department members" %}</a></li>
+</ul>
+<h4 id="sys-admin">{% trans "System admin" %}</h4>
+<p>{% trans "The system admin can:" %}</p>
+<ul>
+  <li>{% trans "Manage department hierarchy and members" %}</li>
+  <li>{% trans "Assign storage quota for departments" %}</li>
+  <li>{% trans "Create and manage shared libraries in departments" %}</li>
+</ul>
+<h5 id="manage-department-hierarchy-and-members">{% trans "Manage department hierarchy and members" %}</h5>
+<p>{% trans "The system admin can setup the department hierarchy in two ways: manual setup or import from Active Directory." %}</p>
+<p>{% trans "The system admin can create any number of top level departments and create any levels of sub-departments under each department. And each level of department can be populated with members. The system admin can set the role of each member to 'member' or 'admin'. We'll introduce how can a department admin manage department later." %}</p>
+<p>{% trans "The system admin can also import the hierarchy from OUs (Organizational Units) in AD. Please refer to \"Sync OU to departments\" section in <a href=\"https://manual.seafile.com/deploy_pro/ldap_group_sync.html\" target=\"_blank\">LDAP Group Sync documentation</a>. Each OU will be imported as a department. And the sub-OUs under an OU will be imported as sub-departments. Department libraries can be automatically created in the import process." %}</p>
+<p>{% trans "System admin can also delete a department after all the sub-departments and libraries are deleted." %}</p>
+<h5 id="assign-storage-quota-for-departments">{% trans "Assign Storage quota for departments" %}</h5>
+<p>{% trans "The file libraries created inside a department are owned by the department itself, not by any individual user. So the system admin can assign storage quota to a department. The total size of all the libraries in a department cannot exceed the storage quota. <strong>Please note that the quota of sub-department doesn't depend on the quota of its parent department.</strong>" %}</p>
+<h5 id="create-and-manage-shared-libraries-in-departments">{% trans "Create and Manage shared libraries in departments" %}</h5>
+<p>{% trans "Unlike groups, libraries owned by individual users cannot be shared to a department. Department libraries can only be created by the system admin or department admin. This is for the purpose for more consolidated control of the libraries." %}</p>
+<p>{% trans "All the above operations can be done in the system admin interface. See the below screenshot for information." %}</p>
+<p><img src="{{ MEDIA_URL }}img/help/sys_admin_departments.png" alt=""></p>
+<h4 id="dept-admin">{% trans "Department admin" %}</h4>
+<p>{% trans "As noted above, department admin is a special role assigned by the system admin to some members of a department. Department admins can perform the following operations in a department after login to his/her own account." %}</p>
+<ul>
+  <li>{% trans "Access to the libraries of the department" %}</li>
+  <li>{% trans "Manage members in his/her department" %}</li>
+  <li>{% trans "Manage libraries in his/her department" %}</li>
+</ul>
+<p>{% trans "For the end users, a department can be accessed as a special type of group. Each department is presented to its members as a group. A user can not only access to the libraries in the department he/she belongs to, but also the libraries in the parent departments of his/her department. For example, if John is in the \"EMEA\" sub-department under the \"Sales\" department, and \"Sales\" is a sub-department under the company \"ACME\", John can then access to the groups \"EMEA\", \"Sales\" and \"ACME\". The groups for departments are marked with a \"building\" icon next to its name. See the screenshot below for details." %}</p>
+<p><img src="{{ MEDIA_URL }}img/help/dept_admin.png" alt="" /></p>
+<p>{% trans "If a user is the admin of a department, he/she can add or delete members in the department. Any users registered in the system can be added as member of the department. But if the departments are imported from AD, the changes to membership will be overwritten on the next sync with AD." %}</p>
+<p><img src="{{ MEDIA_URL }}img/help/dept_admin_manage_members.png" alt=""></p>
+<p>{% trans "Department admin can manage the libraries in the department. The supported operations are:" %}</p>
+<ul>
+  <li>{% trans "Create or delete library" %}</li>
+  <li>{% trans "Change library name" %}</li>
+  <li>{% trans "Share a library to users or groups outside of this department. This is very useful for cross-department collaboration." %}</li>
+  <li>{% blocktrans %}Set fine-grained permission to folders in the libraries for users or sub-departments in this department. This works like <a href="{{ SITE_ROOT }}help/folder_permission/">the folder permission feature</a>.{% endblocktrans %}</li>
+</ul>
+<p><img src="{{ MEDIA_URL }}img/help/dept_admin_manage_libs.png" alt=""></p>
+<h4 id="dept-members">{% trans "Department members" %}</h4>
+<p>{% trans "A normal member of the department can use the department just like a group. Each department is presented to its members as a group. A user can not only access to the libraries in the department he/she belongs to, but also the libraries in the parent departments of his/her department. For example, if John is in the \"EMEA\" sub-department under the \"Sales\" department, and \"Sales\" is a sub-department under the company \"ACME\", John can then access to the groups \"EMEA\", \"Sales\" and \"ACME\". The groups for departments are marked with a \"building\" icon next to its name." %}</p>
+<p>{% trans "The only difference from groups is that, libraries owned by a user cannot be shared to a department group." %}</p>
+
+{% endblock %}
diff --git a/seahub/help/templates/help/desktop_proxy.html b/seahub/help/templates/help/desktop_proxy.html
index 5734167bc3..a81b164dd7 100644
--- a/seahub/help/templates/help/desktop_proxy.html
+++ b/seahub/help/templates/help/desktop_proxy.html
@@ -3,12 +3,12 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Using Proxy in Seafile Client" %}</h3>
+<h3 class="hd">{% trans "Using proxy in Seafile client" %}</h3>
 
 <p>{% trans "Seafile client supports 3 types of proxy servers: HTTP proxy, SOCKS5 proxy and system proxy settings." %}</p>
 
 <p>{% trans "HTTP proxy and SOCKS5 proxy requires you to enter the proxy server's address and port. If you use system proxy settings, Seafile client reads proxy settings from the operating system. The operating system has some mechanisms to auto-detect proxy server information. So you don't have to manually enter proxy server address." %}</p>
 
-<p>{% blocktrans %}To change proxy settings, click the Seafile icon in the system notification area. Choose "Settings" in the menu. In the pop-up settings dialog, you can change proxy settings in the "Network" tab.{% endblocktrans %}</p>
+<p>{% trans "To change proxy settings, click the Seafile icon in the system notification area. Choose \"Settings\" in the menu. In the pop-up settings dialog, you can change proxy settings in the \"Network\" tab." %}</p>
 
 {% endblock %}
diff --git a/seahub/help/templates/help/drive_client_2.0_for_windows_10.html b/seahub/help/templates/help/drive_client_2.0_for_windows_10.html
new file mode 100644
index 0000000000..e28763c0b4
--- /dev/null
+++ b/seahub/help/templates/help/drive_client_2.0_for_windows_10.html
@@ -0,0 +1,51 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "SeaDrive 2.0 for Windows 10" %}</h3>
+
+<p>{% trans "SeaDrive 2.0 (and future versions) is redesigned with deeper integration to Windows 10 operating system. It supports Windows 10 1709 version (2017 Fall Update for Windows 10) and later versions. We recommend Windows 10 users to upgrade to SeaDrive 2.0 for more native virtual drive experience." %}</p>
+
+<p>{% trans "SeaDrive 2.0 is currently in Beta status. We'll mark it stable after we have more user feedbacks." %}</p>
+
+<h4>{% trans "Install and Access the Virtual Drive" %}</h4>
+<p>{% trans "You can download SeaDrive 2.0 from official Seafile website. After installation and logging into your Seafile account, SeaDrive will start downloading library and file lists from the server (just as in SeaDrive 1.0.x). It may take some time, depending on the number of files available in your seafile account. The download is progressive, so in the mean time you can already access some files in the virtual drive." %}</p>
+<p>{% trans "To access the virtual drive, just open Windows file explorer. There is a \"seadrive\" node in the navigation pane of Windows file explorer." %}</p>
+
+<img src="{{ MEDIA_URL }}img/help/image-1584674198415.png" alt="" />
+
+<h4>{% trans "Accessing Files in the Virtual Drive" %}</h4>
+<p>{% trans "Libraries are grouped into 4 categories in the virtual drive: My Libraries, Shared with me, Shared with groups and Shared with all." %}</p>
+<p>{% trans "As you can see, the file status icons is more integrated into Windows file explorer. The icons are a bit different form version 1.0." %}</p>
+<p>{% trans "Files in the virtual are created as \"placeholders\" in the local file system. They may be in 3 states:" %}</p>
+<ul>
+  <li>{% trans "<b>Placeholder file</b>: An empty representation of the file and can only be opened when there is network connection." %}</li>
+  <li>{% trans "<b>Full file</b>: The file has been downloaded and saved locally. Download is automatic when a placeholder file is opened for the first time. These files are available whenever you open SeaDrive regardless to network connections. The operating system may decide to clear a full file when more disk space is needed." %}</li>
+  <li>{% trans "<b>Pinned full file</b>: The file has been downloaded and saved locally. It is guaranteed to be available offline." %}</li>
+</ul>
+<img src="{{ MEDIA_URL }}img/help/image-1584674764725.png" alt="" />
+<p>{% trans "You can control which files or folder are cached locally. This can be changed from the context menu when you right click on a file or folder. Choose \"Always keep on this device\" when you want to pin a file or folder locally; choose \"Free up space\" when you want to clean the cache for a file or folder." %}</p>
+<img src="{{ MEDIA_URL }}img/help/image-1584675088821.png" alt="" />
+<p>{% trans "In SeaDrive 1.0, cached files are not automatically updated when they're updated on the server. In SeaDrive 2.0, full and pinned files are automatically kept in sync with the server." %}</p>
+
+<h4>{% trans "File Download and Control" %}</h4>
+<p>{% trans "Whenever you open a placeholder file, the operating system will automatically start to download it. If the file may take some time to download, there will be a progress bar shown up in file explorer and you may cancel the download." %}</p>
+<p>{% trans "Sometimes a background application may try to download a file in the virtual drive (such as an Anti-Virus software). You will be notified by the operating system about this and you may choose to cancel the download or disallow the application from automatically downloading files in the future." %}</p>
+
+<h4>{% trans "Frequently Asked Questions" %}</h4>
+<p><b>{% trans "Can I create, delete, rename libraries?" %}</b></p>
+<p>{% trans "Yes. When you create, delete or rename library folders in the virtual drive, the operation will be reflected on the server. You can only create, delete, rename libraries under the \"My Libraries\" category. Creating, deleting or renaming libraries in other categories will be ignored." %}</p>
+
+<p><b>{% trans "Can I create files or folders outside of a library folder?" %}</b></p>
+<p>{% trans "Yes. But files created outside of a library folder will be ignored and NOT synced to the server. A new folder under the \"My Libraries\" folder will be handled as a new library." %}</p>
+
+<p><b>{% trans "Can I access encrypted libraries?" %}</b></p>
+<p>{% trans "Yes. By default, encrypted libraries are not synced and shown in the virtual drive. You need to manually choose which encrypted libraries to sync and enter the password. Just right click on the SeaDrive icon in the system tray area and choose \"Show encrypted libraries\". A windows will show up and you can choose to sync or unsync an encrypted library." %}</p>
+
+<p><b>{% trans "Is it compatible to SeaDrive 1.0?" %}</b></p>
+<p>{% trans "SeaDrive 2.0 will use any existing accounts and their metadata (stored under C:\users\username\seadrive\ folder). But it will not use the cached files from SeaDrive 1.0. So any locally cached files in 1.0 version will not be accessible in 2.0 version. You can start SeaDrive 1.0 again to upload the files to server or copy them out." %}</p>
+
+<p><b>{% trans "How do I clean the cache?" %}</b></p>
+<p>{% trans "You can manually choose which folders or files to be cached locally. If you find a folder consumes too much space, just choose to \"Free up space\" on that folder and all cached files in that folder will be cleaned. There is no need to set cache cleaning time and cache size limit as in SeaDrive 1.0. Because placeholders are just normal files created on your local disk, your cache size is only limited by the available disk space on your computer." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/drive_client_for_linux.html b/seahub/help/templates/help/drive_client_for_linux.html
new file mode 100644
index 0000000000..dda8e39403
--- /dev/null
+++ b/seahub/help/templates/help/drive_client_for_linux.html
@@ -0,0 +1,62 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Using Seafile Drive Client on Linux" %}</h3>
+<h2 id="installing-on-debianubuntu">{% trans "Installing on Debian/Ubuntu" %}</h4>
+<p>{% trans "Debian/Ubuntu users can install SeaDrive from our Debian repository." %}</p>
+<p>{% trans "To install the client, first add the signing key:" %}</p>
+<pre><code>sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+</code></pre>
+<p>{% trans "Then add the repo to your apt source list, here we use Debian 8 (jessie) as an example. Change it to \"stretch\" for Debian 9. Change it to \"xenial\" for Ubuntu 16.04." %}</p>
+<pre><code>echo deb http://deb.seadrive.org jessie main | sudo tee /etc/apt/sources.list.d/seafile.list
+sudo apt-get update
+</code></pre><p>{% trans "To install SeaDrive with GUI:" %}</p>
+<pre><code>sudo apt-get install seadrive-gui
+</code></pre><p>{% trans "To install SeaDrive without GUI:" %}</p>
+<pre><code>sudo apt-get install seadrive-daemon
+</code></pre><h2 id="installing-on-centos-7">{% trans "Installing on CentOS 7" %}</h4>
+<p>{% trans "Add the repo" %}</p>
+<pre><code>wget -O- https://git.io/seadrive-centos7-repo | sudo tee /etc/yum.repos.d/seadrive.repo
+</code></pre><p>{% trans "Install SeaDrive Client" %}</p>
+<pre><code>sudo yum install -y epel-release
+sudo yum install -y seadrive --enablerepo=cr
+</code></pre><h2 id="installing-on-fedora">{% trans "Installing on Fedora" %}</h4>
+<p>{% trans "Add the repo" %}</p>
+<pre><code>wget -O- https://git.io/seadrive-fedora-repo | sudo tee /etc/yum.repos.d/seadrive.repo
+</code></pre><p>{% trans "Install SeaDrive Client" %}</p>
+<pre><code>sudo yum install -y seadrive
+</code></pre><h2 id="running-seadrive-with-gui">{% trans "Running SeaDrive with GUI" %}</h4>
+<p>{% trans "To use SeaDrive, just run \"SeaDrive\" from your desktop environment, or type \"seadirve-gui\" in command line. After logging into your server, the virtual drive will be mounted in <code>~/SeaDrive.</code>" %}</p>
+<h2 id="running-seadrive-without-gui">{% trans "Running SeaDrive without GUI" %}</h4>
+<p>{% trans "In some use cases, it is useful to run SeaDrive in a server environment. To use SeaDrive without GUI, you can directly run seadrive-daemon (the background daemon) from command line." %}</p>
+<p>{% trans "First, you have to obtain an access token from your server." %}</p>
+<pre><code>curl -d "username=username@example.com" -d "password=123456" https://seafile.example.com/api2/auth-token/
+</code></pre><p>{% trans "Then you have to prepare a config file for SeaDrive. Let's assume that you save the config file as <code>~/seadrive.conf.</code>" %}</p>
+<pre><code>[account]
+server = https://seafile.example.com
+username = username@example.com
+token = 3131a3a93156f80bc86aa9f12cf794e0364ed57b
+is_pro = true
+
+[general]
+client_name = johns-ubuntu
+
+[cache]
+size_limit = 10GB
+clean_cache_interval = 10
+</code></pre><p>{% trans "You can only specify one account in the config file. If you need to switch accounts, you'll have to stop SeaDrive, change config file and restart. Meaning of config options are as following:" %}</p>
+<ul>
+<li>{% trans "token: The access token you obtained above." %}</li>
+<li>{% trans "is_pro: Set to true if your server is Pro edition." %}</li>
+<li>{% trans "client_name: This name will be displayed in the device information on the server." %}</li>
+<li>{% trans "size_limit: Size limit of local cache space." %}</li>
+<li>{% trans "clean_cache_interval: Interval of cache cleaning. The unit is minute." %}</li>
+</ul>
+<p>{% trans "Then you can start seadrive:" %}</p>
+<pre><code>seadrive -c ~/seadrive.conf -f -d data-directory [-l logfile] virtual-drive-dir
+</code></pre><p>{% trans "Note that you must give <code>-f</code> option in the command line, to make sure seadrive runs in foregound, instead of forking as a daemon. By default, the data directory used by the SeaDrive GUI client will be <code>~/.seadrive/data</code>. It's recommended to use this path for data directory to be consistent with the GUI client. The log file path is <code>~/.seadrive/logs/seadrive.log</code>." %}</p>
+<p>{% trans "Sometimes you'll see the following error:" %}</p>
+<pre><code>fuse: bad mount point `/home/user/SeaDrive': Transport endpoint is not connected
+</code></pre><p>{% trans "You can run <code>fusermount -u /home/user/SeaDrive</code> to fix the problem." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/encrypted_libraries.html b/seahub/help/templates/help/encrypted_libraries.html
index 1aa1b498bf..dcc4aa7e4b 100644
--- a/seahub/help/templates/help/encrypted_libraries.html
+++ b/seahub/help/templates/help/encrypted_libraries.html
@@ -10,7 +10,7 @@
 <p>{% trans "When creating an encrypted library:" %}
 <ul>
     <li>{% trans "If you create an encrypted library in the web app, the password is sent to the server. The server use this password to create the library. But it doesn't store the plain text password." %}</li>
-    <li>{% blocktrans %}If you create an encrypted library from a local folder with the desktop client (see <a href="{{SITE_ROOT}}help/install/">file syncing</a>), the password is not sent to the server.{% endblocktrans %}</li>
+    <li>{% blocktrans %}If you create an encrypted library from a local folder with the desktop client (see <a href="{{SITE_ROOT}}help/install_sync/">file syncing</a>), the password is not sent to the server.{% endblocktrans %}</li>
 </ul>
 </p>
 
@@ -24,6 +24,5 @@
 
 <p>{% trans "Note that encrypted library only encrypt the contents of the files, but not the folder and file names." %}</p>
 
-<p>{% blocktrans %}More technical details of encrypted library can be found at <a href="http://manual.seafile.com/security/security_features.html">Seafile Manual</a>.{% endblocktrans %}</p>
-
+<p>{% blocktrans %}More technical details of encrypted library can be found at <a href="https://manual.seafile.com/security/security_features.html">Seafile Manual</a>.{% endblocktrans %}</p>
 {% endblock %}
diff --git a/seahub/help/templates/help/faq.html b/seahub/help/templates/help/faq.html
new file mode 100644
index 0000000000..3ea0caa510
--- /dev/null
+++ b/seahub/help/templates/help/faq.html
@@ -0,0 +1,92 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "FAQ" %}</h3>
+<h4 id="preconfigure-seafile-clients">{% trans "Preconfigure Seafile clients" %}</h4>
+<p>{% trans "Normally, when the user installs a fresh seafile client, a login dialog would prompt him/her to fill the server address and user credentials. These behavior can be preconfigured by IT admins so that the users don't need to do it themselves." %}</p>
+<p>{% trans "There are two ways to preconfigure seafile client:" %}</p>
+<ul>
+  <li>{% trans "On windows, the admin can store the details it in the windows registry." %}</li>
+  <li>{% trans "On all desktop platforms (win/linux/mac), the admin can also store the details in a file <code>seafile.ini</code> in the HOME folder of the user." %}</li>
+</ul>
+<h5 id="using-windows-registry">{% trans "Using Windows registry" %}</h5>
+<p>{% trans "The preconfigure information can be stored in one of the following two places:" %}</p>
+<ul>
+  <li><code>HKEY_CURRENT_USER\\SOFTWARE\\Seafile</code></li>
+  <li><code>HKEY_LOCAL_MACHINE\\SOFTWARE\\Seafile</code></li>
+</ul>
+<p>{% trans "If the information is found in both places, the one under <code>HKEY_CURRENT_USER</code> would take precedence." %}</p>
+<p><strong>{% trans "Special note for 64bit Windows deployment" %}</strong></p>
+<blockquote>
+  <p>{% trans "If you are using 64-bit windows and using HKLM instead of HKCU to deploy your seafile program. please note you need to correct the PrimaryKey to <code>HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Seafile</code> instead of <code>HKEY_LOCAL_MACHINE\\SOFTWARE\\Seafile</code>. This is because seafile client is compiled as a 32-bit application on windows." %}</p>
+</blockquote>
+<h6 id="list-of-available-preconfigure-options">{% trans "List of available preconfigure options" %}</h6>
+<p>{% trans "To preset the default server address:" %}</p>
+<pre><code>- Key: PreconfigureServerAddr
+- Type: REG_SZ
+- Value: &lt;url to the seafile server address&gt;
+</code></pre><p>{% trans "To preset the default shibboleth login address:" %}</p>
+<pre><code>- Key: PreconfigureShibbolethLoginUrl
+- Type: REG_SZ
+- Value: &lt;the shibboleth login url&gt;, e.g https://example.seafile.com/shib-login
+</code></pre><p>{% trans "To preset the account and login token:" %}</p>
+<pre><code>- Key: PreconfigureUsername
+- Type: REG_SZ
+- Value: &lt;The Username or Email&gt;
+</code></pre><pre><code>- Key: PreconfigureUserToken
+- Type: REG_SZ
+- Value: &lt;the Seahub access token&gt; (You can get the token via Web API)
+</code></pre><p>{% trans "To prevent the user from using any other Seafile server:" %}</p>
+<pre><code>- Key: PreconfigureServerAddrOnly
+- Type: REG_SZ
+- Value: 1 (stands for enable) or 0 (stands for disable)
+- Effect: The user can't use any other Seafile server.
+</code></pre><p>{% trans "To preset the location of Seafile folder:" %}</p>
+<pre><code>- Key: PreconfigureDirectory
+- Type: REG_SZ
+- Value: &lt;absolute path to the Seafile folder&gt;
+</code></pre><p>{% trans "To avoid the configuration wizard:" %}</p>
+<pre><code>- Key: HideConfigurationWizard
+- Type: REG_SZ
+- Value: 0 (show configuration wizard) or 1 (hide configuration wizard)
+- Effect: If you run seafile first time or without any account, seafile will look up this configure and hide configure wizard accordingly.
+</code></pre>
+<p>{% trans "To disable the \"Do you want to remove the account information\" dialog when uninstalling seafile client on Windows:" %}</p>
+<pre><code>- Key: PreconfigureKeepConfigWhenUninstall
+- Type: REG_SZ
+- Value: 0 (show the confirm dialog) or 1 (hide the confirm dialog wizard)
+</code></pre>
+<p>{% trans "Since version 7.0.6, you may use the option below to control average block size for indexing files in Sync client. Please note that, after setting this option in registry, you have to restart the sync client twice to let the option take effect." %}</p>
+<pre><code>- Key: PreconfigureBlockSize 
+- Type: REG_SZ
+- Value: a value larger than 1024. The unit is in bytes.
+</code></pre>
+<h6 id="using-seafileini-windows-or-seafilerc-linuxmac">{% trans "Using <code>~/seafile.ini</code>(windows) or <code>~/.seafilerc</code>(linux/mac)" %}</h6>
+<p>{% trans "This feature is available in seafile client 4.3.0 and above." %}</p>
+<p>{% trans "Below is an example to preset server address, user, token and Seafile folder:" %}</p>
+<pre><code>[preconfigure]
+PreconfigureDirectory = ~/
+PreconfigureUsername = guest@seafile.de
+PreconfigureUserToken = t0Ken
+PreconfigureServerAddr = https://cloud.seafile.de
+</code></pre>
+<h5 id="how-to-use-run-seafile-client-as-a-service-on-windows">{% trans "How to use run Seafile client as a service on Windows" %}</h5>
+<p>{% trans "Seafile client can be configured to run as a daemon using tools like Firedaemon. First configure Seafile as the user it should run - in this example \"Administator\"：" %}</p>
+<pre><code>Parameters for ccnet: -c C:/Users/Administrator/ccnet
+Parameters for seaf-daemon: -c C:/Users/Administrator/ccnet -d S:/seafile-data -w S:/Seafile
+</code></pre>
+<p>{% trans "Replace <code>S:</code> with the partition you actually use to store <code>seafile-data</code> and <code>Seafile</code> folder." %}</p>
+<p>{% trans "You call also use tools like NSSM (the Non-Sucking Service Manager). For more information, please check <a href=\"https://valdasv.blogspot.jp/2016/06/seafile-client-service.html\" target=\"_blank\">https://valdasv.blogspot.jp/2016/06/seafile-client-service.html</a>." %}</p>
+<h5 id="how-to-suppress-the-launch-of-seafile-client-after-install-on-windows">{% trans "How to suppress the launch of Seafile client after install on Windows" %}</h5>
+<p>{% trans "When the user installs seafile client on windows, the seafile client program would be started immediately after the installation is finished." %}</p>
+<p>{% trans "While this is the expected action for most users, it may be necessary to disable it sometimes. For example, when the seafile client is installed with Windows Group Policy Object (GPO), the program would be launched with the ADMIN user (instead of the current login user), which would make the program work incorrectly. In such cases, it's desirable to disable the launch of seafile client after installtion." %}</p>
+<p>{% trans "To disable this behavior:" %}</p>
+<pre><code>- Key: PreconfigureSuppressLaunchAfterInstall
+- Type: REG_SZ
+- Value: 1
+</code></pre>
+<h5 id="how-to-solve-the-shell-icon-overlay-not-shown-problem">{% trans "How to solve the shell icon overlay not shown problem" %}</h5>
+<p>{% trans "Windows uses only the first 15 of the entries in the registry (HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers). If there are other programs, like Dropbox and OneDrive, use up the overlay icons, Seafile shell icon overlay will not shown. To solve the problem, just delete the registration entries of other programs." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/file_locking.html b/seahub/help/templates/help/file_locking.html
new file mode 100644
index 0000000000..092de360ed
--- /dev/null
+++ b/seahub/help/templates/help/file_locking.html
@@ -0,0 +1,31 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "File locking" %}</h3>
+<p>{% trans "When more than one person collaborate on a file, it's likely that more than one person modify the file at about the same time. Seafile handles this situation nicely with conflict files. But it's often more convenient to lock the file when one person wants to exclusively modify the file. Seafile Professional Edition supports file locking." %}</p>
+<p>{% trans "File locking works on both the web app and the desktop syncing client. We'll introduce them one by one." %}</p>
+<h4>{% trans "File locking on the Web App" %}</h4>
+<p>{% trans "To lock a file, you can navigate into the file's folder on the web app, and click on the \"operations\" drop-down menu." %}</p>
+<img src="{{ MEDIA_URL }}img/help/web_lock_file.png" alt="" />
+<p>{% trans "After the file is locked, you can see a red \"stop sign\" at the corner of the file icon. Moving the mouse on the stop sign, you can see who locks the file. And you can also unlock a file that's locked by you. But you cannot unlock files locked by others." %}</p>
+<img src="{{ MEDIA_URL }}img/help/web_file_locked.png" alt="" />
+<h4>{% trans "File locking on the desktop client" %}</h4>
+<p>{% trans "After a library is synced to the desktop, you can lock/unlock files in that library inside File Explorer on Windows or Finder on Mac OS." %}</p>
+<p>{% trans "To lock a file, just right click on a synced file and choose \"lock this file\" in the \"Seafile\" menu." %}</p>
+<img src="{{ MEDIA_URL }}img/help/desktop_lock_file.png" alt="" />
+<p>{% trans "If a file is locked by you, you can see an orange \"stop sign\" on the file icon. You can choose to unlock it." %}</p>
+<img src="{{ MEDIA_URL }}img/help/desktop_my_locked_file.png" alt="" />
+<p>{% trans "If a file is locked by other user, you can see a red \"stop sign\" on the file icon. The file is automatically set to read-only. You cannot modify it until it's unlocked." %}</p>
+<img src="{{ MEDIA_URL }}img/help/desktop_other_locked_file.png" alt="" />
+<p>{% trans "If a library is not synced, you can still use cloud file browser to lock and unlock files in it." %}</p>
+<h4>{% trans "Auto locking office files" %}</h4>
+<p>{% trans "After a library is synced to the desktop, when you open a Microsoft Office file inside the library, Seafile automatically locks the file. When you close the file, Seafile automatically unlocks the file. The locking state is propagated to other computers syncing this library. It prevents concurrent editing the same Office file and is convenient for collaboration." %}</p>
+<h4>{% trans "Details about file locking" %}</h4>
+<p>{% trans "There are a few useful tips about how file locking works:" %}</p>
+<ul>
+  <li>{% trans "A locked file can only be unlocked by the user who locked it." %}</li>
+  <li>{% trans "A locked file cannot be modified, moved, renamed or deleted by other users. But other users can still move, delete or rename the parent folder of a locked file. The purpose of file locking is mainly to prevent concurrent editing." %}</li>
+  <li>{% trans "When a locked file's parent folder is renamed or moved inside the same library, it remains locked after the operation." %}</li>
+</ul>
+{% endblock %}
diff --git a/seahub/help/templates/help/finding_older_version_files.html b/seahub/help/templates/help/finding_older_version_files.html
new file mode 100644
index 0000000000..768c15cef8
--- /dev/null
+++ b/seahub/help/templates/help/finding_older_version_files.html
@@ -0,0 +1,16 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Finding older version of files" %}</h3>
+<p>{% trans "Seafile tracks the modification history of all files. Whenever a file is modified, a new version is created, while the old version is still kept for a configurable period. When you want to access an older version of a file, the file history feature becomes very handy." %}</p>
+<p>{% trans "To list all the versions of a file:" %}</p>
+<ul>
+<li>{% trans "In Seafile Web App, navigate into the folder containing the file. Move the cursor onto the row of that file. An operation menu will appear. You can click the \"History\" button in that menu." %}</li>
+<li>{% trans "A list of all versions of that file will be displayed in time order, from newer to older. The list also contains the file's rename history." %}</li>
+<li>{% trans "You can download, restore, view any version of the file. For text files, you can also compare the content of two versions." %}</li>
+</ul>
+<p>{% blocktrans %}You can configure the retention period of file versions: <a href="{{ SITE_ROOT }}help/setting_library_history/">setting history retention period</a>.{% endblocktrans %}</p>
+
+{% endblock %}
diff --git a/seahub/help/templates/help/folder_permission.html b/seahub/help/templates/help/folder_permission.html
new file mode 100644
index 0000000000..d830d9935d
--- /dev/null
+++ b/seahub/help/templates/help/folder_permission.html
@@ -0,0 +1,33 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Use folder permission for fine-grained access control" %}</h3>
+
+<p>{% blocktrans %}For shared libraries or folders, you can set permission to its sub-folders for a person or a group. Available permissions are the same as the ones described in <a href="{{ SITE_ROOT }}help/sharing_files_and_folders/">sharing libraries</a>. Here are some use cases:{% endblocktrans %}</p>
+<ul>
+  <li>{% trans "You shared a library to a group with \"read only\" permission. You also want to allow a specific member of the group to modify files in one sub-folder. You can grant write permission of this sub-folder to this person." %}</li>
+  <li>{% trans "You shared a library to 3 groups. There are 3 sub-folders under that library, one for each group to upload files. However you don't want users to change files not belong to his/her group. You can grant write permission of a sub-folder only to its group." %}</li>
+</ul>
+<p>{% trans "Folder permissions are only effective for libraries and folders you share to others. To effectively set folder permissions to its sub-folders, you should first share the parent library or folder; otherwise the folder permission won't take effect." %}</p>
+<p>{% trans "One important design goal of folder permission is to support hierarchical permissions:" %}</p>
+<ul>
+  <li>{% trans "Sub-folders automatically inherit folder permissions from its parent folder." %}</li>
+  <li>{% trans "Permissions set on sub-folders overwrites permissions set on its parent folder. For example, you set \"read write\" permission on folder \"meeting files\" for user A, and you set \"read only\" permission on sub-folder \"meeting files/today\" for user A. Then user A's permission to \"meeting files/today\" is \"read only\"." %}</li>
+</ul>
+<h4>{% trans "Basic usage" %}</h4>
+<p>{% trans "Only library's owner can set folder permissions for its sub-folders. In the file browsing interface, click \"more operations\" button, choose \"permission\" in the drop-down menu. In the pop-up window, you can see and set folder permissions on this folder." %}</p>
+<p>{% trans "If you want to see all folder permissions set in a library, hover the mouse on the library. Click \"more operations\" button, choose \"Folder Permission\" in the drop-down menu. In the pop-up window, you can see and set folder permissions in this library." %}</p>
+<p>{% trans "When other users navigate into a folder, there will be a small \"eye\" icon next to \"read only\" sub-folders. When the user navigate into that sub-folder, he/she won't be able to add/modify/delete files." %}</p>
+<img src="{{ MEDIA_URL }}img/help/web_folder_perm_ro.png" alt="" />
+<p>{% trans "If a \"read only\" folder is synced to PC with the Seafile desktop App, changes under a \"read only\" folder won't be uploaded to the cloud." %}</p>
+<h4>{% trans "Advanced: priority between different permissions" %}</h4>
+<ul>
+  <li>{% trans "Folder permissions have higher priority than the permission set in share. For example, if you shared a library to user A with \"read write\" permission, and also set \"read only\" permission to a sub-folder of that library. Then user A only has \"read only\" access to the sub-folder, while he/she has \"read write\" access to all other sub-folders and files." %}</li>
+  <li>{% trans "Folder permissions set to specific user have higher priority than permissions set to a group. That is, when checking permission for a folder, if the system matches a permission specific to the user, it'll ignore all permissions set for the groups the user belongs to." %}</li>
+  <li>{% trans "Permissions on sub-folders have higher priority than those on parent folders." %}</li>
+</ul>
+<p>{% trans "Here is a more complex example:" %}</p>
+<p>{% trans "Supposed the folder structure looks like \"A/B\", User \"John\" is in group \"Staff\". If you set \"read only\" permission on folder A for John, and, you also set \"read write\" permission on folder \"A/B\" for group \"Staff\". Then John's permission to folder \"A/B\" is still only \"read only\". That's because, according to rule 2, \"read only\" permission is first matched for folder \"A/B\" and user \"John\", which is inherited from it's parent \"A\"." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/full_text_file_search.html b/seahub/help/templates/help/full_text_file_search.html
new file mode 100644
index 0000000000..7bb06ce028
--- /dev/null
+++ b/seahub/help/templates/help/full_text_file_search.html
@@ -0,0 +1,18 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Full text file search" %}</h3>
+<p>{% trans "If you're using a Pro Edition Server, you can search file and folder names, as well as the content of certains files, in the Seafile web app. Currently Seafile can search the contents of the following file types:" %}</p>
+<ul>
+  <li>{% trans "Microsoft Office Doc: .doc, .docx (Pro Edition Server only)" %}</li>
+  <li>{% trans "Microsoft Office PowerPoint: .ppt, .pptx (Pro Edition Server only)" %}</li>
+  <li>{% trans "Microsoft Office Excel: .xls, .xlsx (Pro Edition Server only)" %}</li>
+  <li>{% trans "LibreOffice files" %}</li>
+  <li>{% trans "PDF files" %}</li>
+  <li>{% trans "Markdown files: .md" %}</li>
+  <li>{% trans "Various source code files" %}</li>
+  <li>{% trans "Text files: .txt, .log" %}</li>
+</ul>
+<p>{% trans "Note that your Seafile system administrator may not have enabled the full-text search feature. In that case, you can only search file and folder names." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/groups_managing.html b/seahub/help/templates/help/groups_managing.html
new file mode 100644
index 0000000000..ba774dd43f
--- /dev/null
+++ b/seahub/help/templates/help/groups_managing.html
@@ -0,0 +1,15 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Managing groups" %}</h3>
+<p>{% trans "Creating a group is a convenient way to share files to many people. In Seafile, you can create and manage a group easily." %}</p>
+<p>{% trans "Here is how groups work in Seafile:" %}</p>
+<ul>
+  <li>{% trans "Each group has a group admin. The admin is the creator of the group by default. The group admin can add more group admins. He/she can also transfer the ownership of the group to another member." %}</li>
+  <li>{% trans "The group admin can add/delete members in the group. And he/she can also unshare a library in the group." %}</li>
+</ul>
+<p>{% trans "To see all the groups you're in, click on the \"Groups\" tab on the left panel. You'll see all the groups you're in. Clicking into any group, you'll see the libraries shared into this group." %}</p>
+<p>{% trans "To create a new group, click on the \"Groups\" tab on the left panel. Then click on \"All Groups\". In the all group page, you can click \"New Group\" button to create a group." %}</p>
+<p>{% blocktrans %}See <a href="{{ SITE_ROOT }}help/sharing_files_and_folders/">sharing files and folders</a> about how to share libraries or folders to a group.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/ignore.html b/seahub/help/templates/help/ignore.html
index 18bb3e1e7e..274525e768 100644
--- a/seahub/help/templates/help/ignore.html
+++ b/seahub/help/templates/help/ignore.html
@@ -9,9 +9,9 @@
 <ol>
     <li>{% trans "A blank line matches no files." %}</li>
     <li>{% trans "A line starting with # serves as a comment." %}</li>
-    <li>{% blocktrans %}Seafile supports wildcards in the pattern. For example, "foo/*" matches "foo/1" and "foo/hello". "foo/?" matches "foo/1" but not "foo/hello". Note that the wildcard character * recursively matches all the paths under a folder. For instance, "foo/*.html" matches "foo/a.html" and "foo/templates/b.html".{% endblocktrans %}</li>
-    <li>{% blocktrans %}If the pattern ends with a slash, it would only match a folder. In other words, "foo/" will match a folder "foo" and paths underneath it, but will not match a regular file or a symbolic link "foo".{% endblocktrans %}</li>
-    <li>{% blocktrans %}If a pattern doesn't end with a slash or a wildcard, it would not match a folder. For example, "foo" can only match regular file "foo" or a symbolic link; while "foo/" and "foo*" match a folder and paths under it.{% endblocktrans %}</li>
+    <li>{% trans "Seafile supports wildcards in the pattern. For example, \"foo/*\" matches \"foo/1\" and \"foo/hello\". \"foo/?\" matches \"foo/1\" but not \"foo/hello\". Note that the wildcard character * recursively matches all the paths under a folder. For instance, \"foo/*.html\" matches \"foo/a.html\" and \"foo/templates/b.html\"." %}</li>
+    <li>{% trans "If the pattern ends with a slash, it would only match a folder. In other words, \"foo/\" will match a folder \"foo\" and paths underneath it, but will not match a regular file or a symbolic link \"foo\"." %}</li>
+    <li>{% trans "If a pattern doesn't end with a slash or a wildcard, it would not match a folder. For example, \"foo\" can only match regular file \"foo\" or a symbolic link; while \"foo/\" and \"foo*\" match a folder and paths under it." %}</li>
 </ol>
 </p>
 
diff --git a/seahub/help/templates/help/install_linux_client.html b/seahub/help/templates/help/install_linux_client.html
new file mode 100644
index 0000000000..261869c7e5
--- /dev/null
+++ b/seahub/help/templates/help/install_linux_client.html
@@ -0,0 +1,66 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Install Seafile client on Linux" %}</h3>
+<ul>
+  <li><a href="#wiki-ubuntu">Ubuntu</a></li>
+  <li><a href="#wiki-debian">Debian</a></li>
+  <li><a href="#wiki-centos">Centos/RHEL</a></li>
+  <li><a href="#wiki-fedora">Fedora</a></li>
+  <li><a href="#wiki-archlinux">Arch Linux</a></li>
+  <li><a href="#wiki-cli">Linux CLI</a></li>
+</ul>
+<h4 id="wiki-ubuntu">Ubuntu</h4>
+<p>{% trans "Ubuntu users can install Seafile client from the <a href=\"https://code.launchpad.net/~seafile/+archive/ubuntu/seafile-client\" target=\"_blank\">Official PPA</a>:" %}</p>
+<pre><code class="lang-sh">sudo add-apt-repository ppa:seafile/seafile-client
+sudo apt-get update
+sudo apt-get install seafile-gui
+</code></pre>
+<p>{% trans "If you only want to install the command-line client, run <code>sudo apt-get install seafile-cli</code> instead." %}</p>
+<p>{% trans "If you want to install the debug symbols (for example, when you want to report a bug), you can install the following packages:" %}</p>
+<pre><code class="lang-sh">sudo apt-get install libsearpc-dbg ccnet-dbg libccnet-dbg seafile-daemon-dbg libseafile-dbg seafile-gui-dbg
+</code></pre>
+<p>{% trans "Now you can start seafile client from Unity's dash." %}</p>
+<h4 id="wiki-debian">Debian</h4>
+<p>{% trans "Debian users can install Seafile client from our debian repo:" %}</p>
+<p>{% trans "To install the client, first add the signing key:" %}</p>
+<pre><code class="lang-sh">sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+</code></pre>
+<p>{% trans "Then add the repo to your apt source list, using the line corresponding to your debian version:" %}</p>
+<pre><code># For Debian 7
+echo deb http://deb.seadrive.org wheezy main | sudo tee /etc/apt/sources.list.d/seafile.list
+
+# For Debian 8
+echo deb http://deb.seadrive.org jessie main | sudo tee /etc/apt/sources.list.d/seafile.list
+
+# For Debian 9
+echo deb http://deb.seadrive.org stretch main | sudo tee /etc/apt/sources.list.d/seafile.list
+</code></pre>
+<p>{% trans "Update your local apt cache :" %}</p>
+<pre><code>sudo apt-get update
+</code></pre>
+<p>{% trans "Now install the client:" %}</p>
+<pre><code class="lang-sh">sudo apt-get install seafile-gui
+</code></pre>
+<p>{% trans "If you only want to install the command-line client, run <code>sudo apt-get install seafile-cli</code> instead." %}</p>
+
+<h4 id="wiki-centos">{% trans "Centos/RHEL (community maintained)" %}</h4>
+<p>{% trans "Since 7.0.3 version, we provide official repo for CentOS or RHEL. Currently only CentOS/RHEL 7 is supported." %}</p>
+<p>{% trans "Add the repo (The same repo is used for seadrive.)" %}</p>
+<pre><code class="lang-sh">wget -O- https://git.io/seadrive-centos7-repo | sudo tee /etc/yum.repos.d/seadrive.repo
+</code></pre>
+<p>{% trans "Install Seafile Client" %}</p>
+<pre><code class="lang-sh">sudo yum install -y epel-release
+sudo yum install -y seafile --enablerepo=cr
+</code></pre>
+
+<h4 id="wiki-fedora">{% trans "Fedora (community maintained)" %}</h4>
+<p>{% trans "There is a <em>community maintained</em> Seafile Client RPM package in Fedora's <a href=\"https://src.fedoraproject.org/rpms/seafile\" target=\"_blank\">official repository</a>." %}</p>
+
+<h4 id="wiki-archlinux">{% trans "Arch Linux (community maintained)" %}</h4>
+<p>{% trans "There is a <em>community maintained</em> Seafile Client package for Arch Linux: <a href=\"https://aur.archlinux.org/packages/seafile-client/\" target=\"_blank\">https://aur.archlinux.org/packages/seafile-client/</a>." %}</p>
+
+<h4 id="wiki-cli">{% trans "Linux CLI usage" %}</h4>
+<p>{% blocktrans %}Please refer to <a href="{{ SITE_ROOT }}help/linux_cli">this documentation</a> for how to use Linux client on a command line server.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/install.html b/seahub/help/templates/help/install_sync.html
similarity index 68%
rename from seahub/help/templates/help/install.html
rename to seahub/help/templates/help/install_sync.html
index df227c3768..69d805ff45 100644
--- a/seahub/help/templates/help/install.html
+++ b/seahub/help/templates/help/install_sync.html
@@ -3,25 +3,25 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Installing Seafile Client Program" %}</h3>
+<h3 class="hd">{% trans "Installing Seafile client program" %}</h3>
 
 <p>{% trans "After downloading Seafile client program, you have 3 steps left to get it up and running." %}</p>
 
 <h4>{% trans "1. Select a disk partition to store local Seafile data" %}</h4>
-<img src="{{ MEDIA_URL }}img/help/seafile-init-choose-folder.png" alt="{% trans "Selecting a folder to store Seafile data" %}" width="550" />
+<img src="{{ MEDIA_URL }}img/help/seafile-init-choose-folder.png" alt="{% trans "Selecting a folder to store Seafile data" %}" />
 
 <h4>{% trans "2. Add an account" %}</h4>
 <p>{% trans "Add an account on your private Seafile server or our public server." %}</p>
 
-<img src="{{ MEDIA_URL }}img/help/seafile-add-account.png" alt="" width="550" />
+<img src="{{ MEDIA_URL }}img/help/seafile-add-account.png" alt=""  />
 
 <h4>{% trans "3. Sync a library" %}</h4>
 <ul>
-    <li>{% trans 'Click the "Sync this library" button to sync it with a local folder.' %}</li>
+    <li>{% trans "Click the \"Sync this library\" button to sync it with a local folder." %}</li>
     <li>{% trans "Then you add some files into the library. They will be automatically synced with cloud platform." %}</li>
 </ul>
 
-<img src="{{ MEDIA_URL }}img/help/seafile-sync-library.png" width="312" alt="" />
+<img src="{{ MEDIA_URL }}img/help/seafile-sync-library.png" alt="" />
 
 <h4>{% trans "4. (Optional) Create a library" %}</h4>
 
@@ -29,10 +29,10 @@
 
 <img src="{{ MEDIA_URL }}img/help/seafile-create-library.png" alt="" /><br />
 
-<img src="{{ MEDIA_URL }}img/help/seafile-create-library-02.png" width="550" alt="" />
+<img src="{{ MEDIA_URL }}img/help/seafile-create-library-02.png" alt="" />
 
 <h4>{% trans "5. Browse files on the cloud" %}</h4>
-<p>{% trans 'In some occasions, you want to modify files on the cloud directly without syncing them. Seafile client comes with a "cloud file browser" to meet this need. Click an unsynced library will open the cloud file browser.' %}</p>
+<p>{% trans "In some occasions, you want to modify files on the cloud directly without syncing them. Seafile client comes with a \"cloud file browser\" to meet this need. Click an unsynced library will open the cloud file browser." %}</p>
 
 <img src="{{ MEDIA_URL }}img/help/seafile-cloud-file-browser.png" alt="" />
 
diff --git a/seahub/help/templates/help/introduction.html b/seahub/help/templates/help/introduction.html
new file mode 100644
index 0000000000..0831621e60
--- /dev/null
+++ b/seahub/help/templates/help/introduction.html
@@ -0,0 +1,12 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Introduction" %}</h3>
+
+<p>{% trans "Seafile is an enterprise file hosting platform with high reliability and performance." %}</p>
+<p>{% blocktrans %}Seafile contains a web interface for you to manage and share files. It has two kinds of desktop clients, <a href="{{ SITE_ROOT }}help/install_sync/">the file syncing client</a> and <a href="{{ SITE_ROOT }}help/using_drive_client">the drive client</a>. It also has mobile clients for Android and iOS.{% endblocktrans %}</p>
+<p>{% trans "You can download the clients in <a href=\"https://www.seafile.com/en/download/\" target=\"_blank\">Seafile web site</a>." %}</p>
+<p>{% trans "If this manual does not contain the information you needed, you can seek help in our forum: <a href=\"https://forum.seafile.com\" target=\"_blank\">https://forum.seafile.com</a>." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/libraries_managing.html b/seahub/help/templates/help/libraries_managing.html
new file mode 100644
index 0000000000..426b55398a
--- /dev/null
+++ b/seahub/help/templates/help/libraries_managing.html
@@ -0,0 +1,16 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Managing files with libraries" %}</h3>
+<p>{% trans "Seafile uses \"libraries\" to organize your files. A library is a top level container for a set of files and folders. You can create a library for each project you work on, or each document type you want to save in Seafile. A library works mostly like a top level folder. But it also has some special properties:" %}</p>
+<ul>
+  <li>{% trans "Each library keeps its own file modification history. There is no global file modification history across all libraries." %}</li>
+  <li>{% trans "Each library can be synced to desktop clients separately. You can choose which libraries to be synced." %}</li>
+</ul>
+<p>{% trans "When you log into Seafile's web app for the first time, Seafile automatically creates a default library named \"My Library\" for you. You can also create more libraries. Here is what it looks like when you've created a few libraries." %}</p>
+<p><img src="{{ MEDIA_URL }}img/help/libraries_view.png" alt="" /></p>
+<p>{% trans "You can navigate into a library and manage your files and folders. You can upload, download, rename, move, copy and delete files." %}</p>
+<p><img src="{{ MEDIA_URL }}img/help/library_browse.png" alt="" /></p>
+<p>{% blocktrans %}After <a href="{{ SITE_ROOT }}help/install_sync/">syncing a library with desktop client</a>, you can do any file operations inside the local library folder. The operations will be uploaded to the server. {% endblocktrans %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/library_history_and_snapshots.html b/seahub/help/templates/help/library_history_and_snapshots.html
new file mode 100644
index 0000000000..9eca363ef8
--- /dev/null
+++ b/seahub/help/templates/help/library_history_and_snapshots.html
@@ -0,0 +1,17 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Library history and snapshots" %}</h3>
+<p>{% trans "Seafile tracks modification history for the entire library. Whenever a file operation applies to a library (file update, file deletion etc.), Seafile creates a \"snapshot\" of the previous state of the library. The snapshot contains the complete file and folder structure of the library." %}</p>
+<p>{% trans "In some cases, you have changed a lot of files in the library, and find that you want to revert all these changes. Restoring many files to their old versions can be tedious. At this time, the snapshot feature becomes very handy. You can restore the entire library to any point in the past. All the files in the library will be restored to that point of time, all at once. It works like a \"time machine\" for the library." %}</p>
+<p>{% trans "To view library history and snapshots:" %}</p>
+<ul>
+  <li>{% trans "In Seafile Web App, navigate into the root folder of a library. Click the \"History\" icon in the library navigation top bar. All the change record of the library will be displayed in a list." %}</li>
+  <li>{% trans "Click the \"view snapshot\" link on any modification record. You'll see the library state at the point of time." %}</li>
+  <li>{% trans "In the snapshot view, you can download or restore any file or folder. If you're the library's owner, you can restore the enitre library to this point of time." %}</li>
+</ul>
+<p>{% blocktrans %}You can configure the retention period of library history: <a href="{{ SITE_ROOT }}help/setting_library_history/">setting history retention period</a>.{% endblocktrans %}</p>
+
+{% endblock %}
diff --git a/seahub/help/templates/help/linux_cli.html b/seahub/help/templates/help/linux_cli.html
new file mode 100644
index 0000000000..9206b613b4
--- /dev/null
+++ b/seahub/help/templates/help/linux_cli.html
@@ -0,0 +1,163 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Seafile client for a CLI server" %}</h3>
+
+<h4 id="installation">{% trans "Installation" %}</h4>
+<p>{% blocktrans %}You can follow <a href="{{ SITE_ROOT }}help/install_linux_client/">this documentaion</a> to install Seafile CLI client on various Linux distributions.{% endblocktrans %}</p>
+
+<h4 id="basic-usage">{% trans "Basic usage" %}</h4>
+<p>{% trans "Initialize & start the client" %}</p>
+<pre><code class="lang-sh"><span class="hljs-comment"># choose a folder where to store the seafile client settings e.g ~/seafile-client</span>
+mkdir ~/seafile-client            <span class="hljs-comment"># create the settings folder</span>
+seaf-cli init <span class="hljs-_">-d</span> ~/seafile-client  <span class="hljs-comment"># initialise seafile client with this folder</span>
+seaf-cli start
+</code></pre>
+<p>{% trans "Download and sync a library from a server" %}</p>
+<ul>
+  <li>{% trans "retrieve the library id by browsing into a library on the server. The ID is part of the URL. The format looks like <code>f4962ce9-ba07-47b8-a83a-73dd96c2ebfd</code>." %}</li>
+  <li>{% trans "then" %}
+    <pre><code class="lang-sh">seaf-cli download <span class="hljs-_">-l</span> <span class="hljs-string">"the id of the library"</span> <span class="hljs-_">-s</span>  <span class="hljs-string">"the url + port of server"</span> <span class="hljs-_">-d</span> <span class="hljs-string">"the folder where the library folder will be downloaded"</span> -u <span class="hljs-string">"username on server"</span> [-p <span class="hljs-string">"password"</span>]
+seaf-cli status  <span class="hljs-comment"># check status of ongoing downloads</span>
+<span class="hljs-comment"># Name  Status  Progress</span>
+<span class="hljs-comment"># Apps    downloading     9984/10367, 9216.1KB/s</span>
+    </code></pre>
+  </li>
+</ul>
+<p>{% trans "Note: if you don't supply the password parameter in the command, it will be asked later, which is more secure." %}</p>
+<p>{% trans "Example: <code>seaf-cli download -l 0536c006-8a43-449e-8718-39f12111620d -s http://cloud.seafile.com -d /tmp -u freeplant@test.com</code>" %}</p>
+<p>{% trans "The above command will create a <strong>new folder</strong> with the same name as the library under the specified folder." %}</p>
+<p>{% trans "You can also sync a library with an <strong>existing folder</strong> on the local computer. The existing files in the local folder will be merged with the files in the library." %}</p>
+<pre>
+<code>seaf-cli sync -l "the id of the library" -s  "the url + port of server" -d "the folder which the library will be synced with" -u "username on server" [-p "password"]</code>
+</pre>
+<p>{% trans "After running the <code>download</code> or <code>sync</code> command, the local folder will be automatically synced with the library." %}</p>
+
+<h4>{% trans "Detailed documentation" %}</h4>
+<p>{% trans "seaf-cli is the command line interface for seafile client." %}</p>
+<p>{% trans "Subcommands:" %}</p>
+<pre><code>    init                Initialize config directory
+    start               Start ccnet and seafile daemon
+    stop                Stop ccnet and seafile daemon
+    list                List local libraries
+    list-remote         List remote libraries
+    status              Show syncing status
+    download            Download and sync a library from seafile server 
+    download-by-name    Download and sync a library defined by name from seafile server 
+    sync                Sync a library with an existing folder
+    desync              De-sync a library with seafile server
+    create              Create a library
+    config              Configure seafile client
+</code></pre>
+<p>{% trans "Running <code>seaf-cli -h</code> will show the above help. For each subcommand, you can also use <code>-h</code> option to get help, e.g. <code>seaf-cli download -h</code>." %}</p>
+
+<h5>{% trans "Detail" %}</h5>
+<p>{% trans "Seafile client stores all its configure information in a config dir. The default location is <code>~/.ccnet</code>. All the commands below accept an option <code>-c &lt;config-dir&gt;</code>." %}</p>
+
+<h6 id="init">init</h6>
+<p>{% trans "Initialize seafile client. This command initializes the config dir. It also creates sub-directories <code>seafile-data</code> and <code>seafile</code> under <code>parent-dir</code>. <code>seafile-data</code> is used to store internal data, while <code>seafile</code> is used as the default location put downloaded libraries." %}</p>
+<pre><code>seaf-cli init [-c &lt;config-dir&gt;] -d &lt;parent-dir&gt;
+</code></pre>
+<p>{% trans "A file named <code>seafile.ini</code> will be created under <code>~/.ccnet</code> to record the location of <code>seafile-data</code> directory." %}</p>
+<p>{% trans "If you want to run multiple instances of Seafile cli client in the same machine, you can specify different <code>config-dir</code> and <code>parent-dir</code> when initializing different client instances. Then the instances can run without interfering each others. When starting the instances, just specify ccnet config directories with the <code>-c</code> option." %}</p>
+
+<h6 id="start">start</h6>
+<p>{% trans "Start seafile client. This command starts <code>seaf-daemon</code>, which is the file syncing engine for Seafile client." %}</p>
+<pre><code>seaf-cli start [-c &lt;config-dir&gt;]
+</code></pre>
+
+<h6 id="stop">stop</h6>
+<p>{% trans "Stop seafile client." %}</p>
+<pre><code>seaf-cli stop [-c &lt;config-dir&gt;]
+</code></pre>
+
+<h6 id="download">download/download-by-name</h6>
+<p>{% trans "Download and sync a library from seafile server. It will create a <b>new folder</b> with the same name as the library under the parent folder. The local folder will be automatically synced with the library. The download-by-name command works similarly, but can save you from finding the library ID. It only works when the library name is unique on the server." %}</p>
+<pre><code>seaf-cli download -l &lt;library-id&gt; -s &lt;seahub-server-url&gt; -d &lt;parent-directory&gt; -u &lt;username&gt; [-p &lt;password&gt;]
+</code></pre>
+
+<h6 id="sync">sync</h6>
+<p>{% trans "Synchronize a library with an existing folder. The existing files in the local folder will be merged with the files in the library." %}</p>
+<pre><code>seaf-cli sync -l &lt;library-id&gt; -s &lt;seahub-server-url&gt; -d &lt;existing-folder&gt; -u &lt;username&gt; [-p &lt;password&gt;]
+</code></pre>
+
+<h6 id="desync">desync</h6>
+<p>{% trans "Desynchronize a library from seafile server. After running this command, the local folder will no longer be synced with the server." %}</p>
+<pre><code>seaf-cli desync -d &lt;existing-folder&gt;</code></pre>
+
+<h6 id="create">create</h6>
+<p>{% trans "Create a new library on server." %}</p>
+<pre><code>seaf-cli create [-h] -n library-name -t description [-e library-password] -s server -u username -p password</code></pre>
+
+<h6 id="list">list</h6>
+<p>{% trans "List information about synced libraries. The information includes library name, library ID and local folder path for the library." %}</p>
+<pre><code>seaf-cli list</code></pre>
+
+<h6 id="list-remote">list-remote</h6>
+<p>{% trans "List information about synced libraries. The information includes library name, library ID and local folder path for the library." %}</p>
+<pre><code>seaf-cli list-remote</code></pre>
+
+<h6 id="status">status</h6>
+<p>{% trans "List information about synced libraries. The information includes library name, library ID and local folder path for the library." %}</p>
+<pre><code>seaf-cli status</code></pre>
+<p>{% trans "The returned status and their meaning:" %}</p>
+<table>
+  <thead>
+    <tr>
+      <th>status</th>
+      <th>{% trans "meaning" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>synchronized</td>
+      <td>{% trans "Local folder is consistent with the remote library" %}</td>
+    </tr>
+    <tr>
+      <td>committing</td>
+      <td>{% trans "Files in local folder are being indexed" %}</td>
+    </tr>
+    <tr>
+      <td>initializing</td>
+      <td>{% trans "Getting sync information from server" %}</td>
+    </tr>
+    <tr>
+      <td>downloading file list</td>
+      <td>{% trans "Downloading file list from server. Progress will be displayed." %}</td>
+    </tr>
+    <tr>
+      <td>downloading files</td>
+      <td>{% trans "Downloading files from server. Progress will be displayed." %}</td>
+    </tr>
+    <tr>
+      <td>uploading</td>
+      <td>{% trans "Uploading files to server. Progress will be displayed." %}</td>
+    </tr>
+    <tr>
+      <td>error</td>
+      <td>{% trans "Error message will be displayed in the progress column." %}</td>
+    </tr>
+  </tbody>
+</table>
+
+<h6 id="skip-ssl-certificate-verify">{% trans "Skip SSL certificate verification" %}</h6>
+<p>{% trans "If you're using self-signed certificate on the server, you should ask the client to skip verifying certificate." %}</p>
+<pre><code>seaf-cli config -k disable_verify_certificate -v true
+</code></pre>
+
+<h6 id="set-transfer-speed-limit">{% trans "Set transfer speed limit" %}</h6>
+<p>{% trans "Set upload speed limit to 1MB/s :" %}</p>
+<pre><code class="lang-sh">seaf-cli config -k upload_<span class="hljs-built_in">limit</span> -v 1000000
+</code></pre>
+<p>{% trans "Set download speed limit to 1MB/s :" %}</p>
+<pre><code class="lang-sh">seaf-cli config -k download_<span class="hljs-built_in">limit</span> -v 1000000
+</code></pre>
+
+<h6 id="two-factor-authentication">{% trans "Two factor authentication" %}</h6>
+<p>{% trans "seaf-cli supports 'Two Factor Authentication'." %}</p>
+<p>{% trans "If you want to use the feature, you should add the argument <code>--tfa <token></code> to any <code>seaf-cli</code> commands. <code><token></code> is Google Authenticator's verification code." %}</p>
+<p>{% trans "For example:" %}</p>
+<pre><code class="lang-sh">seaf-cli download <span class="hljs-_">-l</span> <span class="hljs-string">"4b11d9d4-e3b1-4394-be85-9d4a80f626fa"</span> <span class="hljs-_">-s</span> <span class="hljs-string">"https://demo.seafile.top"</span> <span class="hljs-_">-d</span> <span class="hljs-string">"testst"</span> -u <span class="hljs-string">"abc@abc.com"</span> -p <span class="hljs-string">"abc"</span> --tfa 002755
+</code></pre>
+{% endblock %}
diff --git a/seahub/help/templates/help/manage_library_as_wiki.html b/seahub/help/templates/help/manage_library_as_wiki.html
new file mode 100644
index 0000000000..29ea57f1ae
--- /dev/null
+++ b/seahub/help/templates/help/manage_library_as_wiki.html
@@ -0,0 +1,27 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Managing a library as Wiki" %}</h3>
+<p>{% trans "Capturing and storing little structured data in an easy-to-use fashion – that is what Seafile’s wikis are for. Wiki pages are written in Markdown (MD), a simple markup language, to ensure cross platform compatibility. MD files store textual, tabular as well as graphical information; You can also add links to other documents in a Markdown file." %}</p>
+<p>{% trans "You can manage a standard library in Seafile like a Wiki, with the \"Column View\" introduced in 7.0 version. Since Seafile implements wikis as standard Seafile libraries, they can be synced and shared with other users just like any ordinary library." %}</p>
+<h4 id="column-view">{% trans "Column view" %}</h4>
+<p>{% trans "Wikis usually have a side bar containing a tree-like folder structure, to enable quick-and-easy browsing of Wiki pages. Seafile's Column View allows you to manage the files in a library in the same way as a Wiki space. Users can browse in it and move files and folders just by dragging and dropping. File actions such as renaming, moving, and opening via client are available in a right-click-accessible context menu." %}</p>
+<img src="{{ MEDIA_URL }}img/help/column_view.png" alt="Column View" />
+<img src="{{ MEDIA_URL }}img/help/context_menu.png" alt="Context Menu" />
+<h4 id="wysiwyg-markdown-editor">{% trans "WYSIWYG Markdown editor" %}</h4>
+<p>{% trans "Wiki pages in Seafile are saved as ordinary documents in Markdown format. To create a new Wiki page in a library, just create a new Markdown document. MD files can be edited straight from Seafile’s web interface with the online MD editor. The web-based editor offers a smooth user experience and rich formatting options for text, images, and tables. Images can be imported into MD files from libraries and local storage as well as by hyperlinks. Basic image editing functions such as scaling can also be performed in the editor’s what-you-see-is-what-you-get (WYSIWYG) interface. Tables can be inserted and modified with just a few clicks. The same thing goes for a table’s content: A table can be copied in its entirety or in part without leaving the WYSIWYG view." %}</p>
+<img src="{{ MEDIA_URL }}img/help/markdown_editor.png" alt="Markdown Editor" />
+<p>{% trans "The change history of a Markdown file can be easily accessed by clicking the \"File History\" button in the menu on top of the editor interface." %}</p>
+<img src="{{ MEDIA_URL }}img/help/file_history.png" alt="File history" />
+<p>{% trans "You can open a hidden side bar on the right side of the Markdown editor. Table of contents, file information, formatting suggestions, and collaborative commenting are provided in this side bar." %}</p>
+<img src="{{ MEDIA_URL }}img/help/editor_side_bar.png" alt="Markdown Editor Side Bar" />
+<h4 id="file-tagging-and-related-documents">{% trans "File tagging and related documents" %}</h4>
+<p>{% trans "File tagging is an important feature for knowledge management. Seafile allows users to define tags for each library and apply tags to files. Tags can be managed from the side bar of the Markdown editor, or from the file browser interface." %}</p>
+<img src="{{ MEDIA_URL }}img/help/tags_from_side_bar.png" alt="Tags from side bar" />
+<img src="{{ MEDIA_URL }}img/help/tags_from_file_browser.png" alt="Tags from file browser" />
+<p>{% trans "The file browser interface provides a summary of all file tags in the current library." %}</p>
+<img src="{{ MEDIA_URL }}img/help/tags_summary.png" alt="Tags summary" />
+<p>{% trans "You can also add related files to a Markdown document from the \"File Information\" tab in the side bar." %}</p>
+<img src="{{ MEDIA_URL }}img/help/related_files.png" alt="Related files" />
+{% endblock %}
diff --git a/seahub/help/templates/help/read-only_syncing.html b/seahub/help/templates/help/read-only_syncing.html
new file mode 100644
index 0000000000..64780a09a6
--- /dev/null
+++ b/seahub/help/templates/help/read-only_syncing.html
@@ -0,0 +1,8 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Read-only syncing" %}</h3>
+<p>{% blocktrans %}For ready-only libraries or folders, Seafile will show a forbidden icon (<img src="{{ MEDIA_URL }}img/help/read_only.png" alt="" width="24" />) to indicate they are read-only. However, users can still modify the synced local copies. When a local copy is modified, Seafile will ignore the modified one. When the copy at the server is also modified, the client will popup a notification, saying that the local modified copy conflict with the copy at the server side. To prevent data loss, the local copy is renamed to a conflict file.{% endblocktrans %}</p>
+<p>{% trans "If you want the be-shared users not be able to modify local copies, you can consider using the Seafile Drive client." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/restoring_deleted_files.html b/seahub/help/templates/help/restoring_deleted_files.html
new file mode 100644
index 0000000000..00e891c537
--- /dev/null
+++ b/seahub/help/templates/help/restoring_deleted_files.html
@@ -0,0 +1,17 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Restoring deleted files and folders" %}</h3>
+<p>{% trans "Each library in Seafile tracks your file deletion operations automatically. Sometimes you find files are deleted mistakenly. You can find back your delete files in the trash bin of each library." %}</p>
+<p>{% trans "Here is how to use the trash bin feature:" %}</p>
+<ul>
+  <li>{% trans "In Seafile Web App, navigate into the parent folder containing the deleted file or folder." %}</li>
+  <li>{% trans "Click the \"trash\" icon in the library operation bar. The deleted files and folders will be listed in deletion time order. In the bottom of the list, you can click the \"more\" button to load more deleted files." %}</li>
+  <li>{% trans "In the deleted files list, you can restore file and folders. If a file or folder's parent folder has been deleted, it will be restored to the library's root folder." %}</li>
+  <li>{% trans "Note that the trash bin only contains files and sub-folders deleted under the current folder. Files deleted in the sub-folders of the current folder are also included in the list." %}</li>
+</ul>
+<p>{% blocktrans %}You can configure the retention period of delete files: <a href="{{ SITE_ROOT }}help/setting_library_history/">setting history retention period</a>.{% endblocktrans %}</p>
+
+{% endblock %}
diff --git a/seahub/help/templates/help/selective_sync.html b/seahub/help/templates/help/selective_sync.html
index e70bc8105f..ee5ee526a4 100644
--- a/seahub/help/templates/help/selective_sync.html
+++ b/seahub/help/templates/help/selective_sync.html
@@ -3,14 +3,14 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Selective Sync Sub-folders" %}</h3>
+<h3 class="hd">{% trans "Selectively sync sub-folders" %}</h3>
 
-<p>{% trans "You may have some very large libraries on the Seafile server. And you're currently only interested in a sub-folder inside one library. If your Seafile server is Pro edition, you can selectively sync a sub-folder in a library, instead of syncing the entire library." %}</p>
+<p>{% trans "You may have some very large libraries on the Seafile server. And you're currently only interested in a sub-folder inside one library. Then you can selectively sync a sub-folder in a library, instead of syncing the entire library." %}</p>
 
-<p>{% blocktrans %}To sync a sub-folder, open cloud file browser by double clicking a library which hasn't been synced. Navigate into the parent folder of that sub-folder. Right click on the sub-folder. Choose "Sync this folder" in the pop-up menu.{% endblocktrans %}</p>
+<p>{% trans "To sync a sub-folder, open cloud file browser by double clicking a library which hasn't been synced. Navigate into the parent folder of that sub-folder. Right click on the sub-folder. Choose \"Sync this folder\" in the pop-up menu." %}</p>
 
-<img src="{{MEDIA_URL}}img/help/sync-a-sub-folder.png" width="550" alt="" />
+<img src="{{MEDIA_URL}}img/help/sync-a-sub-folder.png" alt="" />
 
-<p>{% blocktrans %}After syncing the sub-folder, you can see its syncing status in the "Synced Libraries" group in the client's main window.{% endblocktrans %}</p>
+<p>{% trans "After syncing the sub-folder, you can see its syncing status in the \"Synced Libraries\" group in the client's main window." %}</p>
 
 {% endblock %}
diff --git a/seahub/help/templates/help/setting_library_history.html b/seahub/help/templates/help/setting_library_history.html
new file mode 100644
index 0000000000..b2b01b552c
--- /dev/null
+++ b/seahub/help/templates/help/setting_library_history.html
@@ -0,0 +1,21 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Setting library history retention period" %}</h3>
+<p>{% trans "A library's history retention period length controls how long can you access your history data in the following features:" %}</p>
+<ul>
+<li>{% trans "Restore deleted files: you cannot restore files and folders deleted before the retention period." %}</li>
+<li>{% trans "File versions: you cannot access file versions older than the retention period." %}</li>
+<li>{% trans "Library history and snapshots: you cannot access library snapshots older than the retention period." %}</li>
+</ul>
+<p>{% trans "The retention period of old files versions can be configured for each library, separately. You must be the library's owner to set the retention period. To set retention period length:" %}</p>
+<ul>
+<li>{% trans "In Seafile Web App, click the \"Mine\" tab in the navigation panel (as in the below screen shot). All libraries owned by you will be listed." %}</li>
+<li>{% trans "Move the cursor onto the row of the library. An operation menu will appear. Click \"History Setting\" in the drop-down menu." %}</li>
+<li>{% trans "In the pop-up dialog, you can set the length of file retention period." %}</li>
+</ul>
+<p><img src="{{ MEDIA_URL }}img/help/history_setting.png" alt=""></p>
+
+{% endblock %}
diff --git a/seahub/help/templates/help/sharing_files_and_folders.html b/seahub/help/templates/help/sharing_files_and_folders.html
new file mode 100644
index 0000000000..f2763dbb4c
--- /dev/null
+++ b/seahub/help/templates/help/sharing_files_and_folders.html
@@ -0,0 +1,69 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Sharing files and folders" %}</h3>
+<p>{% trans "In Seafile there are a few ways to share files and folders with others:" %}</p>
+<ul>
+  <li>{% trans "Using links: there are multiple types of links that can be used to share with various scope of collaborators." %}
+    <ul>
+      <li>{% trans "Share links: Any user who has access to the links can access the files or folders pointed by the link. No login is required." %}</li>
+      <li>{% trans "Upload links: Any user who has access to the links can upload files to the folder pointed by the link. No login is required." %}</li>
+      <li>{% trans "Internal links: Only logged in users who have share permissions to file or folder can access this link. Used for internal file sharing." %}</li>
+    </ul>
+  </li>
+  <li>{% trans "Sharing libraries or folders: used for setting access permissions to a library or folder for specific users or groups. Users have to log in to access the folders." %}</li>
+</ul>
+<h4>{% trans "Creating share links to files or folders" %}</h4>
+<p>{% trans "Share links are public links to files or folders. They can be accessed by anyone, including those who don't have a Seafile account. You can also use password and expiration time to protect your links." %}</p>
+<p>{% trans "You can also set access permission to share links. There are three types of permissions:" %}</p>
+<ul>
+  <li>{% trans "Preview and Download: the file or files in the folder can be downloaded. If the type of files can be previewd in web browser, they can also be viewed online (e.g. Office files)." %}</li>
+  <li>{% trans "Preview only: the file or files in the folder can only be viewed in web browser, but cannot be downloaded. This is useful for sharing confidential data. For Office files, water mark can also be added to file preview. The water mark includes the link owner's name." %}</li>
+  <li>{% trans "Edit on cloud and download: Similar to \"Preview and Download\", but if the file type can be edited in web browser (e.g. Office files), any user who has access to the link is allowed to edit it." %}</li>
+</ul>
+<p>{% trans "To create a share link in Seafile web app:" %}</p>
+<ol>
+  <li>{% trans "Navigate into the parent folder containing the file or folder. Hover your mouse over the file or folder and click on the \"Share\" icon that appears." %}</li>
+  <li>{% trans "A pop-up window will appear with all the share options. Click the \"Share Link\" tab on the left panel. Then click \"Generate\" button to create a link. You can use password, expiration time and permission to protect your link." %}</li>
+  <li>{% trans "Copy the link to email, instant messaging client or any other tool to send it to others." %}</li>
+</ol>
+<p>{% trans "You can also create download links from the desktop clients." %}</p>
+<ul>
+  <li>{% trans "If the library is synced, double click the library in the main Window of Seafile client. The local folder of that library will be opened. Right click on the file or folder that you want to create a link to. In the pop-up menu, choose \"Seafile\" then \"Create share link\"." %}</li>
+  <li>{% trans "If the library is not synced, double click the library in the main Window of Seafile client. The cloud file browser window will be opened. You can create a link to file or folder in the cloud file browser." %}</li>
+</ul>
+<h4>{% trans "Creating upload links to folders" %}</h4>
+<p>{% trans "You can use upload links to collect files from others. You can only create upload link for a folder. Others cannot see the files in the folder. They can only upload files to the link." %}</p>
+<p>{% trans "To create an upload link in Seafile web app:" %}</p>
+<ol>
+  <li>{% trans "Navigate into the parent folder containing the folder. Hover your mouse over the folder and click on the \"Share\" icon that appears." %}</li>
+  <li>{% trans "A pop-up window will appear with all the share options. Click the \"Upload Link\" tab on the left panel. Then click \"Generate\" button to create a link. You can use password to protect your link." %}</li>
+  <li>{% trans "Copy the link to email, instant messaging client or any other tool to send it to others." %}</li>
+</ol>
+<h4>{% trans "Sharing libraries or folders" %}</h4>
+<p>{% trans "You can share a library or folder to other registered Seafile users. The shared library or folder can be accessed by others with the web app and Seafile clients." %}</p>
+<p>{% trans "You can choose the member range of the share:" %}</p>
+<ul>
+  <li>{% trans "Share to user: You can share to one or more users, one by one." %}</li>
+  <li>{% trans "Share to group: You can share to a group of users. See how to manage groups in group sharing." %}</li>
+  <li>{% trans "Share to organization: If you're using a private server, sometimes it's useful to share to all members on the server (the entire organization)." %}</li>
+</ul>
+<p>{% trans "You can also set permission on the share:" %}</p>
+<ul>
+  <li>{% trans "Read-Write share: the share members can do any update operations on the folder, including update file, upload file, delete, rename." %}</li>
+  <li>{% trans "Read-only share: the share members can only read the folder and files in it. They cannot do any update to the folder and files." %}</li>
+  <li>{% trans "Admin: the share members can re-share the library to other users. This permission can only be set when sharing a library, but not a folder." %}</li>
+  <li>{% trans "Online Read-Write: users can view and edit the file online via web browser. File cannot be downloaded. (New in 7.0)" %}</li>
+  <li>{% trans "Online Read-only: users can view the file online via web browser. File cannot be downloaded. (New in 7.0)" %}</li>
+</ul>
+<p>{% trans "To share a library or folder to a user or group:" %}</p>
+<ol>
+  <li>{% trans "Hover your mouse over the library or folder and click on the \"Share\" icon that appears." %}</li>
+  <li>{% trans "A pop-up window will appear with all the share options. Click the \"Share to user\" or \"Share to group\" tab on the left panel. Enter the user name or group name to share to. Then click \"Submit\"." %}</li>
+</ol>
+<p>{% trans "After you share a folder or library to a user, the user can see it by clicking the \"Shared\" tab on the left panel in Seafile web app. If you share to a group, the group members can only see the shared folder or library by navigating into the group." %}</p>
+<p>{% trans "To share a library to the entire organization: In Seafile web app, click the \"Organization\" tab on the left panel. Click \"Add Library\" button. In the drop-down menu, you may choose sharing an existing library or creating a new library and share it." %}</p>
+<h4>{% trans "Internal links" %}</h4>
+<p>{% trans "Only logged in users who have share permissions to file or folder can access this link. It is used for internal file sharing. It's a convenient way for passing files among team members who has asscess to a common library. You may just copy the link and paste it into an email or IM software." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/sync_interval.html b/seahub/help/templates/help/sync_interval.html
index 6b336b869a..06e7e641e9 100644
--- a/seahub/help/templates/help/sync_interval.html
+++ b/seahub/help/templates/help/sync_interval.html
@@ -3,10 +3,10 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Setting Sync Interval" %}</h3>
+<h3 class="hd">{% trans "Setting sync interval" %}</h3>
 
 <p>{% trans "Usually Seafile client automatically detects changes on local folder and upload the changes to server. However, if the local folder is in a Windows network share drive, Seafile client cannot detect changes reliably. In this case, you can ask Seafile client to periodically checks for changes in the local folder. You can set the interval of this periodic sync. The interval is set in the unit of seconds." %}</p>
 
-<img src="{{MEDIA_URL}}img/help/set-sync-interval.png" width="400" alt="" />
+<img src="{{MEDIA_URL}}img/help/set-sync-interval.png" alt="" />
 
 {% endblock %}
diff --git a/seahub/help/templates/help/sync_existing.html b/seahub/help/templates/help/syncing_existing_folders.html
similarity index 56%
rename from seahub/help/templates/help/sync_existing.html
rename to seahub/help/templates/help/syncing_existing_folders.html
index 392e53df42..c97636f3f4 100644
--- a/seahub/help/templates/help/sync_existing.html
+++ b/seahub/help/templates/help/syncing_existing_folders.html
@@ -3,20 +3,20 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Syncing With an Existing Folder" %}</h3>
+<h3 class="hd">{% trans "Syncing with an existing folder" %}</h3>
 
 <p>{% blocktrans %}Sometimes you already have a library on the Seafile server (shared by others, or uploaded from another computer). You can sync this library with an existing folder on your computer. The local folder must have the same name as the library. The files in the local folder will be merged with the files in the library. No file in the local folder or the library will be overwritten or lost. The merge will produce some <a href="{{SITE_ROOT}}help/conflicts/">conflict files</a> if file contents are different in the local folder and the library. {% endblocktrans %}</p>
 
-<p>{% blocktrans %}To sync a library with an existing folder, right click on the library in Seafile client's main window and click "Sync this library".{% endblocktrans %}</p>
+<p>{% trans "To sync a library with an existing folder, right click on the library in Seafile client's main window and click \"Sync this library\"." %}</p>
 
-<img src="{{MEDIA_URL}}img/help/seafile-sync-library.png" width="350" alt="" />
+<img src="{{MEDIA_URL}}img/help/seafile-sync-library.png" alt="" />
 
-<p>{% trans 'In the pop-up dialog, click the "Sync with an existing folder" link.' %}</p>
+<p>{% trans "In the pop-up dialog, click the \"Sync with an existing folder\" link." %}</p>
 
-<img src="{{MEDIA_URL}}img/help/sync-with-an-existing-01.png" width="550" alt="" />
+<img src="{{MEDIA_URL}}img/help/sync-with-an-existing-01.png" alt="" />
 
 <p>{% trans "Then choose an existing folder to sync with this library." %}</p>
 
-<img src="{{MEDIA_URL}}img/help/sync-with-an-existing-02.png" width="550" alt="" />
+<img src="{{MEDIA_URL}}img/help/sync-with-an-existing-02.png" alt="" />
 
 {% endblock %}
diff --git a/seahub/help/templates/help/unsync_resync.html b/seahub/help/templates/help/unsync_resync.html
index 053216e3f7..910e47e2a4 100644
--- a/seahub/help/templates/help/unsync_resync.html
+++ b/seahub/help/templates/help/unsync_resync.html
@@ -3,11 +3,11 @@
 
 {% block help_con %}
 
-<h3 class="hd">{% trans "Unsync and Resync Library" %}</h3>
+<h3 class="hd">{% trans "Unsync and resync library" %}</h3>
 
-<p>{% blocktrans %}When you no longer want to sync a local folder with a library, you can unsync it. After you unsync a library, changes to the local folder and files will not be uploaded, and changes in the library will not be downloaded. If you want to sync the library with the local folder again, you can use <a href="{{SITE_ROOT}}help/sync_existing/">sync with existing folder</a> feature.{% endblocktrans %}</p>
+<p>{% blocktrans %}When you no longer want to sync a local folder with a library, you can unsync it. After you unsync a library, changes to the local folder and files will not be uploaded, and changes in the library will not be downloaded. If you want to sync the library with the local folder again, you can use the <a href="{{SITE_ROOT}}help/syncing_existing_folders/">sync with existing folder</a> feature.{% endblocktrans %}</p>
 
-<p>{% blocktrans %}Sometimes there are internal errors in the client which blocks syncing. In these cases, it's usually helpful to "resync" the library. Resync means unsync and then immediately sync the library with the same folder. You can find this action in the pop-up menu of the client's main window.{% endblocktrans %}</p>
+<p>{% trans "Sometimes there are internal errors in the client which blocks syncing. In these cases, it's usually helpful to \"resync\" the library. Resync means unsync and then immediately sync the library with the same folder. You can find this action in the pop-up menu of the client's main window." %}</p>
 
 <img src="{{MEDIA_URL}}img/help/resync-a-library.png" alt="" />
 
diff --git a/seahub/help/templates/help/using_drive_client.html b/seahub/help/templates/help/using_drive_client.html
new file mode 100644
index 0000000000..85c96554f6
--- /dev/null
+++ b/seahub/help/templates/help/using_drive_client.html
@@ -0,0 +1,82 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+
+<h3 class="hd">{% trans "Using Seafile drive client" %}</h3>
+<p>{% trans "After installing Drive client with the instructions on the <a href=\"https://www.seafile.com/en/download/\">download page</a>, you can double click the \"SeaDrive\" app icon on your desktop to start the Drive client." %}</p>
+<p>{% trans "You'll be asked to choose a drive letter for the virtual drive. By default, \"S:\" will be used." %}</p>
+<p>{% trans "Then you'll be asked to log into your Seafile server." %}</p>
+
+<img src="{{ MEDIA_URL }}img/help/drive-login.png" alt="Drive client login" />
+<p>{% trans "After successfully log into the server, the Drive client starts to fetch library and file list from the server. The file contents are not downloaded at this moment. So it'll not take very long. You can let it run in the background. You'll be noticed when the fetch is done." %}</p>
+<img src="{{ MEDIA_URL }}img/help/drive-fetch-finish.png" alt="Drive client fetch files">
+<p>{% trans "The virtual drive folder will be opened. You'll find it works just like an ordinary hard drive on your computer. The top level folders in the virtual drive are libraries on the Seafile server. File contents will be downloaded when you open a file. Recently opened file will be cached in your local disk. All cached files will be marked with a green tick." %}</p>
+<img src="{{ MEDIA_URL }}img/help/drive.png" alt="Drive window" />
+
+<h4>{% trans "Synced State" %}</h4>
+<p>{% trans "Files and folders in the virtual drive are in either cloud-only, synced, or in partially synced state." %}</p>
+<table>
+  <thead>
+    <tr>
+      <th width="20%">{% trans "States" %}</th>
+      <th width="15%">{% trans "Icon" %}</th>
+      <th width="65%">{% trans "Details" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>{% trans "Cloud-only content" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/cloud.png" alt="cloud-only icon" width="48" /></td>
+      <td>{% trans "Cloud-only content shows in the virtual drive, but doesn’t use the full amount of space that the file would. In your file explorer, you can see the file, but the content isn’t fully downloaded until you need it. Only information about the file, such as the file name, size and date the file was updated, is downloaded." %}</td>
+    </tr>
+    <tr>
+      <td>{% trans "Synced content" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/synced.png" alt="synced icon" width="48" /></td>
+      <td>{% trans "Synced content is downloaded and saved on the hard drive of your computer. You can directly edit these files from applications on your computer." %}</td>
+    </tr>
+    <tr>
+      <td>{% trans "Partially synced content" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/partial-synced.png" alt="partial synced icon" width="48" /></td>
+      <td>{% trans "Partially synced folders contain both synced and cloud-only files or folders." %}</td>
+    </tr>
+  </tbody>
+</table>
+
+<h4>{% trans "Special States" %}</h4>
+<p>{% trans "For files that are already synced to local computer, they may be in 3 other special states, besides the normal \"synced\" state." %}</p>
+<table>
+  <thead>
+    <tr>
+      <th width="20%">{% trans "States" %}</th>
+      <th width="15%">{% trans "Icon" %}</th>
+      <th width="65%">{% trans "Details" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>{% trans "Locked by other user" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/locked.png" alt="locked icon" width="48" /></td>
+      <td>{% trans "The file is locked by other user on the server. You can only open the file in read-only mode. You cannot modify, delete or rename the file." %}</td>
+    </tr>
+    <tr>
+      <td>{% trans "Locked by me" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/locked-by-me.png" alt="locked by me icon" width="48" /></td>
+      <td>{% trans "The file is locked by you. This prevents others from modifying the file." %}</td>
+    </tr>
+    <tr>
+      <td>{% trans "Read-only" %}</td>
+      <td><img src="{{ MEDIA_URL }}img/help/read-only.png" alt="read only icon" width="48" /></td>
+      <td>{% trans "The folder or library of this file is shared with read-only permission to you. You cannot modify, delete or rename the file." %}</td>
+    </tr>
+  </tbody>
+</table>
+<p>{% trans "The Drive client regularly cleans up unused cached files in the background. You can also limit the local cache space." %}</p>
+<img src="{{ MEDIA_URL }}img/help/drive-cache-setting.png" alt="Drive cache settings" />
+<p>{% trans "You can log into multiple accounts in the Drive client. However, only files on the current selected server will be shown in the virtual drive. You can switch among accounts." %}</p>
+<img src="{{ MEDIA_URL }}img/help/drive-accounts.png" alt="Drive client accounts" />
+
+<h4>{% trans "FAQ" %}</h4>
+<p><b>{% trans "1. Why can't I create new files or delete folders in root folder?" %}</b></p>
+<p>{% trans "The root folder of the virtual drive contains only library folders. Seafile can only sync files inside libraries. Files in the root folder cannot be uploaded to Seafile server. So it doesn't make sense to support creating files in root folder. Since the top level folders in the virtual drive represents libraries, we don't want users to delete their libraries by mistake. So the Drive client doesn't support deleting top level folders." %}</p>
+{% endblock %}
diff --git a/seahub/help/templates/help/viewing_files_within_web_app.html b/seahub/help/templates/help/viewing_files_within_web_app.html
new file mode 100644
index 0000000000..7cdec84aa0
--- /dev/null
+++ b/seahub/help/templates/help/viewing_files_within_web_app.html
@@ -0,0 +1,18 @@
+{% extends "help/base.html" %}
+{% load i18n %}
+
+{% block help_con %}
+<h3 class="hd">{% trans "Viewing files within Web App" %}</h3>
+<p>{% trans "Some document types can be directly opened and viewed within the Seafile Web App. When you click on these files in the web app, a new tab will be opened in the web browser to show the contents. The currently supported document types are:" %}</p>
+<ul>
+  <li>{% trans "Microsoft Office Doc: .doc, .docx (Pro Edition Server only)" %}</li>
+  <li>{% trans "Microsoft Office PowerPoint: .ppt, .pptx (Pro Edition Server only)" %}</li>
+  <li>{% trans "Microsoft Office Excel: .xls, .xlsx (Pro Edition Server only)" %}</li>
+  <li>{% trans "LibreOffice files" %}</li>
+  <li>{% trans "PDF files" %}</li>
+  <li>{% trans "Image files (shown in galery view): .jpg, .png" %}</li>
+  <li>{% trans "Markdown files: .md" %}</li>
+  <li>{% trans "Various source code files" %}</li>
+  <li>{% trans "Text files: .txt, .log" %}</li>
+</ul>
+{% endblock %}
diff --git a/seahub/help/urls.py b/seahub/help/urls.py
index 2f260e6724..af5fd5b7a3 100644
--- a/seahub/help/urls.py
+++ b/seahub/help/urls.py
@@ -3,14 +3,43 @@ from django.conf.urls import url, include
 from django.views.generic import TemplateView
 
 urlpatterns = [
-    url(r'^$', TemplateView.as_view(template_name="help/install.html") ),
-    url(r'^install/$', TemplateView.as_view(template_name="help/install.html") ),
-    url(r'^sync_existing/$', TemplateView.as_view(template_name="help/sync_existing.html") ),
+    url(r'^$', TemplateView.as_view(template_name="help/introduction.html")),
+    url(r'^introduction/$', TemplateView.as_view(template_name="help/introduction.html")),
+
+    url(r'^libraries_managing/$', TemplateView.as_view(template_name="help/libraries_managing.html")),
+    url(r'^restoring_deleted_files/$', TemplateView.as_view(template_name="help/restoring_deleted_files.html")),
+    url(r'^finding_older_version_files/$', TemplateView.as_view(template_name="help/finding_older_version_files.html")),
+    url(r'^library_history_and_snapshots/$', TemplateView.as_view(template_name="help/library_history_and_snapshots.html")),
+    url(r'^setting_library_history/$', TemplateView.as_view(template_name="help/setting_library_history.html")),
+    url(r'^deleting_a_library/$', TemplateView.as_view(template_name="help/deleting_a_library.html")),
+    url(r'^viewing_files_within_web_app/$', TemplateView.as_view(template_name="help/viewing_files_within_web_app.html")),
+    url(r'^full_text_file_search/$', TemplateView.as_view(template_name="help/full_text_file_search.html")),
+
+    url(r'^sharing_files_and_folders/$', TemplateView.as_view(template_name="help/sharing_files_and_folders.html")),
+    url(r'^groups_managing/$', TemplateView.as_view(template_name="help/groups_managing.html")),
+    url(r'^file_locking/$', TemplateView.as_view(template_name="help/file_locking.html")),
+    url(r'^folder_permission/$', TemplateView.as_view(template_name="help/folder_permission.html")),
+    url(r'^departments/$', TemplateView.as_view(template_name="help/departments.html")),
+
+    url(r'^manage_library_as_wiki/$', TemplateView.as_view(template_name="help/manage_library_as_wiki.html") ),
+
+    url(r'^install_sync/$', TemplateView.as_view(template_name="help/install_sync.html") ),
+    url(r'^syncing_existing_folders/$', TemplateView.as_view(template_name="help/syncing_existing_folders.html") ),
     url(r'^selective_sync/$', TemplateView.as_view(template_name="help/selective_sync.html") ),
+    url(r'^read-only_syncing/$', TemplateView.as_view(template_name="help/read-only_syncing.html") ),
     url(r'^unsync_resync/$', TemplateView.as_view(template_name="help/unsync_resync.html") ),
     url(r'^sync_interval/$', TemplateView.as_view(template_name="help/sync_interval.html") ),
     url(r'^desktop_proxy/$', TemplateView.as_view(template_name="help/desktop_proxy.html") ),
     url(r'^conflicts/$', TemplateView.as_view(template_name="help/conflicts.html") ),
     url(r'^ignore/$', TemplateView.as_view(template_name="help/ignore.html") ),
+    url(r'^install_linux_client/$', TemplateView.as_view(template_name="help/install_linux_client.html") ),
+    url(r'^linux_cli/$', TemplateView.as_view(template_name="help/linux_cli.html") ),
+
+    url(r'^using_drive_client/$', TemplateView.as_view(template_name="help/using_drive_client.html") ),
+    url(r'^drive_client_2.0_for_windows_10/$', TemplateView.as_view(template_name="help/drive_client_2.0_for_windows_10.html") ),
+    url(r'^drive_client_for_linux/$', TemplateView.as_view(template_name="help/drive_client_for_linux.html") ),
+
     url(r'^encrypted_libraries/$', TemplateView.as_view(template_name="help/encrypted_libraries.html") ),
+
+    url(r'^faq/$', TemplateView.as_view(template_name="help/faq.html") ),
 ]