Merge in from trunk r67662 to r64801

[wxWidgets.git] / docs / doxygen / overviews / html.h

diff --git a/docs/doxygen/overviews/html.h b/docs/doxygen/overviews/html.h
index bb6569a44ef487106b7fafd35b53a9dcfd6d8ae5..00320585d78eb238f0d2b96dfd2faf7d44d49dda 100644 (file)
--- a/docs/doxygen/overviews/html.h
+++ b/docs/doxygen/overviews/html.h
@@ -3,7 +3,7 @@
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -543,6 +543,7 @@ P               ALIGN=[alignment]
 PRE
 SAMP
 SMALL
+SPAN
 STRIKE
 STRONG
 SUB
@@ -576,5 +577,12 @@ U
 UL
 @endcode
 
+@subsection overview_html_suppstyles_list List of supported styles
+
+wxHTML doesn't really have CSS support but it does support a few simple styles:
+you can use @c "text-align", @c "width", @c "vertical-align" and @c
+"background" with all elements and for @c SPAN elements the @c "color", @c
+"font-size" and @c "font-weight" are additionally recognized.
+
 */