diff --git a/docs/agent-format.md b/docs/agent-format.md
index b467686774..c707b476e7 100644
--- a/docs/agent-format.md
+++ b/docs/agent-format.md
@@ -2,6 +2,9 @@
 
 The agent configuration file for each agent is a JSON file. The filename (without the `.json` extension) becomes the agent's name. It contains configuration needed to instantiate and run the agent.
 
+> [!TIP]
+> We recommend using the `/agent generate` slash command within your active Q session to intelligently generate your agent configuration with the help of Q.
+
 Every agent configuration file can include the following sections:
 
 - [`name`](#name-field) — The name of the agent (optional, derived from filename if not specified).
diff --git a/docs/knowledge-management.md b/docs/knowledge-management.md
index cb29cfd997..82e3a291af 100644
--- a/docs/knowledge-management.md
+++ b/docs/knowledge-management.md
@@ -2,7 +2,8 @@
 
 The /knowledge command provides persistent knowledge base functionality for Amazon Q CLI, allowing you to store, search, and manage contextual information that persists across chat sessions.
 
-> Note: This is a beta feature that must be enabled before use.
+> [!NOTE]
+> This is a beta feature that must be enabled before use.
 
 ## Getting Started