[e] (0) Clarify <aside>; change 'demographics' to 'locales'.

git-svn-id: http://svn.whatwg.org/webapps@4116 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 12, 2009 · 944f271 · 944f271
1 parent 2a4fd02
commit 944f271
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/complete.html b/complete.html
@@ -13313,13 +13313,16 @@ <h4 id=the-nav-element><span class=secno>4.4.3 </span>The <dfn><code>nav</code><
    <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
   </dl><p>The <code><a href=#the-nav-element>nav</a></code> element <a href=#represents>represents</a> a section of
   a page that links to other pages or to parts within the page: a
-  section with navigation links. Not all groups of links on a page
-  need to be in a <code><a href=#the-nav-element>nav</a></code> element &mdash; only sections that
-  consist of major navigation blocks are appropriate for the
-  <code><a href=#the-nav-element>nav</a></code> element. In particular, it is common for footers to
-  have a list of links to various key parts of a site, but the
-  <code><a href=#the-footer-element>footer</a></code> element is more appropriate in such cases, and
-  no <code><a href=#the-nav-element>nav</a></code> element is necessary for those links.</p>
+  section with navigation links.</p>
+
+  <p>Not all groups of links on a page need to be in a
+  <code><a href=#the-nav-element>nav</a></code> element &mdash; only sections that consist of major
+  navigation blocks are appropriate for the <code><a href=#the-nav-element>nav</a></code>
+  element. In particular, it is common for footers to have a short
+  list of links to various pages of a site, such as the terms of
+  service, the home page, and a copyright page. The
+  <code><a href=#the-footer-element>footer</a></code> element alone is sufficient for such cases,
+  without a <code><a href=#the-nav-element>nav</a></code> element.</p>
 
   <p class=note>User agents (such as screen readers) that are
   targeted at users who can benefit from navigation information being
@@ -69403,7 +69406,7 @@ <h5 id=determining-the-character-encoding><span class=secno>10.2.2.1 </span>Dete
    user agents intended for dedicated use in new networks), the more
    comprehensive <code title="">UTF-8</code> encoding is
    suggested. Due to its use in legacy content, <code title="">windows-1252</code> is suggested as a default in
-   predominantly Western demographics instead.</li>
+   predominantly Western locales instead.</li>
 
   </ol><p>The <a href="#document's-character-encoding">document's character encoding</a> must immediately
   be set to the value returned from this algorithm, at the same time

diff --git a/index b/index
@@ -13149,13 +13149,16 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
   </dl><p>The <code><a href=#the-nav-element>nav</a></code> element <a href=#represents>represents</a> a section of
   a page that links to other pages or to parts within the page: a
-  section with navigation links. Not all groups of links on a page
-  need to be in a <code><a href=#the-nav-element>nav</a></code> element &mdash; only sections that
-  consist of major navigation blocks are appropriate for the
-  <code><a href=#the-nav-element>nav</a></code> element. In particular, it is common for footers to
-  have a list of links to various key parts of a site, but the
-  <code><a href=#the-footer-element>footer</a></code> element is more appropriate in such cases, and
-  no <code><a href=#the-nav-element>nav</a></code> element is necessary for those links.</p>
+  section with navigation links.</p>
+
+  <p>Not all groups of links on a page need to be in a
+  <code><a href=#the-nav-element>nav</a></code> element &mdash; only sections that consist of major
+  navigation blocks are appropriate for the <code><a href=#the-nav-element>nav</a></code>
+  element. In particular, it is common for footers to have a short
+  list of links to various pages of a site, such as the terms of
+  service, the home page, and a copyright page. The
+  <code><a href=#the-footer-element>footer</a></code> element alone is sufficient for such cases,
+  without a <code><a href=#the-nav-element>nav</a></code> element.</p>
 
   <p class=note>User agents (such as screen readers) that are
   targeted at users who can benefit from navigation information being
@@ -60453,7 +60456,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
    user agents intended for dedicated use in new networks), the more
    comprehensive <code title="">UTF-8</code> encoding is
    suggested. Due to its use in legacy content, <code title="">windows-1252</code> is suggested as a default in
-   predominantly Western demographics instead.</li>
+   predominantly Western locales instead.</li>
 
   </ol><p>The <a href="#document's-character-encoding">document's character encoding</a> must immediately
   be set to the value returned from this algorithm, at the same time

diff --git a/source b/source
@@ -13992,13 +13992,16 @@ not-slash     = %x0000-002E / %x0030-10FFFF
 
   <p>The <code>nav</code> element <span>represents</span> a section of
   a page that links to other pages or to parts within the page: a
-  section with navigation links. Not all groups of links on a page
-  need to be in a <code>nav</code> element &mdash; only sections that
-  consist of major navigation blocks are appropriate for the
-  <code>nav</code> element. In particular, it is common for footers to
-  have a list of links to various key parts of a site, but the
-  <code>footer</code> element is more appropriate in such cases, and
-  no <code>nav</code> element is necessary for those links.</p>
+  section with navigation links.</p>
+
+  <p>Not all groups of links on a page need to be in a
+  <code>nav</code> element &mdash; only sections that consist of major
+  navigation blocks are appropriate for the <code>nav</code>
+  element. In particular, it is common for footers to have a short
+  list of links to various pages of a site, such as the terms of
+  service, the home page, and a copyright page. The
+  <code>footer</code> element alone is sufficient for such cases,
+  without a <code>nav</code> element.</p>
 
   <p class="note">User agents (such as screen readers) that are
   targeted at users who can benefit from navigation information being
@@ -78132,7 +78135,7 @@ interface <dfn>MessagePort</dfn> {
    comprehensive <code title="">UTF-8</code> encoding is
    suggested. Due to its use in legacy content, <code
    title="">windows-1252</code> is suggested as a default in
-   predominantly Western demographics instead.</p></li>
+   predominantly Western locales instead.</p></li>
 
   </ol>