diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c0a547f..5bad89f4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ Admin:
 DOAP:
 - Support extended `-protocol` erlang attribute
 - Add extended RFCs and XEP details to some protocol attributes
-- `tools/generate-doap.sh`: New script to generate DOAP file, add `make doap` ([#3915](https://github.com/processone/ejabberd/issues/#915))
+- `tools/generate-doap.sh`: New script to generate DOAP file, add `make doap` ([#3915](https://github.com/processone/ejabberd/issues/3915))
 - `ejabberd.doap`: New DOAP file describing ejabberd supported protocols
 
 MQTT:
diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
index 322ed5605..fb04d9c86 100644
--- a/src/ejabberd_options_doc.erl
+++ b/src/ejabberd_options_doc.erl
@@ -971,7 +971,7 @@ doc() ->
         desc =>
             ?T("Specify which address families to try, in what order. "
                "The default is '[ipv6, ipv4]' which means it first tries "
-               "connecting with IPv6, if that fails it tries using IPv4."
+               "connecting with IPv6, if that fails it tries using IPv4. "
                "This option is obsolete and irrelevant when using ejabberd 23.01 "
                "and Erlang/OTP 22, or newer versions of them.")}},
      {outgoing_s2s_ipv4_address,
diff --git a/src/mod_mqtt_bridge.erl b/src/mod_mqtt_bridge.erl
index 04684a0e9..4cf8a5891 100644
--- a/src/mod_mqtt_bridge.erl
+++ b/src/mod_mqtt_bridge.erl
@@ -197,7 +197,7 @@ mod_doc() ->
 	#{value => "{ServerUrl: {publish: [TopicPairs], subscribe: [TopicPairs], authentication: [AuthInfo]}}",
 	  desc =>
 	  ?T("Declaration of data to share, must contain 'publish' or 'subscribe' or both, and 'authentication' "
-	     "section with username/password field or certfile pointing to client certifcate. "
+	     "section with username/password field or certfile pointing to client certificate. "
 	     "Accepted urls can use schema mqtt, mqtts (mqtt with tls), mqtt5, mqtt5s (both to trigger v5 protocol), "
 	      "ws, wss, ws5, wss5. Certifcate authentication can be only used with mqtts, mqtt5s, wss, wss5.")}},
        {replication_user,