- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 12 Aug 2010 19:55:40 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src In directory hutz:/tmp/cvs-serv18720/src Modified Files: attributes.html datatypes.html references.html terms.html Log Message: 色々 Index: references.html =================================================================== RCS file: /sources/public/html5/markup/src/references.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- references.html 8 Aug 2010 09:49:20 -0000 1.25 +++ references.html 12 Aug 2010 19:55:38 -0000 1.26 @@ -15,6 +15,10 @@ tags, see in particular <a href="http://tools.ietf.org/html/bcp47#appendix-A" >http://tools.ietf.org/html/bcp47#appendix-A</a>)</span></dd> + <dt><dfn id="refsBIDI">BIDI</dfn></dt> + <dd><cite><a href="http://unicode.org/reports/tr9/" + >Unicode Standard Annex #9: Unicode Bidirectional Algorithm</a></cite>. + M. Davis.</dd> <dt><dfn id="refsCharacterSets">Character Sets</dfn></dt> <dd><cite><a href="http://www.iana.org/assignments/character-sets" Index: terms.html =================================================================== RCS file: /sources/public/html5/markup/src/terms.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- terms.html 27 Jul 2010 06:09:47 -0000 1.24 +++ terms.html 12 Aug 2010 19:55:38 -0000 1.25 @@ -8,8 +8,7 @@ id="context" title="context" >browsing context</dfn></dt> - <dd>A <a href="#context">browsing context</a> - is an environment in which UAs present documents to users. + <dd>An environment in which UAs present documents to users. A tab or window in a Web browser typically contains a browsing context, as does an <a href="#iframe" class="element">iframe</a>, @@ -21,12 +20,8 @@ id="case-insensitive" title="case-insensitive" >case-insensitive match</dfn></dt> - <dd>For the purposes of this reference, - performing a - <a href="#case-insensitive">case-insensitive match</a> - between two strings means comparing the strings exactly, - codepoint for codepoint, except that the characters in the - range + <dd>An exact comparison of two strings, codepoint for + codepoint, except that the characters in the range <code title="U+0041 LATIN CAPITAL LETTER A–U+005A LATIN CAPITAL LETTER Z">A-Z</code> and the corresponding characters in the range <code title="U+0061 LATIN SMALL LETTER A–U+007A LATIN SMALL LETTER Z">a-z</code> @@ -35,9 +30,9 @@ id="fallback" title="fallback" >fallback content</dfn></dt> - <dd>Some embedded content elements can have fallback content: - content that is to be used when the embedded content cannot - be used (for example, when it is of an unsupported format).</dd> + <dd>Content associated with embedded content, to be used when + the embedded content cannot itself be used (for example, + when the embedded content is of an unsupported format).</dd> <dt><dfn id="flow-content" title="flow-content" @@ -74,20 +69,18 @@ id="newlines" title="newlines" >newline</dfn></dt> - <dd>A <a href="#newlines">newline</a> may be represented as any - of the following: + <dd>Any of the following: <ul> <li>a U+000D CARRIAGE RETURN (CR) character</li> <li>a U+000A LINE FEED (LF) character</li> - <li>a U+000D CARRIAGE RETURN (CR) followed by a U+000A - LINE FEED (LF) character</li> + <li>a U+000D CARRIAGE RETURN (CR) followed by a U+000A LINE FEED (LF) character</li> </ul> </dd> <dt><dfn id="phrasing-content" title="phrasing-content" >phrasing content</dfn></dt> - <dd><a href="#phrasing-content">Phrasing content</a> consists of + <dd>Consists of <a href="#common.elem.phrasing">phrasing elements</a> intermixed with <a href="#normal-character-data">normal character data</a>.</dd> @@ -102,8 +95,7 @@ id="space" title="space" >space</dfn></dt> - <dd>A <a href="#space">space character</a> is any of the - following: + <dd>Any of the following: <ul> <li>U+0020 SPACE</li> <li>U+0009 CHARACTER TABULATION (tab)</li> @@ -116,9 +108,7 @@ id="top-level-context" title="top-level-context" >top-level browsing context</dfn></dt> - <dd>A - <a href="#top-level-context">top-level browsing context</a> - is as defined in + <dd>As defined in <a href="#refsHTML5">[HTML5]</a>. </dd> <dt><dfn Index: datatypes.html =================================================================== RCS file: /sources/public/html5/markup/src/datatypes.html,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- datatypes.html 8 Aug 2010 09:49:19 -0000 1.52 +++ datatypes.html 12 Aug 2010 19:55:38 -0000 1.53 @@ -3,7 +3,7 @@ <section id="data-string-def" class="no-toc no-number"> <h2 class="common-subhead"><dfn id="data-string">string</dfn></h2> <div class="datatype-desc">For the purposes of this document, a - <a href="#data-string">string</a> + <var>string</var> is defined as <a href="#normal-character-data">normal character data</a>. <p>The <a href="#syntax-attributes">Attributes</a> section of @@ -128,9 +128,9 @@ <div class="note"> <p>Previous versions of HTML placed greater restrictions on the content of - <a href="#common.data.id">ID</a> + <var>ID</var> values (for example, they did not permit - <a href="#common.data.id">ID</a> + <var>ID</var> values to begin with a number).</p> </div> </dd> @@ -139,14 +139,13 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <dfn id="id-reference">ID reference</dfn> - to an element of type + ID reference to an element of type <var>type</var> - is a string - that exactly matches the value of the + is a string that exactly matches the value of the <code class="attribute">id</code> - attribute of an element in the document with type - <var>type</var>.</div> + attribute of an element of type + <var>type</var> + anywhere in the document.</div> </dd> </dl> <dl><dt>idrefs</dt> @@ -155,7 +154,7 @@ <div class="datatype-desc">An <a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>, each of which is an - <a href="#id-reference">ID reference</a>.</div> + <a href="#common.data.idref">ID reference</a>.</div> </dd> </dl> <dl><dt>name</dt> @@ -178,18 +177,16 @@ <dd></dd> <dd> <div class="datatype-desc">A - valid - <dfn id="hash-name-reference">hash-name reference</dfn> - to an element of - type + valid hash-name reference to an element of type <var>type</var> is a string that starts with a "<code title="U+0023 NUMBER SIGN">#</code>" character, followed by a string which exactly matches the value of the <code class="attribute">name</code> - attribute of an element in the document with type - <var>type</var>.</div> + attribute of an element of type + <var>type</var> + anywhere in the document.</div> </dd> </dl> <dl><dt>integer</dt> @@ -295,10 +292,7 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <dfn - id="date-time" - title="date-time" - >date-time</dfn>, + <var class="defined-elsewhere">date-time</var> as defined in <a href="#refsRFC3339">[RFC 3339]</a>, with these additional qualifications: @@ -308,10 +302,10 @@ <a href="#must-requirement">must</a> always be uppercase</li> - <li>a + <li>the <var class="defined-elsewhere">date-fullyear</var> - is defined as - four or more digits representing a number greater than 0</li> + production is instead defined as four or more digits + representing a number greater than 0</li> </ul> </div> </dd> @@ -338,19 +332,18 @@ <dl><dt>data-url-no-spaces</dt> <dd></dd> <dd> - <div class="datatype-desc">An - <dfn - id="data.iri-ref" - title="data.iri-ref" - >IRI reference</dfn>, + <div class="datatype-desc">A + valid + <var class="defined-elsewhere">IRI reference</var> as defined in <a href="#refsRFC3987">[RFC 3987]</a>.</div> <div class="note"> <p>The empty string is a valid - <a href="#data.iri-ref">IRI reference</a>, + <var class="defined-elsewhere">IRI reference</var>, so the empty string is allowed anywhere this reference lists - <a href="#data-url-no-spaces">URL</a> - as being allowed.</p> + the + <var>URL</var> + datatype as being allowed.</p> </div> </dd> <dd> @@ -363,19 +356,17 @@ <dl><dt>uri</dt> <dd></dd> <dd> - <div class="datatype-desc">An - <a - href="#data.iri-ref" - title="data.iri-ref" - >IRI reference</a>, + <div class="datatype-desc">A + <a href="#data-url-no-spaces">URL</a>, optionally with leading and/or trailing <a href="#space">space characters</a>.</div> <div class="note"> <p>The empty string is a valid - <a href="#data.iri-ref">IRI reference</a>, + <a href="#data-url-no-spaces">URL</a>, so the empty string is allowed anywhere this reference lists - <a href="#common.data.uri">URL potentially surrounded by spaces</a> - as being allowed.</p> + the + <var>URL potentially surrounded by spaces</var> + datatype as being allowed.</p> </div> </dd> </dl> @@ -384,14 +375,16 @@ <dd> <div class="datatype-desc">A <a href="#space">space</a>-separated set of zero or more - <a href="#data.iri-ref">IRI reference</a> instances.</div> + <a href="#data-url-no-spaces">URL</a> + instances.</div> </dd> </dl> <dl><dt>uri.absolute</dt> <dd></dd> <dd> - <div class="datatype-desc">An - <dfn id="data.iri">IRI</dfn>, + <div class="datatype-desc">A + valid + <var class="defined-elsewhere">IRI</var> as defined in <a href="#refsRFC3987">[RFC 3987]</a>.</div> </dd> @@ -429,34 +422,33 @@ <dd></dd> <dd> <div class="datatype-desc">A string that identifies a valid - <var class="defined-elsewhere">MIME media type</var>, + <var class="defined-elsewhere">MIME media type</var> as defined in <a href="#refsRFC2046">[RFC 2046]</a>.</div> </dd> </dl> <dl><dt>charset</dt> <dd></dd> <dd> - <div class="datatype-desc">For documents in the - <a href="#html-syntax">HTML syntax</a>: - a - <a href="#case-insensitive">case-insensitive match</a> - for any - <dfn - id="character-set-name" - title="character-set-name" - >character set name</dfn> - given in a <code>Name</code> or <code>Alias</code> field - labeled as “preferred MIME name” in the IANA - <a href="#refsCharacterSets">[Character Sets]</a> - registry, if there is one; or if none of the - <code>Alias</code> fields are so labeled, a - <a href="#case-insensitive">case-insensitive match</a> - for a <code>Name</code> field in the registry. - <p>For documents in the <a href="#xml-syntax">XML - syntax</a>, any - <a href="#case-insensitive">case-insensitive match</a> - for the string - "<code>UTF-8</code>".</p> + <div class="datatype-desc">One of the following: + <ul> + <li>For documents in the + <a href="#html-syntax">HTML syntax</a>: A + <a href="#case-insensitive">case-insensitive match</a> + for any + <var class="defined-elsewhere">character set name</var> + for which the IANA + <a href="#refsCharacterSets">[Character Sets]</a> + registry has a <code>Name</code> or <code>Alias</code> field + labeled as “preferred MIME name”; + or, if none of the <code>Alias</code> fields are so labeled, a + <a href="#case-insensitive">case-insensitive match</a> + for a <code>Name</code> field in the registry.</li> + <li>For documents in the <a href="#xml-syntax">XML + syntax</a>: Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>UTF-8</code>".</li> + </ul> </div> </dd> </dl> @@ -517,7 +509,7 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <var class="defined-elsewhere">language tag</var>, + <var class="defined-elsewhere">language tag</var> as defined in <a href="#refsBCP47">[BCP 47]</a>.</div> </dd> @@ -526,7 +518,7 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <var class="defined-elsewhere">media query list</var>, + <var class="defined-elsewhere">media query list</var> as defined in <a href="#refsMediaQueries">[Media Queries]</a>.</div> </dd> @@ -598,10 +590,7 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <dfn - id="full-date" - title="full-date" - >full-date</dfn>, + <var class="defined-elsewhere">full-date</var> as defined in <a href="#refsRFC3339">[RFC 3339]</a>, with the additional qualification that the year component is @@ -674,10 +663,7 @@ <dd></dd> <dd> <div class="datatype-desc">A valid - <dfn - id="partial-time" - title="partial-time" - >partial-time</dfn>, + <var class="defined-elsewhere">partial-time</var> as defined in <a href="#refsRFC3339">[RFC 3339]</a>.</div> </dd> Index: attributes.html =================================================================== RCS file: /sources/public/html5/markup/src/attributes.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- attributes.html 1 Aug 2010 06:36:53 -0000 1.24 +++ attributes.html 12 Aug 2010 19:55:38 -0000 1.25 @@ -369,7 +369,7 @@ </dl> <dl> <dt id="scripting.attr.onkeyup">onkeyup</dt> - <dd>User release a key.</dd> + <dd>User released a key.</dd> </dl> <dl> <dt id="scripting.attr.onload">onload</dt>
Received on Thursday, 12 August 2010 19:55:42 UTC