X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgcharset.c;h=b1cc465e75bc39d44b88dd551efaf54448032712;hb=35eaf037bdfca985abf5d349e7355f1d2ed9c77b;hp=1611187350bf9c92732a7c368ece5998859042b9;hpb=078dbda148a81af1b3a76fbda72f089b963087f1;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/gcharset.c b/glib/gcharset.c
index 1611187..b1cc465 100644
--- a/glib/gcharset.c
+++ b/glib/gcharset.c
@@ -154,11 +154,10 @@ charset_cache_free (gpointer data)
  * g_get_charset:
  * @charset: return location for character set name
  *
- * Obtains the character set for the <link linkend="setlocale">current
- * locale</link>; you might use this character set as an argument to
- * g_convert(), to convert from the current locale's encoding to some
- * other encoding. (Frequently g_locale_to_utf8() and g_locale_from_utf8()
- * are nice shortcuts, though.)
+ * Obtains the character set for the [current locale][setlocale]; you
+ * might use this character set as an argument to g_convert(), to convert
+ * from the current locale's encoding to some other encoding. (Frequently
+ * g_locale_to_utf8() and g_locale_from_utf8() are nice shortcuts, though.)
  *
  * On Windows the character set returned by this function is the
  * so-called system default ANSI code-page. That is the character set
@@ -172,7 +171,7 @@ charset_cache_free (gpointer data)
  * The string returned in @charset is not allocated, and should not be
  * freed.
  *
- * Return value: %TRUE if the returned charset is UTF-8
+ * Returns: %TRUE if the returned charset is UTF-8
  */
 gboolean
 g_get_charset (const char **charset)
@@ -213,7 +212,7 @@ g_get_charset (const char **charset)
  *
  * Gets the character set for the current locale.
  *
- * Return value: a newly allocated string containing the name
+ * Returns: a newly allocated string containing the name
  *     of the character set. This string must be freed with g_free().
  */
 gchar *
@@ -438,7 +437,7 @@ append_locale_variants (GPtrArray *array,
  * For example, if @locale is "fr_BE", then the returned list
  * is "fr_BE", "fr".
  *
- * If you need the list of variants for the <emphasis>current locale</emphasis>,
+ * If you need the list of variants for the current locale,
  * use g_get_language_names().
  *
  * Returns: (transfer full) (array zero-terminated=1) (element-type utf8): a newly
@@ -539,11 +538,11 @@ language_names_cache_free (gpointer data)
  * For example, if LANGUAGE=de:en_US, then the returned list is
  * "de", "en_US", "en", "C".
  *
- * This function consults the environment variables <envar>LANGUAGE</envar>,
- * <envar>LC_ALL</envar>, <envar>LC_MESSAGES</envar> and <envar>LANG</envar>
- * to find the list of locales specified by the user.
+ * This function consults the environment variables `LANGUAGE`, `LC_ALL`,
+ * `LC_MESSAGES` and `LANG` to find the list of locales specified by the
+ * user.
  *
- * Return value: (array zero-terminated=1) (transfer none): a %NULL-terminated array of strings owned by GLib
+ * Returns: (array zero-terminated=1) (transfer none): a %NULL-terminated array of strings owned by GLib
  *    that must not be modified or freed.
  *
  * Since: 2.6