X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsd_journal_get_catalog.xml;h=f84815022f7c8a2a95396d66b401de0be584e68b;hp=fa9bbc9b2d7e2015317636fa65f204b0af14b1c7;hb=efdc73dae3e5d92b817e2418a0af6c43dfba877c;hpb=f2cf0403c99e8fa44c14b0ef70af90801f8681f0

diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index fa9bbc9b2..f84815022 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -54,14 +54,14 @@
 
                         <funcprototype>
                                 <funcdef>int <function>sd_journal_get_catalog</function></funcdef>
-                                <paramdef>sd_journal* <parameter>j</parameter></paramdef>
-                                <paramdef>const char** <parameter>ret</parameter></paramdef>
+                                <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+                                <paramdef>char **<parameter>ret</parameter></paramdef>
                         </funcprototype>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_journal_get_catalog_for_message_id</function></funcdef>
                                 <paramdef>sd_id128_t <parameter>id</parameter></paramdef>
-                                <paramdef>const char** <parameter>ret</parameter></paramdef>
+                                <paramdef>char **<parameter>ret</parameter></paramdef>
                         </funcprototype>
 
 
@@ -80,8 +80,8 @@
                 field names in the catalog entry text enclosed in "@"
                 will be replaced by the respective field values of the
                 current entry. If a field name referenced in the
-                message catalog entry does not exist it the current
-                journal entry the "@" will be removed but the field
+                message catalog entry does not exist, in the current
+                journal entry, the "@" will be removed, but the field
                 name otherwise left untouched.</para>
 
                 <para><function>sd_journal_get_catalog_for_message_id()</function>
@@ -89,7 +89,7 @@
                 <function>sd_journal_get_catalog()</function> but the
                 entry is looked up by the specified message ID (no
                 open journal context is necessary for this), and no
-                field substitution is done.</para>
+                field substitution is performed.</para>
 
                 <para>For more information about the journal message
                 catalog please refer to the <ulink
@@ -103,9 +103,14 @@
                 <para><function>sd_journal_get_catalog()</function>
                 and
                 <function>sd_journal_get_catalog_for_message_id()</function>
-                returns 0 on success or a negative errno-style error
-                code. If no matching message catalog entry is found
+                return 0 on success or a negative errno-style error
+                code. If no matching message catalog entry is found,
                 -ENOENT is returned.</para>
+
+                <para>On successful return, <parameter>ret</parameter>
+                points to a new string, which must be freed with
+                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+                </para>
         </refsect1>
 
         <refsect1>
@@ -113,10 +118,9 @@
 
                 <para>The <function>sd_journal_get_catalog()</function> and
                 <function>sd_journal_get_catalog_for_message_id()</function>
-                interfaces are available as shared library, which can
+                interfaces are available as a shared library, which can
                 be compiled and linked to with the
-                <literal>libsystemd-journal</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
@@ -130,6 +134,7 @@
                         <citerefentry><refentrytitle>sd_journal_open</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>malloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 </para>
         </refsect1>