diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake
index edecb7eece5..cac8b49fecd 100644
--- a/cmake/compile_definitions/common.cmake
+++ b/cmake/compile_definitions/common.cmake
@@ -135,9 +135,9 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
         ${MINIUPNP_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
         enet
+        libdisplaydevice::display_device
         opus
         ${FFMPEG_LIBRARIES}
         ${Boost_LIBRARIES}
         ${OPENSSL_LIBRARIES}
-        ${PLATFORM_LIBRARIES}
-        libdisplaydevice::display_device)
+        ${PLATFORM_LIBRARIES})
diff --git a/src/display_device.h b/src/display_device.h
index ac8bd185a19..f17b7aa5e78 100644
--- a/src/display_device.h
+++ b/src/display_device.h
@@ -27,10 +27,9 @@ namespace display_device {
      * @brief Get the singleton instance.
      * @returns Singleton instance for the class.
      *
-     * EXAMPLES:
-     * ```cpp
+     * @examples
      * session_t& session { session_t::get() };
-     * ```
+     * @end_examples
      */
     [[nodiscard]] static session_t &
     get();
@@ -39,10 +38,9 @@ namespace display_device {
      * @brief Initialize the singleton and perform the initial state recovery (if needed).
      * @returns A deinit_t instance that performs cleanup when destroyed.
      *
-     * EXAMPLES:
-     * ```cpp
+     * @examples
      * const auto session_guard { session_t::init() };
-     * ```
+     * @end_examples
      */
     [[nodiscard]] static std::unique_ptr<platf::deinit_t>
     init();
@@ -52,12 +50,11 @@ namespace display_device {
      * @param output_name The user-configurable output name.
      * @returns Mapped display name or empty string if the output name could not be mapped.
      *
-     * EXAMPLES:
-     * ```cpp
+     * @examples
      * session_t& session { session_t::get() };
      * const auto mapped_name_config { session.get_display_name(config::video.output_name) };
      * const auto mapped_name_custom { session.get_display_name("{some-device-id}") };
-     * ```
+     * @end_examples
      */
     [[nodiscard]] std::string
     map_output_name(const std::string &output_name) const;
diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json
index d9054e6ceb8..e3e72746ae9 100644
--- a/src_assets/common/assets/web/public/assets/locale/en.json
+++ b/src_assets/common/assets/web/public/assets/locale/en.json
@@ -253,7 +253,7 @@
     "origin_web_ui_allowed_pc": "Only localhost may access Web UI",
     "origin_web_ui_allowed_wan": "Anyone may access Web UI",
     "output_name_desc_unix": "During Sunshine startup, you should see the list of detected displays. Note: You need to use the id value inside the parenthesis.",
-    "output_name_desc_windows": "Manually specify a display device id to use for capture. If unset, the primary display is captured. Note: If you specified a GPU above, this display must be connected to that GPU. During Sunshine startup, you should see a list of available display devices and their ids in the log output, e.g.:",
+    "output_name_desc_windows": "Manually specify a display device id to use for capture. If unset, the primary display is captured. Note: If you specified a GPU above, this display must be connected to that GPU. During Sunshine startup, you should see the list of detected displays. Below is an example; the actual output can be found in the Troubleshooting tab.",
     "output_name_unix": "Display number",
     "output_name_windows": "Display Device Id",
     "ping_timeout": "Ping Timeout",