diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /libX11/specs/i18n | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'libX11/specs/i18n')
| -rw-r--r-- | libX11/specs/i18n/localedb/localedb.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml index caacd82d5..ed9000769 100644 --- a/libX11/specs/i18n/localedb/localedb.xml +++ b/libX11/specs/i18n/localedb/localedb.xml @@ -422,7 +422,7 @@ for this fontset. The format of value is; <para> For detail definition of CHARSET_REGISTRY-CHARSET_ENCODING, refer -"X Logical Font Descriptions" document. +to the <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> document. </para> <literallayout> example: @@ -778,7 +778,7 @@ END XLC_XLOCALE [1] <emphasis remap='I'>ISO/IEC 9899:1990 C Language Standard</emphasis> </para> <para> -[2] <emphasis remap='I'>X Logical Font Descriptions</emphasis> +[2] <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> </para> </sect1> |