diff --git a/docs/connectionmanager/editingconnection.rst b/docs/connectionmanager/editingconnection.rst
new file mode 100644
index 0000000..742b944
--- /dev/null
+++ b/docs/connectionmanager/editingconnection.rst
@@ -0,0 +1,35 @@
+===================
+Editing connections
+===================
+
+--------------
+New connection
+--------------
+
+With the :guilabel:`Add connection` button you can create a new connection
+configuration.
+
+Entering a password is optional at this stage. You may need it ofcourse if you
+want to save the password or test the connection. When you :guilabel:`test` the
+connection and the the connection works a list of databases is populated to
+select from for the database field.
+
+-----------------
+Edit a connection
+-----------------
+
+To edit a configuration you need to click the :guilabel:`Configure connection`.
+
+Note the password field will always be empty even if a password was saved. As
+long as you do not edit this field the saved password will stay unchanged. As
+soon as you change this field or when you clear the :guilabel:`Save password`
+checkbox the password will be updated or cleared when you accept your changes
+by clicking :guilabel:`OK`.
+
+-----------
+Edit a copy
+-----------
+
+When you select :guilabel:`Configure copy` you will basically start editing
+a new connection with the details of the connection that was selected. Note
+the password will not be copied.
diff --git a/docs/connectionmanager/index.rst b/docs/connectionmanager/index.rst
index 909e32f..1ceb7aa 100644
--- a/docs/connectionmanager/index.rst
+++ b/docs/connectionmanager/index.rst
@@ -4,4 +4,5 @@ Connection Manager
 
 .. toctree::
 
+    editingconnection
     passwordmanager
diff --git a/docs/connectionmanager/passwordmanager.rst b/docs/connectionmanager/passwordmanager.rst
index f2e11f8..7f04e56 100644
--- a/docs/connectionmanager/passwordmanager.rst
+++ b/docs/connectionmanager/passwordmanager.rst
@@ -19,7 +19,7 @@ Resetting the password manager
 ------------------------------
 
 If you loose your password and want to start with a new empy password manager
-use the menu option File > Reset password manager.
+use the menu option :menuselection:`File --> Reset password manager`.
 
 --------
 Security
diff --git a/releasenotes/notes/f5-bindings-5acb4d8b18626cef.yaml b/releasenotes/notes/f5-bindings-5acb4d8b18626cef.yaml
index dda4c52..14b2410 100644
--- a/releasenotes/notes/f5-bindings-5acb4d8b18626cef.yaml
+++ b/releasenotes/notes/f5-bindings-5acb4d8b18626cef.yaml
@@ -1,4 +1,4 @@
 ---
 fixes:
   - |
-    Make F5 work again for refreshing the catalog and CRUD views.
\ No newline at end of file
+    Make :kbd:`F5` work again for refreshing the catalog and CRUD views.