diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-11-28 20:29:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-11-28 20:29:42 +0000 |
| commit | a2830c774d4a178f6c95a7b924ac47f403371568 (patch) | |
| tree | 2e4a07c2b40c243eada694d72e61ebf7a4f1215c /docs | |
| parent | 181c615ca467d8c1725d45daf8e4a65335b8875c (diff) | |
Improve docs
svn path=/trunk/; revision=7704
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/ChangeLog | 5 | ||||
| -rw-r--r-- | docs/reference/glib/tmpl/keyfile.sgml | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 0adf39bbb..2e8e1397b 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,10 @@ @008-11-28 Matthias Clasen <mclasen@redhat.com> + * glib/tmpl/keyfile.sgml: Explain locale identifiers in + more detail + +@008-11-28 Matthias Clasen <mclasen@redhat.com> + Bug 562549 – g_byte_array_free should tell how free data * glib/tmpl/arrays_byte.sgml: Improve docs, proposed by diff --git a/docs/reference/glib/tmpl/keyfile.sgml b/docs/reference/glib/tmpl/keyfile.sgml index bcc03719f..18ce443a9 100644 --- a/docs/reference/glib/tmpl/keyfile.sgml +++ b/docs/reference/glib/tmpl/keyfile.sgml @@ -34,8 +34,9 @@ Name=Key File Example\tthis value shows\nescaping # localized strings are stored in multiple key-value pairs Welcome=Hello Welcome[de]=Hallo -Welcome[fr]=Bonjour +Welcome[fr_FR]=Bonjour Welcome[it]=Ciao +Welcome[be@latin]=Hello [Another Group] @@ -58,7 +59,9 @@ the end of the file. Each key-value pair must be contained in a group. <para> Key-value pairs generally have the form <literal>key=value</literal>, with the exception of localized strings, which have the form -<literal>key[locale]=value</literal>. Space before and after the +<literal>key[locale]=value</literal>, with a locale identifier of the form +<literal>lang_COUNTRY@MODIFIER</literal> where <literal>COUNTRY</literal> and +<literal>MODIFIER</literal> are optional. Space before and after the '=' character are ignored. Newline, tab, carriage return and backslash characters in value are escaped as \n, \t, \r, and \\, respectively. To preserve leading spaces in values, these can also be escaped as \s. |