1. Change the string from 'Reset server password" to "Clear Saved Password" and move this sub menu from File to Object menu.

2. Move the "Change Password..." menu from 'File' to 'Object' menu.
RM #3074

docs/en_US/clear_saved_passwords.rst

@@ -0,0 +1,13 @@
+.. _clear_saved_passwords:
+
+******************************
+`Clear Saved Passwords`:index:
+******************************
+
+Use *Clear Saved Password* functionality to clear the saved password for the database server.
+
+.. image:: images/clear_saved_password.png
+
+*Clear Saved Password* shows in the context menu for the selected server as well as under the *Object* menu on the top menu bar.
+
+**Note:** It will be enabled/visible when the password for the selected database server is already saved.

docs/en_US/pgadmin_menu_bar.rst

@@ -16,14 +16,10 @@ Use the *File* menu to access the following options:
 +-------------------------+---------------------------------------------------------------------------------------------------------+
 | Option                  | Action                                                                                                  |
 +=========================+=========================================================================================================+
-| *Change Password...*    | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password.    |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
 | *Preferences*           | Click to open the :ref:`Preferences <preferences>` dialog to to customize your pgAdmin settings.        |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
 | *Reset Layout*          | If you have modified the workspace, click to restore the default layout.                                |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Reset server password* | If you have saved the database server password, click to reset the saved password.                      |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
 
 **The Object Menu**
 
@@ -35,6 +31,11 @@ The *Object* menu is context-sensitive. Use the *Object* menu to access the foll
 +------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | Option                 | Action                                                                                                                   |
 +========================+==========================================================================================================================+
+| *Change Password...*   | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password.                     |
++------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Clear Saved Password* | If you have saved the database server password, click to reset the saved password.                                       |
+|                        | Enable only when password is already saved and database server is disconnected.                                          |
++------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Connect Server...*    | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
 +------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Create*               | Click *Create* to access a context menu that provides context-sensitive selections.                                      |

docs/en_US/reset_passwords.rst

@@ -1,13 +0,0 @@
-.. _reset_passwords:
-
-************************
-`Reset Passwords`:index:
-************************
-
-Use *Reset server password* functionality to reset the saved password for the database server.
-
-.. image:: images/reset_server_password.png
-
-*Reset server password* shows in the context menu for the selected server as well as under the *File* menu on the top menu bar.
-
-**Note:** It will be enabled/visible when the password for the selected database server is already saved.

docs/en_US/server_dialog.rst

@@ -95,4 +95,4 @@ Use the fields in the *Advanced* tab to configure a connection:
 
 .. toctree::
 
-    reset_passwords
+    clear_saved_passwords