man: move macro decls. out of <funcsynopsis>

<funcsynopsis> doesn't allow block content.

diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 7a81fae3b5fe909a13a4af7f33dea3485c06ffd8..5a2ca4636a60a73b8841c0ca0bd9878690d9fb9f 100644 (file)
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -41,35 +41,37 @@
   <refsynopsisdiv>
     <funcsynopsis>
       <funcsynopsisinfo>#include &lt;systemd/sd-id128.h&gt;</funcsynopsisinfo>
+    </funcsynopsis>
 
-      <para>
-        <constant>SD_ID128_ALLF</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_NULL</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_CONST_STR(<replaceable>id</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_FORMAT_STR</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_FORMAT_VAL(<replaceable>id</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_MAKE(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_MAKE_STR(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_MAKE_UUID_STR(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_ID128_UUID_FORMAT_STR</constant>
-      </para>
+    <para>
+      <constant>SD_ID128_ALLF</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_NULL</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_CONST_STR(<replaceable>id</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_FORMAT_STR</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_FORMAT_VAL(<replaceable>id</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_MAKE(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_MAKE_STR(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_MAKE_UUID_STR(<replaceable>v0</replaceable>, <replaceable>v1</replaceable>, <replaceable>v2</replaceable>, <replaceable>v3</replaceable>, <replaceable>v4</replaceable>, <replaceable>v5</replaceable>, <replaceable>v6</replaceable>, <replaceable>v7</replaceable>, <replaceable>v8</replaceable>, <replaceable>v9</replaceable>, <replaceable>vA</replaceable>, <replaceable>vB</replaceable>, <replaceable>vC</replaceable>, <replaceable>vD</replaceable>, <replaceable>vE</replaceable>, <replaceable>vF</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_ID128_UUID_FORMAT_STR</constant>
+    </para>
 
+    <funcsynopsis>
       <funcprototype>
         <funcdef>int <function>sd_id128_equal</function></funcdef>
         <paramdef>sd_id128_t <parameter>a</parameter></paramdef>

diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 41fdab26345223c470d96f7083b50de1059b4245..976c7956de586e57a649db846948590c004fad63 100644 (file)
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -47,14 +47,16 @@
         const char *message;
         …
 } sd_bus_error;</funcsynopsisinfo>
+    </funcsynopsis>
 
-      <para>
-        <constant>SD_BUS_ERROR_MAKE_CONST(<replaceable>name</replaceable>, <replaceable>message</replaceable>)</constant>
-      </para>
-      <para>
-        <constant>SD_BUS_ERROR_NULL</constant>
-      </para>
+    <para>
+      <constant>SD_BUS_ERROR_MAKE_CONST(<replaceable>name</replaceable>, <replaceable>message</replaceable>)</constant>
+    </para>
+    <para>
+      <constant>SD_BUS_ERROR_NULL</constant>
+    </para>
 
+    <funcsynopsis>
       <funcprototype>
         <funcdef>void <function>sd_bus_error_free</function></funcdef>
         <paramdef>sd_bus_error *<parameter>e</parameter></paramdef>
@@ -145,12 +147,12 @@
         <paramdef>const sd_bus_error *<parameter>e</parameter></paramdef>
         <paramdef>...</paramdef>
       </funcprototype>
-
-      <para>
-        &#35;define sd_bus_error_has_names(e, ...) sd_bus_error_has_names_sentinel(e, ..., NULL)
-      </para>
     </funcsynopsis>
 
+    <para>
+      &#35;define sd_bus_error_has_names(e, ...) sd_bus_error_has_names_sentinel(e, ..., NULL)
+    </para>
+
   </refsynopsisdiv>
 
   <refsect1>