[html5] r7717 - [e] (0) Consistency. ('filename' for computer code, colloquial spec prose or exa [...]
whatwg at whatwg.org
whatwg at whatwg.org
Sat Feb 9 14:05:25 PST 2013
Author: ianh
Date: 2013-02-09 14:05:23 -0800 (Sat, 09 Feb 2013)
New Revision: 7717
Modified:
complete.html
index
source
Log:
[e] (0) Consistency. ('filename' for computer code, colloquial spec prose or examples, etc, and 'file name' for formal spec prose.)
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=20191
Affected topics: DOM APIs, HTML, Rendering
Modified: complete.html
===================================================================
--- complete.html 2013-02-09 21:35:09 UTC (rev 7716)
+++ complete.html 2013-02-09 22:05:23 UTC (rev 7717)
@@ -20036,7 +20036,7 @@
<dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-code-element>code</a></code> element <a href=#represents>represents</a> a fragment
- of computer code. This could be an XML element name, a filename, a
+ of computer code. This could be an XML element name, a file name, a
computer program, or any other string that a computer would
recognize.</p>
@@ -48359,10 +48359,10 @@
<div class=example id=fakepath-srsly>
<p>For historical reasons, the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute prefixes
- the filename with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
+ the file name with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
actually included the full path (which was a security vulnerability). As a result of this,
- obtaining the filename from the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute in a
- backwards-compatible way is non-trivial. The following function extracts the filename in a
+ obtaining the file name from the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute in a
+ backwards-compatible way is non-trivial. The following function extracts the file name in a
suitably compatible manner:</p>
<pre>function extractFilename(path) {
@@ -48375,7 +48375,7 @@
x = path.lastIndexOf('\\');
if (x >= 0) // Windows-based path
return path.substr(x+1);
- return path; // just the filename
+ return path; // just the file name
}</pre>
<p>This can be used as follows:</p>
@@ -49857,7 +49857,7 @@
<dd id=fakepath-orly>
- <p>On getting, it must return the string "<code title="">C:\fakepath\</code>" followed by the filename of the
+ <p>On getting, it must return the string "<code title="">C:\fakepath\</code>" followed by the name of the
first file in the list of <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
any, or the empty string if the list is empty. On setting, if the
new value is the empty string, it must empty the list of <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>;
@@ -55528,7 +55528,7 @@
type is "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
<li><p>If the entry's type is "<code title="">file</code>", replace its value with the file's
- filename only.</li> <!-- this is not present in the next section -->
+ name only.</li> <!-- this is not present in the next section -->
<li><p>For each character in the entry's name and value that cannot be expressed using the
selected character encoding, replace the character by a string consisting of a U+0026 AMPERSAND
@@ -55842,7 +55842,7 @@
"<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
<li><p>If the entry's type is "<code title="">file</code>", replace
- its value with the file's filename only.</li>
+ its value with the file's name only.</li>
<li>
@@ -57870,7 +57870,7 @@
<p>The <dfn id=attr-hyperlink-download title=attr-hyperlink-download><code>download</code></dfn>
attribute, if present, indicates that the author intends the
hyperlink to be used for downloading a resource. The attribute may
- have a value; the value, if any, specifies the default filename that
+ have a value; the value, if any, specifies the default file name that
the author recommends for use in labeling the resource in a local
file system. There are no restrictions on allowed values, but
authors are cautioned that most file systems have limitations with
@@ -58002,7 +58002,7 @@
creates the <a href=#hyperlink>hyperlink</a> to that resource.</p>
<p>The attribute can furthermore be given a value, to specify the
- filename that user agents are to use when storing the resource in a
+ file name that user agents are to use when storing the resource in a
file system. This value can be overridden by the <code title=http-content-disposition>Content-Disposition</code> HTTP
header's filename parameters. <a href=#refsRFC6266>[RFC6266]</a></p>
@@ -58062,7 +58062,7 @@
<li><p>If the resource has a <code title=http-content-disposition>Content-Disposition</code> header, <!-- Content-Disposition: attachment; filename="" is always honoured, even cross-origin -->
that header specifies the <code title="">attachment</code>
- disposition type, and the header includes filename information,
+ disposition type, and the header includes file name information,
then let <var title="">filename</var> have the value specified by
the header, and jump to the step labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
@@ -58081,7 +58081,7 @@
<li><p>If <var title="">trusted operation</var> is true and the <!-- Content-Disposition: *; filename="" overrides download="" for same-origin -->
resource has a <code title=http-content-disposition>Content-Disposition</code> header
- and that header includes filename information, then let <var title="">filename</var> have the value specified by the header, and
+ and that header includes file name information, then let <var title="">filename</var> have the value specified by the header, and
jump to the step labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
<li><p>If the download was not initiated from a
@@ -58091,7 +58091,7 @@
<code title=attr-hyperlink-download><a href=#attr-hyperlink-download>download</a></code> attribute
when the download was initiated, or if there was such an attribute
but its value when the download was initiated was the empty string,
- then jump to the step labeled <i>no proposed filename</i>.</li>
+ then jump to the step labeled <i>no proposed file name</i>.</li>
<li><p>Let <var title="">proposed filename</var> have the value of
the <code title=attr-hyperlink-download><a href=#attr-hyperlink-download>download</a></code> attribute
@@ -58108,7 +58108,7 @@
of <var title="">proposed filename</var>, and jump to the step
labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
- <li><p><i>No proposed filename</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
+ <li><p><i>No proposed file name</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
operation</var> is true, or if the user indicated a preference for
having the resource in question downloaded, let <var title="">filename</var> have a value derived from the
<a href=#url>URL</a> of the resource in a user-agent-defined manner,
@@ -58141,7 +58141,7 @@
<p>Thus, it is in the user's interests that the user be somehow
notified that the resource in question comes from quite a
different source, and to prevent confusion, any suggested
- filename from the potentially hostile <var title="">interface
+ file name from the potentially hostile <var title="">interface
origin</var> should be ignored.</p>
</div>
@@ -94876,7 +94876,7 @@
<p>When the <i title="">input-file</i> binding applies to an
<code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in the <a href="#file-upload-state-(type=file)" title=attr-input-type-file>File Upload</a> state, the element
is expected to render as an 'inline-block' box containing a span of
- text giving the filename(s) of the <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
+ text giving the file name(s) of the <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
any, followed by a button that, when activated, provides the user
with a file picker from which the selection can be changed.</p>
@@ -99673,7 +99673,7 @@
<tr><th> <code title="">download</code>
<td> <code title=attr-hyperlink-download><a href=#attr-hyperlink-download>a</a></code>;
<code title=attr-hyperlink-download><a href=#attr-hyperlink-download>area</a></code>
- <td> Whether to download the resource instead of navigating to it, and its filename if so
+ <td> Whether to download the resource instead of navigating to it, and its file name if so
<td> Text
<tr><th> <code title="">draggable</code>
<td> <a href=#the-draggable-attribute title=attr-draggable>HTML elements</a>
Modified: index
===================================================================
--- index 2013-02-09 21:35:09 UTC (rev 7716)
+++ index 2013-02-09 22:05:23 UTC (rev 7717)
@@ -20036,7 +20036,7 @@
<dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-code-element>code</a></code> element <a href=#represents>represents</a> a fragment
- of computer code. This could be an XML element name, a filename, a
+ of computer code. This could be an XML element name, a file name, a
computer program, or any other string that a computer would
recognize.</p>
@@ -48359,10 +48359,10 @@
<div class=example id=fakepath-srsly>
<p>For historical reasons, the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute prefixes
- the filename with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
+ the file name with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
actually included the full path (which was a security vulnerability). As a result of this,
- obtaining the filename from the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute in a
- backwards-compatible way is non-trivial. The following function extracts the filename in a
+ obtaining the file name from the <code title=dom-input-value><a href=#dom-input-value>value</a></code> IDL attribute in a
+ backwards-compatible way is non-trivial. The following function extracts the file name in a
suitably compatible manner:</p>
<pre>function extractFilename(path) {
@@ -48375,7 +48375,7 @@
x = path.lastIndexOf('\\');
if (x >= 0) // Windows-based path
return path.substr(x+1);
- return path; // just the filename
+ return path; // just the file name
}</pre>
<p>This can be used as follows:</p>
@@ -49857,7 +49857,7 @@
<dd id=fakepath-orly>
- <p>On getting, it must return the string "<code title="">C:\fakepath\</code>" followed by the filename of the
+ <p>On getting, it must return the string "<code title="">C:\fakepath\</code>" followed by the name of the
first file in the list of <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
any, or the empty string if the list is empty. On setting, if the
new value is the empty string, it must empty the list of <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>;
@@ -55528,7 +55528,7 @@
type is "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
<li><p>If the entry's type is "<code title="">file</code>", replace its value with the file's
- filename only.</li> <!-- this is not present in the next section -->
+ name only.</li> <!-- this is not present in the next section -->
<li><p>For each character in the entry's name and value that cannot be expressed using the
selected character encoding, replace the character by a string consisting of a U+0026 AMPERSAND
@@ -55842,7 +55842,7 @@
"<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
<li><p>If the entry's type is "<code title="">file</code>", replace
- its value with the file's filename only.</li>
+ its value with the file's name only.</li>
<li>
@@ -57870,7 +57870,7 @@
<p>The <dfn id=attr-hyperlink-download title=attr-hyperlink-download><code>download</code></dfn>
attribute, if present, indicates that the author intends the
hyperlink to be used for downloading a resource. The attribute may
- have a value; the value, if any, specifies the default filename that
+ have a value; the value, if any, specifies the default file name that
the author recommends for use in labeling the resource in a local
file system. There are no restrictions on allowed values, but
authors are cautioned that most file systems have limitations with
@@ -58002,7 +58002,7 @@
creates the <a href=#hyperlink>hyperlink</a> to that resource.</p>
<p>The attribute can furthermore be given a value, to specify the
- filename that user agents are to use when storing the resource in a
+ file name that user agents are to use when storing the resource in a
file system. This value can be overridden by the <code title=http-content-disposition>Content-Disposition</code> HTTP
header's filename parameters. <a href=#refsRFC6266>[RFC6266]</a></p>
@@ -58062,7 +58062,7 @@
<li><p>If the resource has a <code title=http-content-disposition>Content-Disposition</code> header, <!-- Content-Disposition: attachment; filename="" is always honoured, even cross-origin -->
that header specifies the <code title="">attachment</code>
- disposition type, and the header includes filename information,
+ disposition type, and the header includes file name information,
then let <var title="">filename</var> have the value specified by
the header, and jump to the step labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
@@ -58081,7 +58081,7 @@
<li><p>If <var title="">trusted operation</var> is true and the <!-- Content-Disposition: *; filename="" overrides download="" for same-origin -->
resource has a <code title=http-content-disposition>Content-Disposition</code> header
- and that header includes filename information, then let <var title="">filename</var> have the value specified by the header, and
+ and that header includes file name information, then let <var title="">filename</var> have the value specified by the header, and
jump to the step labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
<li><p>If the download was not initiated from a
@@ -58091,7 +58091,7 @@
<code title=attr-hyperlink-download><a href=#attr-hyperlink-download>download</a></code> attribute
when the download was initiated, or if there was such an attribute
but its value when the download was initiated was the empty string,
- then jump to the step labeled <i>no proposed filename</i>.</li>
+ then jump to the step labeled <i>no proposed file name</i>.</li>
<li><p>Let <var title="">proposed filename</var> have the value of
the <code title=attr-hyperlink-download><a href=#attr-hyperlink-download>download</a></code> attribute
@@ -58108,7 +58108,7 @@
of <var title="">proposed filename</var>, and jump to the step
labeled "sanitize" below. <a href=#refsRFC6266>[RFC6266]</a></li>
- <li><p><i>No proposed filename</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
+ <li><p><i>No proposed file name</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
operation</var> is true, or if the user indicated a preference for
having the resource in question downloaded, let <var title="">filename</var> have a value derived from the
<a href=#url>URL</a> of the resource in a user-agent-defined manner,
@@ -58141,7 +58141,7 @@
<p>Thus, it is in the user's interests that the user be somehow
notified that the resource in question comes from quite a
different source, and to prevent confusion, any suggested
- filename from the potentially hostile <var title="">interface
+ file name from the potentially hostile <var title="">interface
origin</var> should be ignored.</p>
</div>
@@ -94876,7 +94876,7 @@
<p>When the <i title="">input-file</i> binding applies to an
<code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in the <a href="#file-upload-state-(type=file)" title=attr-input-type-file>File Upload</a> state, the element
is expected to render as an 'inline-block' box containing a span of
- text giving the filename(s) of the <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
+ text giving the file name(s) of the <a href=#concept-input-type-file-selected title=concept-input-type-file-selected>selected files</a>, if
any, followed by a button that, when activated, provides the user
with a file picker from which the selection can be changed.</p>
@@ -99673,7 +99673,7 @@
<tr><th> <code title="">download</code>
<td> <code title=attr-hyperlink-download><a href=#attr-hyperlink-download>a</a></code>;
<code title=attr-hyperlink-download><a href=#attr-hyperlink-download>area</a></code>
- <td> Whether to download the resource instead of navigating to it, and its filename if so
+ <td> Whether to download the resource instead of navigating to it, and its file name if so
<td> Text
<tr><th> <code title="">draggable</code>
<td> <a href=#the-draggable-attribute title=attr-draggable>HTML elements</a>
Modified: source
===================================================================
--- source 2013-02-09 21:35:09 UTC (rev 7716)
+++ source 2013-02-09 22:05:23 UTC (rev 7717)
@@ -21061,7 +21061,7 @@
</dl><!--TOPIC:HTML-->
<p>The <code>code</code> element <span>represents</span> a fragment
- of computer code. This could be an XML element name, a filename, a
+ of computer code. This could be an XML element name, a file name, a
computer program, or any other string that a computer would
recognize.</p>
@@ -56403,10 +56403,10 @@
<div class="example" id="fakepath-srsly">
<p>For historical reasons, the <code title="dom-input-value">value</code> IDL attribute prefixes
- the filename with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
+ the file name with the string "<code title="">C:\fakepath\</code>". Some legacy user agents
actually included the full path (which was a security vulnerability). As a result of this,
- obtaining the filename from the <code title="dom-input-value">value</code> IDL attribute in a
- backwards-compatible way is non-trivial. The following function extracts the filename in a
+ obtaining the file name from the <code title="dom-input-value">value</code> IDL attribute in a
+ backwards-compatible way is non-trivial. The following function extracts the file name in a
suitably compatible manner:</p>
<pre>function extractFilename(path) {
@@ -56419,7 +56419,7 @@
x = path.lastIndexOf('\\');
if (x >= 0) // Windows-based path
return path.substr(x+1);
- return path; // just the filename
+ return path; // just the file name
}</pre>
<p>This can be used as follows:</p>
@@ -58116,7 +58116,7 @@
<dd id="fakepath-orly">
<p>On getting, it must return the string "<code
- title="">C:\fakepath\</code>" followed by the filename of the
+ title="">C:\fakepath\</code>" followed by the name of the
first file in the list of <span
title="concept-input-type-file-selected">selected files</span>, if
any, or the empty string if the list is empty. On setting, if the
@@ -64956,7 +64956,7 @@
title="">charset</var>.</p></li>
<li><p>If the entry's type is "<code title="">file</code>", replace its value with the file's
- filename only.</p></li> <!-- this is not present in the next section -->
+ name only.</p></li> <!-- this is not present in the next section -->
<li><p>For each character in the entry's name and value that cannot be expressed using the
selected character encoding, replace the character by a string consisting of a U+0026 AMPERSAND
@@ -65325,7 +65325,7 @@
title="">charset</var>.</p></li>
<li><p>If the entry's type is "<code title="">file</code>", replace
- its value with the file's filename only.</p></li>
+ its value with the file's name only.</p></li>
<li>
@@ -67713,7 +67713,7 @@
title="attr-hyperlink-download"><code>download</code></dfn>
attribute, if present, indicates that the author intends the
hyperlink to be used for downloading a resource. The attribute may
- have a value; the value, if any, specifies the default filename that
+ have a value; the value, if any, specifies the default file name that
the author recommends for use in labeling the resource in a local
file system. There are no restrictions on allowed values, but
authors are cautioned that most file systems have limitations with
@@ -67855,7 +67855,7 @@
creates the <span>hyperlink</span> to that resource.</p>
<p>The attribute can furthermore be given a value, to specify the
- filename that user agents are to use when storing the resource in a
+ file name that user agents are to use when storing the resource in a
file system. This value can be overridden by the <code
title="http-content-disposition">Content-Disposition</code> HTTP
header's filename parameters. <a
@@ -67929,7 +67929,7 @@
<li><p>If the resource has a <code
title="http-content-disposition">Content-Disposition</code> header, <!-- Content-Disposition: attachment; filename="" is always honoured, even cross-origin -->
that header specifies the <code title="">attachment</code>
- disposition type, and the header includes filename information,
+ disposition type, and the header includes file name information,
then let <var title="">filename</var> have the value specified by
the header, and jump to the step labeled "sanitize" below. <a
href="#refsRFC6266">[RFC6266]</a></p></li>
@@ -67952,7 +67952,7 @@
<li><p>If <var title="">trusted operation</var> is true and the <!-- Content-Disposition: *; filename="" overrides download="" for same-origin -->
resource has a <code
title="http-content-disposition">Content-Disposition</code> header
- and that header includes filename information, then let <var
+ and that header includes file name information, then let <var
title="">filename</var> have the value specified by the header, and
jump to the step labeled "sanitize" below. <a
href="#refsRFC6266">[RFC6266]</a></p></li>
@@ -67964,7 +67964,7 @@
<code title="attr-hyperlink-download">download</code> attribute
when the download was initiated, or if there was such an attribute
but its value when the download was initiated was the empty string,
- then jump to the step labeled <i>no proposed filename</i>.</p></li>
+ then jump to the step labeled <i>no proposed file name</i>.</p></li>
<li><p>Let <var title="">proposed filename</var> have the value of
the <code title="attr-hyperlink-download">download</code> attribute
@@ -67983,7 +67983,7 @@
of <var title="">proposed filename</var>, and jump to the step
labeled "sanitize" below. <a href="#refsRFC6266">[RFC6266]</a></p></li>
- <li><p><i>No proposed filename</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
+ <li><p><i>No proposed file name</i>: If <var title="">trusted <!-- fallback for same-origin resources or explicit downloads: use the resource's file name -->
operation</var> is true, or if the user indicated a preference for
having the resource in question downloaded, let <var
title="">filename</var> have a value derived from the
@@ -68017,7 +68017,7 @@
<p>Thus, it is in the user's interests that the user be somehow
notified that the resource in question comes from quite a
different source, and to prevent confusion, any suggested
- filename from the potentially hostile <var title="">interface
+ file name from the potentially hostile <var title="">interface
origin</var> should be ignored.</p>
</div>
@@ -110757,7 +110757,7 @@
title="attr-input-type">type</code> attribute is in the <span
title="attr-input-type-file">File Upload</span> state, the element
is expected to render as an 'inline-block' box containing a span of
- text giving the filename(s) of the <span
+ text giving the file name(s) of the <span
title="concept-input-type-file-selected">selected files</span>, if
any, followed by a button that, when activated, provides the user
with a file picker from which the selection can be changed.</p>
@@ -116512,7 +116512,7 @@
<th> <code title="">download</code>
<td> <code title="attr-hyperlink-download">a</code>;
<code title="attr-hyperlink-download">area</code>
- <td> Whether to download the resource instead of navigating to it, and its filename if so
+ <td> Whether to download the resource instead of navigating to it, and its file name if so
<td> Text
<tr>
<th> <code title="">draggable</code>
More information about the Commit-Watchers
mailing list