diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 4cbd4b069b573b6dfa5cf59112b08c255808719b..61902656dd829a43daca1da5a9a86e9aedb1cead 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -111,9 +111,11 @@ private:
     void retranslate()
     {
         m_searchLabel->setText(QHelpSearchQueryWidget::tr("Search for:"));
+        m_searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
+#if QT_CONFIG(tooltip)
         m_prevQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Previous search"));
         m_nextQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Next search"));
-        m_searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
+#endif
     }
 
     void saveQuery(const QString &query)
diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
index 61e29669c0bbbd220c58014f8301a5e4e58f545a..2c42493e8d078cfbcfb2cf594a42352ecbf1cc73 100644
--- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
@@ -241,18 +241,18 @@
     \section1 \\dontdocument
 
     The \\dontdocument command is only used in a dontdocument.qdoc file
-    for a particular module.  This file specifies publically declared
-    classes or structs that are not meant to be documented. Then QDoc will
-    not print warnings about missing \class comments for these classes
+    for a particular module. This file specifies publically declared
+    classes or structs that are not meant to be documented. QDoc will
+    not print warnings about missing \\class comments for these classes
     and structs.
 
     Below you will find the \\dontdocument command in the
     dontdocument.qdoc for widgets:
 
-    \code
-    /*!
+    \badcode
+    / *!
        \dontdocument (QTypeInfo QMetaTypeId)
-    */
+    * /
     \endcode
 
     \target obsolete-command