Merge in from trunk r64802 - r68625

[wxWidgets.git] / interface / wx / fontmap.h

diff --git a/interface/wx/fontmap.h b/interface/wx/fontmap.h
index f3bb9ebcd402e88959c158e6aa13d9e6408aa27d..7c1a27517b7b49139e82bd0a89e42be407a39e7e 100644 (file)
--- a/interface/wx/fontmap.h
+++ b/interface/wx/fontmap.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFontMapper
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -54,9 +54,9 @@
     @endcode
 
     @library{wxcore}
-    @category{misc}
+    @category{cfg}
 
-    @see wxEncodingConverter, @ref overview_nonenglish "Writing non-English applications"
+    @see wxEncodingConverter, @ref overview_nonenglish
 */
 class wxFontMapper
 {