diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index d9f0d34801..9bd05b8416 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -3,7 +3,7 @@
 * [Introduction](README.md)
 * [Legal Notice](notice.md)
 * [Preface](preface.md)
-* [Project Info](project-info/project-info.md)
+* [Project Info](project-info.md)
 * [Messaging Concepts](messaging-concepts.md)
 * [Architecture](architecture.md)
 * [Using the Server](using-server.md)
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index 3982ea4803..0f9ce429e1 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -270,7 +270,7 @@ the maximum desired message consumption rate specified in units of
 messages per second. Setting this to `-1` disables rate limited flow
 control. The default value is `-1`.
 
-Please see the ? for a working example of limiting producer rate.
+Please see [the examples chapter](examples.md) for a working example of limiting producer rate.
 
 #### Using Core API
 
diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md
index bab189b52d..94f895ae0a 100644
--- a/docs/user-manual/en/ha.md
+++ b/docs/user-manual/en/ha.md
@@ -35,7 +35,7 @@ Apache ActiveMQ supports two different strategies for backing up a server
     <ha-policy>
       <replication/>
     </ha-policy>
-               
+
 
 or
 
diff --git a/docs/user-manual/en/intercepting-operations.md b/docs/user-manual/en/intercepting-operations.md
index 3a4d83ab38..4258de299f 100644
--- a/docs/user-manual/en/intercepting-operations.md
+++ b/docs/user-manual/en/intercepting-operations.md
@@ -77,5 +77,5 @@ and invoked.
 
 ## Example
 
-See the examples for an example which shows how to use interceptors to add
+See [the examples chapter](examples.md) for an example which shows how to use interceptors to add
 properties to a message on the server.
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index 186410a857..163c434aa7 100644
--- a/docs/user-manual/en/management.md
+++ b/docs/user-manual/en/management.md
@@ -245,10 +245,9 @@ transactions). These resources are:
 
     They can be started or stopped using the `start()` or. `stop()`
     method on the `AcceptorControl` class (with the ObjectName
-    `org.apache.activemq:module=Core,type=Acceptor,name="<the acceptor
-                            name>"` or the resource name
-    `core.acceptor.<the
-                            address name>`). The acceptors parameters
+    `org.apache.activemq:module=Core,type=Acceptor,name="<the acceptor name>"`
+    or the resource name
+    `core.acceptor.<the address name>`). The acceptors parameters
     can be retrieved using the `AcceptorControl` attributes (see [Understanding Acceptors](configuring-transports.md))
 
 -   Diverts
@@ -264,18 +263,16 @@ transactions). These resources are:
 
     They can be started or stopped using the `start()` (resp. `stop()`)
     method on the `BridgeControl` class (with the ObjectName
-    `org.apache.activemq:module=Core,type=Bridge,name="<the bridge
-                            name>"` or the resource name
-    `core.bridge.<the bridge
-                            name>`). Bridges parameters can be retrieved
+    `org.apache.activemq:module=Core,type=Bridge,name="<the bridge name>"`
+    or the resource name
+    `core.bridge.<the bridge name>`). Bridges parameters can be retrieved
     using the `BridgeControl` attributes (see [Core bridges](core-bridges.md))
 
 -   Broadcast groups
 
     They can be started or stopped using the `start()` or `stop()`
     method on the `BroadcastGroupControl` class (with the ObjectName
-    `org.apache.activemq:module=Core,type=BroadcastGroup,name="<the broadcast group
-                            name>"` or the resource name
+    `org.apache.activemq:module=Core,type=BroadcastGroup,name="<the broadcast group name>"` or the resource name
     `core.broadcastgroup.<the broadcast group name>`). Broadcast groups
     parameters can be retrieved using the `BroadcastGroupControl`
     attributes (see [Clusters](clusters.md))
@@ -284,10 +281,8 @@ transactions). These resources are:
 
     They can be started or stopped using the `start()` or `stop()`
     method on the `DiscoveryGroupControl` class (with the ObjectName
-    `org.apache.activemq:module=Core,type=DiscoveryGroup,name="<the discovery group
-                            name>"` or the resource name
-    `core.discovery.<the
-                            discovery group name>`). Discovery groups
+    `org.apache.activemq:module=Core,type=DiscoveryGroup,name="<the discovery group name>"` or the resource name
+    `core.discovery.<the discovery group name>`). Discovery groups
     parameters can be retrieved using the `DiscoveryGroupControl`
     attributes (see [Clusters](clusters.md))
 
@@ -295,8 +290,7 @@ transactions). These resources are:
 
     They can be started or stopped using the `start()` or `stop()`
     method on the `ClusterConnectionControl` class (with the ObjectName
-    `org.apache.activemq:module=Core,type=ClusterConnection,name="<the cluster
-                            connection name>"` or the resource name
+    `org.apache.activemq:module=Core,type=ClusterConnection,name="<the cluster connection name>"` or the resource name
     `core.clusterconnection.<the cluster connection name>`). Cluster
     connections parameters can be retrieved using the
     `ClusterConnectionControl` attributes (see [Clusters](clusters.md))