diff --git a/components/DoveadmCliComponent.vue b/components/DoveadmCliComponent.vue
new file mode 100644
index 000000000..eec92ead7
--- /dev/null
+++ b/components/DoveadmCliComponent.vue
@@ -0,0 +1,36 @@
+<script setup>
+/* Properties for this component:
+ * 'data' (object): The command argument data.
+ */
+const props = defineProps(['data'])
+const d = props.data
+</script>
+
+<template>
+ <div>
+  <ul>
+   <li>Usage: <code>doveadm {{ d.usage }}</code></li>
+  </ul>
+
+  <table v-if="d.args">
+   <thead>
+    <tr>
+     <th>Argument(s)</th>
+     <th>Type</th>
+     <th>Description</th>
+     <th>Example</th>
+    </tr>
+   </thead>
+   <tbody>
+    <template v-for="elem in d.args">
+     <tr>
+      <td><code>{{ elem.flag }}</code></td>
+      <td>{{ elem.type }}</td>
+      <td v-html="elem.text" />
+      <td><code v-if="elem.example !== undefined">{{ JSON.stringify(elem.example) }}</code></td>
+     </tr>
+    </template>
+   </tbody>
+  </table>
+ </div>
+</template>
diff --git a/components/DoveadmComponent.vue b/components/DoveadmComponent.vue
index 00b4278e6..50e55403a 100644
--- a/components/DoveadmComponent.vue
+++ b/components/DoveadmComponent.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { data } from '../lib/data/doveadm.data.js'
+import { ref } from 'vue'
 
 /* Properties for this component:
  * 'plugin' (string): Filter by the plugin property.
@@ -16,6 +17,16 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
 	 ((v.plugin && v.plugin == props.tag) ||
 	  (v.tags.includes(props.tag))))
 ).sort())
+
+const cliComponent = ref({})
+function cliClick(k) {
+	cliComponent.value[k] = 'DoveadmCliComponent'
+}
+
+const httpComponent = ref({})
+function httpClick(k) {
+	httpComponent.value[k] = 'DoveadmHttpApiComponent'
+}
 </script>
 
 <style scoped>
@@ -38,7 +49,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
     <a class="header-anchor" :href="'#' + k"></a>
    </h3>
 
-   <table v-if="v.man_link || v.fields || v.added || v.changed || v.deprecated || v.removed">
+   <table v-if="v.man_link || v.response || v.added || v.changed || v.deprecated || v.removed">
     <tbody>
      <tr v-if="v.man_link">
       <th style="text-align: right;">Man Page</th>
@@ -69,20 +80,22 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
       </td>
     </tr>
 
-     <tr v-if="v.fields">
-      <th style="text-align: right;">Return Values</th>
+     <tr v-if="v.response">
+      <th style="text-align: right;">Response Values</th>
       <td>
        <table>
         <thead>
          <tr>
           <th>Key</th>
-          <th>Value</th>
+          <th>Type</th>
+          <th>Description</th>
          </tr>
         </thead>
         <tbody>
-         <tr v-for="elem in v.fields">
+         <tr v-for="elem in v.response">
           <td><code>{{ elem.key }}</code></td>
-          <td v-html="elem.value" />
+          <td v-html="elem.type" />
+          <td v-html="elem.text" />
          </tr>
         </tbody>
        </table>
@@ -93,58 +106,15 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
 
    <div v-if="v.text" v-html="v.text" />
 
-   <div class="info custom-block">
-    <p class="custom-block-title">CLI</p>
-    <div>
-     <ul>
-      <li>Usage: <code>doveadm {{ v.usage }}</code></li>
-     </ul>
-
-     <table v-if="v.args">
-      <thead>
-       <tr>
-        <th>Argument(s)</th>
-        <th>Type</th>
-        <th>Description</th>
-       </tr>
-      </thead>
-      <tbody>
-       <template v-for="elem in v.args">
-        <tr>
-         <td><code>{{ elem.flag }}</code></td>
-         <td>{{ elem.type }}</td>
-         <td v-html="elem.text" />
-        </tr>
-       </template>
-      </tbody>
-     </table>
-    </div>
-   </div>
+   <details @click.capture.once="cliClick(k)" class="details custom-block">
+    <summary>CLI</summary>
+    <component v-if="cliComponent[k]" :is="cliComponent[k]" :data="v" />
+   </details>
 
-   <details v-if="v.args" class="details custom-block">
+   <details v-if="v.args" @click.capture.once="httpClick(k)" class="details custom-block">
     <summary v-html="data.http_api_link" />
-    <div>
-     <table>
-      <thead>
-       <tr>
-        <th>Parameter</th>
-        <th>Type</th>
-        <th>Description</th>
-       </tr>
-      </thead>
-      <tbody>
-       <template v-for="elem in v.args">
-        <tr>
-         <td><code>{{ elem.param }}</code></td>
-         <td>{{ elem.type }}</td>
-         <td v-html="elem.text" />
-        </tr>
-       </template>
-      </tbody>
-     </table>
-    </div>
+    <component v-if="httpComponent[k]" :is="httpComponent[k]" :data="v" />
    </details>
-
   </article>
  </section>
 </template>
diff --git a/components/DoveadmHttpApiComponent.vue b/components/DoveadmHttpApiComponent.vue
new file mode 100644
index 000000000..4feacb1c2
--- /dev/null
+++ b/components/DoveadmHttpApiComponent.vue
@@ -0,0 +1,118 @@
+<script setup>
+/* Properties for this component:
+ * 'data' (object): The command argument data.
+ *
+ * Note: Clipboard behavior is handled by re-using the Vitepress code.
+ */
+const props = defineProps(['data'])
+const d = props.data
+
+const args = {}
+for (let elem of d.args.filter(e => e.example !== undefined && !e.cli_only)) {
+	args[elem.param] = elem.example
+}
+
+const jsonReq =
+[
+	[
+		d.http_cmd,
+		args,
+		"tag1"
+	]
+]
+
+const resp = {}
+if (d.response) {
+	for (let elem of d.response) {
+		resp[elem.key] = elem.example
+	}
+}
+
+const jsonResp =
+[
+	[
+		"doveadmResponse",
+		[ resp ],
+		"tag1"
+	]
+]
+</script>
+
+<template>
+ <div>
+  <p class="custom-block-title">
+   Command Name: <code>{{ d.http_cmd }}</code>
+  </p>
+
+  <table>
+   <thead>
+    <tr>
+     <th>Parameter</th>
+     <th>Type</th>
+     <th>Description</th>
+     <th>Example</th>
+    </tr>
+   </thead>
+   <tbody>
+    <template v-for="elem in d.args">
+     <tr v-if="!elem.cli_only">
+      <td><code>{{ elem.param }}</code></td>
+      <td>{{ elem.type }}</td>
+      <td v-html="elem.text" />
+      <td><code v-if="elem.example">{{ JSON.stringify(elem.example) }}</code></td>
+     </tr>
+    </template>
+   </tbody>
+  </table>
+
+  <p class="custom-block-title">Example Request Payload</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>{{ JSON.stringify(jsonReq, null, 4) }}</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Curl Request (using Dovecot API Key)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>curl -X POST -H "Authorization: X-Dovecot-API &lt;base64 encoded dovecot_api_key&gt;" -H "Content-Type: application/json" -d '{{ JSON.stringify(jsonReq) }}' http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Curl Request (using Doveadm Password)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>curl -X POST -u doveadm:secretpassword -H "Content-Type: application/json" -d '{{ JSON.stringify(jsonReq) }}' http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Wget Request (using Dovecot API Key)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>wget --header="Authorization: X-Dovecot-API &lt;base64 encoded dovecot_api_key&gt;" --header="Content-Type: application/json" --post-data='{{ JSON.stringify(jsonReq) }}' --output-document - http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Wget Request (using Doveadm Password)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>wget --header="Content-Type: application/json" --user=doveadm --password=password --auth-no-challenge --post-data='{{ JSON.stringify(jsonReq) }}' --output-document - http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <template v-if="d.response?.length">
+   <p class="custom-block-title">Example Server Response</p>
+
+   <div class="language- vp-adaptive-theme">
+    <button class="copy" title="Copy" />
+    <span class="lang"></span>
+     <pre><code>{{ JSON.stringify(jsonResp, null, 4) }}</code></pre>
+   </div>
+  </template>
+ </div>
+</template>
diff --git a/data/doveadm.js b/data/doveadm.js
index 91e27598d..6cef96428 100644
--- a/data/doveadm.js
+++ b/data/doveadm.js
@@ -2,7 +2,8 @@
 import { doveadm_arg_types,
 		 doveadm_args_query,
 		 doveadm_args_usermask,
-		 doveadm_flag_types } from '../lib/doveadm.js'
+		 doveadm_flag_types,
+		 doveadm_response_types } from '../lib/doveadm.js'
 
 export const doveadm = {
 
@@ -20,6 +21,11 @@ export const doveadm = {
 				// If true, only show for cli, not HTTP.
 				// cli_only: true,
 
+				// If set, will use as command example argument.
+				// i.e., for HTTP API requests, this argument will be added
+				// to the example argument string.
+				example: false,
+
 				// If true, this is an optional positional argument.
 				// optional: true,
 
@@ -46,8 +52,21 @@ export const doveadm = {
 		// deprecated: {},
 		// removed: {},
 
-		// Fields/Values returned. Values are rendered w/Markdown.
-		// fields: {},
+		// Response data.
+		// KEY = identifier
+		// response: {
+		//     key: {
+		//         // An example value to be used in documentation.
+		//         example: 0,
+		//
+		//         // The description of the response data type.
+		//         // Rendered w/Markdown.
+		//         text: `Description`,
+		//
+		//         // The response data type
+		//         type: doveadm_response_types.INTEGER,
+		//     }
+		// },
 
 		// What doveadm flags does this command support (bit field)
 		// Arguments are automatically added for each flag set
@@ -232,8 +251,11 @@ Applicable to [[link,mdbox]] and [[link,sdbox]] mailbox formats only.
 				text: `UID of user to apply operation to.`,
 			},
 		},
-		fields: {
-			'entries': 0
+		response: {
+			entries: {
+				type: doveadm_response_types.INTEGER,
+				text: `The number of cache entries flushed.`
+			},
 		},
 		man: 'doveadm-auth',
 		text: `Flush authentication cache.`,
@@ -1316,6 +1338,7 @@ Applicable to [[link,mdbox]] and [[link,sdbox]] mailbox formats only.
 		},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `
 Generate new keypair for user or folder.
 
@@ -1349,9 +1372,10 @@ to secure it.
 				text: `Mailbox mask.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `List all keys for user or mailbox.`
 	},
 
@@ -1368,9 +1392,10 @@ to secure it.
 				text: `Mailbox mask.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `Exports user or folder private keys.`
 	},
 
@@ -1402,9 +1427,10 @@ to secure it.
 				text: `Old password.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `Sets, changes or clears password for user's private key.`
 	},
 
@@ -1558,7 +1584,7 @@ to secure it.
 				type: doveadm_arg_types.ARRAY
 			},
 		},
-		// TODO: Missing man page
+		man: 'doveadm-mailbox',
 	},
 
 	'mailbox path': {
@@ -2017,7 +2043,7 @@ returned.`,
 		man: 'doveadm-sieve'
 	},
 
-	/* Deprecated. TODO: No man page, but that might be ok? */
+	/* Deprecated. */
 	'sis find': {
 		args: {
 			'root-dir': {
diff --git a/lib/data/doveadm.data.js b/lib/data/doveadm.data.js
index c60fe6ab3..d783c8b14 100644
--- a/lib/data/doveadm.data.js
+++ b/lib/data/doveadm.data.js
@@ -1,6 +1,7 @@
-import { doveadm_arg_types, doveadm_flag_types, getDoveadmCmdLine } from '../doveadm.js'
+import { doveadm_arg_types, doveadm_flag_types, doveadm_response_types, getDoveadmCmdLine } from '../doveadm.js'
 import { getVitepressMd } from '../markdown.js'
 import { addWatchPaths, loadData, normalizeArrayData } from '../utility.js'
+import camelCase from 'camelcase'
 import slugify from '@sindresorhus/slugify'
 
 const doveadm_userargs = {
@@ -38,17 +39,26 @@ const doveadm_userfileargs = {
 function typeToString(type) {
 	switch (type) {
 	case doveadm_arg_types.ARRAY:
-		return 'array';
+		return 'array'
 	case doveadm_arg_types.BOOL:
-		return 'boolean';
+		return 'boolean'
 	case doveadm_arg_types.INTEGER:
-		return 'integer';
+		return 'integer'
 	case doveadm_arg_types.STRING:
-		return 'string';
+		return 'string'
 	case doveadm_arg_types.SEARCH_QUERY:
-		return 'search_query';
+		return 'search_query'
 	case doveadm_arg_types.ISTREAM:
-		return 'istream';
+		return 'istream'
+	}
+}
+
+function responseTypeLookup(type) {
+	switch (type) {
+	case doveadm_response_types.INTEGER:
+		return [ 'integer', 1 ]
+	case doveadm_response_types.STRING:
+		return [ 'string', 'example' ]
 	}
 }
 
@@ -96,19 +106,22 @@ async function normalizeDoveadm(doveadm) {
 			}
 		}
 
-		/* Return values. */
-		if (v.fields) {
-			const fields = []
-			for (const [k2, v2] of Object.entries(v.fields)) {
-				fields.push({
+		/* Response values. */
+		if (v.response) {
+			const response = []
+			for (const [k2, v2] of Object.entries(v.response)) {
+				var rtl = responseTypeLookup(v2.type)
+				response.push({
+					example: v2.example ?? rtl[1],
 					key: k2,
-					value: v2 ? md.renderInline(String(v2)) : null
+					type: rtl[0],
+					text: v2.text ? md.renderInline(String(v2.text)) : null
 				})
 			}
-			v.fields = fields
+			v.response = response
 		}
-		if (!v.fields || !v.fields.length) {
-			delete v['fields']
+		if (!v.response || !v.response.length) {
+			delete v['response']
 		}
 
 		/* Text Description. */
@@ -124,6 +137,9 @@ async function normalizeDoveadm(doveadm) {
 			for (const [k2, v2] of Object.entries(v.args)) {
 				if (!v2.hidden) {
 					args.push({
+						/* Undefined examples will resolve to undefined. */
+						cli_only: v2.cli_only,
+						example: v2.example,
 						flag: v2.cli ? '-' + v2.cli : (v2.positional ? k2 : '--' + k2),
 						param: argToHttpParam(k2),
 						type: typeToString(v2.type),
@@ -136,6 +152,9 @@ async function normalizeDoveadm(doveadm) {
 		if (!v.args || !v.args.length) {
 			delete v['args']
 		}
+
+		/* HTTP API info. */
+		v.http_cmd = camelCase(k)
 	}
 
 	return {
diff --git a/lib/doveadm.js b/lib/doveadm.js
index 548a9f057..b6367db44 100644
--- a/lib/doveadm.js
+++ b/lib/doveadm.js
@@ -16,6 +16,12 @@ export const doveadm_flag_types = {
 	USERMASK:		4,
 }
 
+/* List of Doveadm response value types. */
+export const doveadm_response_types = {
+	INTEGER:	1,
+	STRING:		2,
+}
+
 export const doveadm_args_query = {
 	//example: ['mailbox', 'INBOX/myfoldertoo', 'savedbefore', 'since', '30d'],
 	positional: true,
diff --git a/package-lock.json b/package-lock.json
index a0dd608e0..d6d86118f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,6 +6,7 @@
     "": {
       "devDependencies": {
         "@sindresorhus/slugify": "^2.2.1",
+        "camelcase": "^8.0.0",
         "commander": "^12.1.0",
         "dayjs": "^1.11.13",
         "fast-glob": "^3.3.2",
@@ -1923,6 +1924,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/camelcase": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
+      "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
diff --git a/package.json b/package.json
index 34d6c9d7c..3852003af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "devDependencies": {
     "@sindresorhus/slugify": "^2.2.1",
+    "camelcase": "^8.0.0",
     "commander": "^12.1.0",
     "dayjs": "^1.11.13",
     "fast-glob": "^3.3.2",