diff --git a/docs/en_US/images/preferences_browser_display.png b/docs/en_US/images/preferences_browser_display.png
index 39887fbd83039fb654c98a3117431dde455e9959..9dd41765fd3a4c1fdb4303308969139b91008359 100644
GIT binary patch
diff --git a/docs/en_US/images/server_general.png b/docs/en_US/images/server_general.png
old mode 100755
new mode 100644
index f8f62d759e929d800c163bd207c5996830ced088..57129ef7bf6e92b0186cbc9f9e659b94711b5362
GIT binary patch
diff --git a/docs/en_US/preferences.rst b/docs/en_US/preferences.rst
index e9f1c8f31..6ec2fe953 100644
--- a/docs/en_US/preferences.rst
+++ b/docs/en_US/preferences.rst
@@ -49,6 +49,9 @@ Use the fields on the *Display* panel to specify general display preferences:
   the client will display the animated dialogues/notifications otherwise it
   will be unanimated.
 
+* When the *Hide shared server?* switch is set to *True*, the client will hide
+  all the shared servers from the browser tree.
+
 * Use the *Lock layout* field to lock the UI layout at different levels. This
   can also be changed from File menu on the :ref:`menu bar <menu_bar>`
 
diff --git a/docs/en_US/server_dialog.rst b/docs/en_US/server_dialog.rst
index bd57e68b0..a43e3b0d0 100644
--- a/docs/en_US/server_dialog.rst
+++ b/docs/en_US/server_dialog.rst
@@ -16,15 +16,31 @@ Use the fields in the *General* tab to identify the server:
 
 * Use the *Name* field to add a descriptive name for the server; the name
   specified will be displayed in the *Browser* tree control.
+
 * Use the drop-down list box in the *Server group* field to select the parent
   node for the server; the server will be displayed in the *Browser* tree
   control within the specified group.
+
 * Use the color-picker in the *Background* field to specify the background
   color for the server.
+
 * Use the color-picker in the *Foreground* field to specify the foreground
   color for the server.
+
 * If the *Connect now?* checkbox is checked, the client will attempt a
   connection to the server upon completion of the dialog; this is the default
+
+* If the *Shared with all?* switch is moved to *Yes* then that server can be
+  shared with all the other users. This option is available only to admin users. For more information on users see :ref:`User Management Dialog <user_management>`. The users can access the shared servers with some restritctions. The Users accessing the shared servers cannot do the following operations on the shared servers:
+
+    * Create a server
+    * Delete the server
+    * Rename the server
+    * Rename the group server
+    * Change of host, port, and maintenance database
+
+  Please note that once the server is shared, it's icon is changed in the browser tree.
+
 * Provide a comment about the server in the *Comments* field.
 
 Click the *Connection* tab to continue.
@@ -183,4 +199,4 @@ Use the fields in the *Advanced* tab to configure a connection:
 
 .. toctree::
 
-    clear_saved_passwords
\ No newline at end of file
+    clear_saved_passwords
