Browse Source

Merge branch 'master' of github.com:mitsuhiko/flask

pull/124/head
Armin Ronacher 15 years ago
parent
commit
223d44dca8
  1. 1
      docs/_themes
  2. 4
      docs/htmlfaq.rst

1
docs/_themes

@ -1 +0,0 @@
Subproject commit c775271cf77795a5358a13b2c2d08c0f61062557

4
docs/htmlfaq.rst

@ -63,7 +63,7 @@ the XHTML syntax over the syntax defined by the specification.
In 2007, the specification was adopted as the basis of a new HTML In 2007, the specification was adopted as the basis of a new HTML
specification under the umbrella of the W3C, known as HTML5. Currently, specification under the umbrella of the W3C, known as HTML5. Currently,
it appears that XHTML is losing traction, as the XHTML 2 working group has it appears that XHTML is losing traction, as the XHTML 2 working group has
een disbanded and HTML5 is being implemented by all major browser vendors. been disbanded and HTML5 is being implemented by all major browser vendors.
HTML versus XHTML HTML versus XHTML
----------------- -----------------
@ -204,4 +204,4 @@ reasons given above:
- It has the support of most browser vendors behind it. - It has the support of most browser vendors behind it.
- It is much easier to write, and more compact. - It is much easier to write, and more compact.
For most applications, it is undoubtably better to use HTML5 than XHTML. For most applications, it is undoubtedly better to use HTML5 than XHTML.

Loading…
Cancel
Save