Skip to content

Commit c2bc354

Browse files
pieterocpszepeviktorezyang
authored
fix: non-substantive typos (#434)
Co-authored-by: Viktor Szépe <[email protected]> Co-authored-by: Edward Z. Yang <[email protected]>
1 parent b21a591 commit c2bc354

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+64
-64
lines changed

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Autoload compatibility
9999

100100
HTML Purifier attempts to be as smart as possible when registering an
101101
autoloader, but there are some cases where you will need to change
102-
your own code to accomodate HTML Purifier. These are those cases:
102+
your own code to accommodate HTML Purifier. These are those cases:
103103

104104
AN __autoload FUNCTION IS DECLARED AFTER OUR AUTOLOADER IS REGISTERED
105105
spl_autoload_register() has the curious behavior of disabling

NEWS

+8-8
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ real release we decided to skip this version number.
482482

483483
3.3.0, released 2009-02-16
484484
! Implement CSS property 'overflow' when %CSS.AllowTricky is true.
485-
! Implement generic property list classess
485+
! Implement generic property list classes
486486
- Fix bug with testEncodingSupportsASCII() algorithm when iconv() implementation
487487
does not do the "right thing" with characters not supported in the output
488488
set.
@@ -522,7 +522,7 @@ real release we decided to skip this version number.
522522
! %Core.AggressivelyFixLt is on by default. This causes more sensible
523523
processing of left angled brackets in smileys and other whatnot.
524524
! Test scripts now have a 'type' parameter, which lets you say 'htmlpurifier',
525-
'phpt', 'vtest', etc. in order to only execute those tests. This supercedes
525+
'phpt', 'vtest', etc. in order to only execute those tests. This supersedes
526526
the --only-phpt parameter, although for backwards-compatibility the flag
527527
will still work.
528528
! AutoParagraph auto-formatter will now preserve double-newlines upon output.
@@ -573,7 +573,7 @@ real release we decided to skip this version number.
573573
. Added --quick option to multitest.php, which tests only the most recent
574574
release for each series.
575575
. Added --distro option to multitest.php, which accepts either 'normal' or
576-
'standalone'. This supercedes --exclude-normal and --exclude-standalone
576+
'standalone'. This supersedes --exclude-normal and --exclude-standalone
577577

578578
3.1.1, released 2008-06-19
579579
# %URI.Munge now, by default, does not munge resources (for example, <img src="">)
@@ -723,7 +723,7 @@ real release we decided to skip this version number.
723723
# HTMLPurifier->addFilter is deprecated; built-in filters can now be
724724
enabled using %Filter.$filter_name or by setting your own filters using
725725
%Filter.Custom
726-
# Directive-level safety properties superceded in favor of module-level
726+
# Directive-level safety properties superseded in favor of module-level
727727
safety. Internal method HTMLModule->addElement() has changed, although
728728
the externally visible HTMLDefinition->addElement has *not* changed.
729729
! Extra utility classes for testing and non-library operations can
@@ -769,7 +769,7 @@ real release we decided to skip this version number.
769769
. A couple of new historical maintenance scripts were added.
770770
. HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php split into two files
771771
. tests/index.php can now be run from any directory.
772-
. HTMLPurifier_Token subclasses split into seperate files
772+
. HTMLPurifier_Token subclasses split into separate files
773773
. HTMLPURIFIER_PREFIX now is defined in Bootstrap.php, NOT HTMLPurifier.php
774774
. HTMLPURIFIER_PREFIX can now be defined outside of HTML Purifier
775775
. New --php=php flag added, allows PHP executable to be specified (command
@@ -835,7 +835,7 @@ real release we decided to skip this version number.
835835
- Fix warning emitted when a non-supported URI scheme is passed to the
836836
MakeAbsolute URIFilter, thanks NykO18 (again)
837837
- Further refine AutoParagraph injector. Behavior inside of elements
838-
allowing paragraph tags clarified: only inline content delimeted by
838+
allowing paragraph tags clarified: only inline content delimited by
839839
double newlines (not block elements) are paragraphed.
840840
- Buggy treatment of end tags of elements that have required attributes
841841
fixed (does not manifest on default tag-set)
@@ -881,7 +881,7 @@ real release we decided to skip this version number.
881881
! CSS property border-spacing implemented
882882
- Fix non-visible parsing error in DirectLex with empty tags that have
883883
slashes inside attribute values.
884-
- Fix typo in CSS definition: border-collapse:seperate; was incorrectly
884+
- Fix typo in CSS definition: border-collapse:separate; was incorrectly
885885
accepted as valid CSS. Usually non-visible, because this styling is the
886886
default for tables in most browsers. Thanks Brett Zamir for pointing
887887
this out.
@@ -932,7 +932,7 @@ real release we decided to skip this version number.
932932
. HTMLPurifier_Config->getSerial() implemented, this is extremely useful
933933
for output cache invalidation
934934
. ConfigForm printer now can retrieve CSS and JS files as strings, in
935-
case HTML Purifier's directory is not publically accessible
935+
case HTML Purifier's directory is not publicly accessible
936936
. Introduce new text/itext configuration directive values: these represent
937937
longer strings that would be more appropriately edited with a textarea
938938
. Allow newlines to act as separators for lists, hashes, lookups and

TODO

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FUTURE VERSIONS
4141
- Config: Add examples to everything (make built-in which also automatically
4242
gives output)
4343
- Add "register" field to config schemas to eliminate dependence on
44-
naming conventions (try to remember why we ultimately decided on tihs)
44+
naming conventions (try to remember why we ultimately decided on this)
4545

4646
5.0 release [HTML 5]
4747
# Swap out code to use html5lib tokenizer and tree-builder
@@ -112,7 +112,7 @@ Neat feature related
112112
Also, enable disabling of directionality
113113
? Externalize inline CSS to promote clean HTML, proposed by Sander Tekelenburg
114114
? Remove redundant tags, ex. <u><u>Underlined</u></u>. Implementation notes:
115-
1. Analyzing which tags to remove duplicants
115+
1. Analyzing which tags to remove duplicates
116116
2. Ensure attributes are merged into the parent tag
117117
3. Extend the tag exclusion system to specify whether or not the
118118
contents should be dropped or not (currently, there's code that could do

benchmarks/samples/Lexer/4.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ <h2>External links</h2>
392392
<li><a href="http://www.scheele.org/lee/tcclinks.html" class="external text" title="http://www.scheele.org/lee/tcclinks.html">Lee Scheele's Links to T'ai Chi Ch'uan Web Sites</a></li>
393393
<li><a href="http://news.bbc.co.uk/1/hi/health/3543907.stm" class="external text" title="http://news.bbc.co.uk/1/hi/health/3543907.stm">BBC article</a></li>
394394
<li><a href="http://www.acupuncturetoday.com/archives2004/jul/07taichi.html" class="external text" title="http://www.acupuncturetoday.com/archives2004/jul/07taichi.html">Tai Chi: Good for the Mind, Good for the Body</a></li>
395-
<li><a href="http://www.taichiunion.com/" class="external text" title="http://www.taichiunion.com/">Tai Chi Chuan Union for Great Britian: The largest collective of independent Tai Chi Chuan Instructors in the British Isles</a></li>
395+
<li><a href="http://www.taichiunion.com/" class="external text" title="http://www.taichiunion.com/">Tai Chi Chuan Union for Great Britain: The largest collective of independent Tai Chi Chuan Instructors in the British Isles</a></li>
396396
</ul>
397397

398398

docs/dev-config-naming.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ the properties:
4949
AllowedFrameTargets -> heavily <a> specific, but also used by <area>
5050
and <form>. Transitional DTD %FrameTarget, not present in strict,
5151
HTML5 calls them "browsing contexts"
52-
Default*Image* -> as a default parameter, is almost entirely exlcusive
52+
Default*Image* -> as a default parameter, is almost entirely exclusive
5353
to <img>
5454
EnableID -> global attribute
5555
Name.UseCDATA -> heavily <a> specific, but has heavy other usage by

docs/dev-progress.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ <h2>CSS</h2>
122122

123123
<tbody>
124124
<tr><th colspan="2">Table</th></tr>
125-
<tr class="impl-yes"><td>border-collapse</td><td>ENUM(collapse, seperate)</td></tr>
125+
<tr class="impl-yes"><td>border-collapse</td><td>ENUM(collapse, separate)</td></tr>
126126
<tr class="impl-yes"><td>border-space</td><td>MULTIPLE</td></tr>
127127
<tr class="impl-yes"><td>caption-side</td><td>ENUM(top, bottom)</td></tr>
128128
<tr class="feature"><td>empty-cells</td><td>ENUM(show, hide), No IE support makes this useless,

docs/enduser-tidy.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ <h2>I like the general idea, but the specifics bug me!</h2>
163163

164164
<p>So you want HTML Purifier to clean up your HTML, but you're not
165165
so happy about the br@clear implementation. That's perfectly fine!
166-
HTML Purifier will make accomodations:</p>
166+
HTML Purifier will make accommodations:</p>
167167

168168
<pre>$config-&gt;set('HTML.Doctype', 'XHTML 1.0 Transitional');
169169
$config-&gt;set('HTML.TidyLevel', 'heavy'); // all changes, minus...

docs/proposal-filter-levels.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ These are special use tags, they should be enabled on a blanket basis.
6060
Lists - dd, dl, dt, li, ol, ul ~ menu, dir
6161
Tables - caption, table, td, th, tr / col, colgroup, tbody, tfoot, thead
6262

63-
Forms - fieldset, form, input, lable, legend, optgroup, option, select, textarea
63+
Forms - fieldset, form, input, label, legend, optgroup, option, select, textarea
6464
XSS - noscript, object, script ~ applet
6565
Meta - base, basefont, body, head, html, link, meta, style, title
6666
Frames - frame, frameset, iframe
@@ -91,7 +91,7 @@ attribute and put URI filtering higher up on the priority list.
9191

9292
== Attribute Risk Analysis ==
9393

94-
We actually have a suprisingly small assortment of allowed attributes (the
94+
We actually have a surprisingly small assortment of allowed attributes (the
9595
rest are deprecated in strict, and thus we opted not to allow them, even
9696
though our output is XHTML Transitional by default.)
9797

docs/proposal-plists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Backfills/Data integrity:
7070
Type systems:
7171
- Flags: ReadOnly, Permanent, DontEnum
7272
- Typed properties isn't that useful [It's also Not-PHP]
73-
- Seperate meta-list of directive properties IS useful
73+
- Separate meta-list of directive properties IS useful
7474
- Duck typing is useful for systems designed fully around properties pattern
7575

7676
Trade-off:

library/HTMLPurifier/AttrDef/CSS/FontFamily.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public function validate($string, $config, $context)
195195
// transforms don't pose a security risk (as \\ and \"
196196
// might--these escapes are not supported by most browsers).
197197
// We could try to be clever and use single-quote wrapping
198-
// when there is a double quote present, but I have choosen
198+
// when there is a double quote present, but I have chosen
199199
// not to implement that. (NOTE: you can reduce the amount
200200
// of escapes by one depending on what quoting style you use)
201201
// $font = str_replace('\\', '\\5C ', $font);

library/HTMLPurifier/AttrDef/URI/IPv6.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function validate($aIP, $config, $context)
3737
}
3838
}
3939

40-
// IPv4-compatiblity check
40+
// IPv4-compatibility check
4141
if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
4242
$aIP = substr($aIP, 0, 0 - strlen($find[0]));
4343
$ip = explode('.', $find[0]);

library/HTMLPurifier/AttrTransform/BdoDir.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// this MUST be placed in post, as it assumes that any value in dir is valid
44

55
/**
6-
* Post-trasnform that ensures that bdo tags have the dir attribute set.
6+
* Post-transform that ensures that bdo tags have the dir attribute set.
77
*/
88
class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
99
{

library/HTMLPurifier/AttrValidator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function validateToken($token, $config, $context)
135135
// we'd also want slightly more complicated substitution
136136
// involving an array as the return value,
137137
// although we're not sure how colliding attributes would
138-
// resolve (certain ones would be completely overriden,
138+
// resolve (certain ones would be completely overridden,
139139
// others would prepend themselves).
140140
}
141141

library/HTMLPurifier/Bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
66
}
77

8-
// accomodations for versions earlier than 5.0.2
8+
// accommodations for versions earlier than 5.0.2
99
// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <[email protected]>
1010
if (!defined('PHP_EOL')) {
1111
switch (strtoupper(substr(PHP_OS, 0, 3))) {

library/HTMLPurifier/ConfigSchema/Interchange/Directive.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class HTMLPurifier_ConfigSchema_Interchange_Directive
6666
public $version;
6767

6868
/**
69-
* ID of directive that supercedes this old directive.
69+
* ID of directive that supersedes this old directive.
7070
* Null if not deprecated.
7171
* @type HTMLPurifier_ConfigSchema_Interchange_Id
7272
*/

library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ DEFAULT: ''
55
--DESCRIPTION--
66
Temporary prefix for IDs used in conjunction with %Attr.IDPrefix. If you
77
need to allow multiple sets of user content on web page, you may need to
8-
have a seperate prefix that changes with each iteration. This way,
9-
seperately submitted user content displayed on the same page doesn't
8+
have a separate prefix that changes with each iteration. This way,
9+
separately submitted user content displayed on the same page doesn't
1010
clobber each other. Ideal values are unique identifiers for the content it
1111
represents (i.e. the id of the row in the database). Be sure to add a
12-
seperator (like an underscore) at the end. Warning: this directive will
12+
separator (like an underscore) at the end. Warning: this directive will
1313
not work unless %Attr.IDPrefix is set to a non-empty value!
1414
--# vim: et sw=4 sts=4

library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ converting all non-ASCII characters into decimal numeric entities before
88
converting it to its native encoding. This means that even characters that
99
can be expressed in the non-UTF-8 encoding will be entity-ized, which can
1010
be a real downer for encodings like Big5. It also assumes that the ASCII
11-
repetoire is available, although this is the case for almost all encodings.
11+
repertoire is available, although this is the case for almost all encodings.
1212
Anyway, use UTF-8!
1313
--# vim: et sw=4 sts=4

library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEFAULT: NULL
1616
</dd>
1717
<dt><em>string</em> lexer identifier</dt>
1818
<dd>
19-
This is a slim way of manually overridding the implementation.
19+
This is a slim way of manually overriding the implementation.
2020
Currently recognized values are: DOMLex (the default PHP5
2121
implementation)
2222
and DirectLex (the default PHP4 implementation). Only use this if

library/HTMLPurifier/EntityParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// $config or $context to the callback functions.
66

77
/**
8-
* Handles referencing and derefencing character entities
8+
* Handles referencing and dereferencing character entities
99
*/
1010
class HTMLPurifier_EntityParser
1111
{

library/HTMLPurifier/Filter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Represents a pre or post processing filter on HTML Purifier's output
55
*
66
* Sometimes, a little ad-hoc fixing of HTML has to be done before
7-
* it gets sent through HTML Purifier: you can use filters to acheive
7+
* it gets sent through HTML Purifier: you can use filters to achieve
88
* this effect. For instance, YouTube videos can be preserved using
99
* this manner. You could have used a decorator for this task, but
1010
* PHP's support for them is not terribly robust, so we're going

library/HTMLPurifier/Generator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function generateAttributes($assoc_array_of_attributes, $element = '')
244244
// whitespace (in fact, most don't, at least for attributes
245245
// like alt, but an extra space at the end is barely
246246
// noticeable). Still, we have a configuration knob for
247-
// this, since this transformation is not necesary if you
247+
// this, since this transformation is not necessary if you
248248
// don't process user input with innerHTML or you don't plan
249249
// on supporting Internet Explorer.
250250
if ($this->_innerHTMLFix) {

library/HTMLPurifier/HTMLModule/Edit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function setup($config)
2828

2929
// HTML 4.01 specifies that ins/del must not contain block
3030
// elements when used in an inline context, chameleon is
31-
// a complicated workaround to acheive this effect
31+
// a complicated workaround to achieve this effect
3232

3333
// Inline context ! Block context (exclamation mark is
3434
// separator, see getChildDef for parsing)

library/HTMLPurifier/HTMLModule/Ruby.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* XHTML 1.1 Ruby Annotation Module, defines elements that indicate
5-
* short runs of text alongside base text for annotation or pronounciation.
5+
* short runs of text alongside base text for annotation or pronunciation.
66
*/
77
class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
88
{

library/HTMLPurifier/HTMLModule/Tidy/Name.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* Name is deprecated, but allowed in strict doctypes, so onl
4+
* Name is deprecated, but allowed in strict doctypes, so only
55
*/
66
class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
77
{

library/HTMLPurifier/Lexer/PH5P.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1223,14 +1223,14 @@ private function markupDeclarationOpenState()
12231223
'type' => self::COMMENT
12241224
);
12251225

1226-
/* Otherwise if the next seven chacacters are a case-insensitive match
1226+
/* Otherwise if the next seven characters are a case-insensitive match
12271227
for the word "DOCTYPE", then consume those characters and switch to the
12281228
DOCTYPE state. */
12291229
} elseif (strtolower($this->character($this->char + 1, 7)) === 'doctype') {
12301230
$this->char += 7;
12311231
$this->state = 'doctype';
12321232

1233-
/* Otherwise, is is a parse error. Switch to the bogus comment state.
1233+
/* Otherwise, it is a parse error. Switch to the bogus comment state.
12341234
The next character that is consumed, if any, is the first character
12351235
that will be in the comment. */
12361236
} else {

library/HTMLPurifier/Strategy/FixNesting.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* The second objective is to ensure that explicitly excluded elements of
2121
* an element do not appear in its children. Code that accomplishes this
2222
* task is pervasive through the strategy, though the two are distinct tasks
23-
* and could, theoretically, be seperated (although it's not recommended).
23+
* and could, theoretically, be separated (although it's not recommended).
2424
*
2525
* @note Whether or not unrecognized children are silently dropped or
2626
* translated into text depends on the child definitions.

library/HTMLPurifier/Strategy/MakeWellFormed.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ private function remove()
641641
// Needless to say, we need to UN-skip the token so it gets
642642
// reprocessed.
643643
//
644-
// - Suppose that you successfuly process a token, replace it with
644+
// - Suppose that you successfully process a token, replace it with
645645
// one with your skip mark, but now another injector wants to
646646
// process the skipped token with another token. Should you continue
647647
// to skip that new token, or reprocess it? If you reprocess,

library/HTMLPurifier/URIFilter/Munge.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function filter(&$uri, $config, $context)
7171
} // ignore unknown schemes, maybe another postfilter did it
7272
if (!$scheme_obj->browsable) {
7373
return true;
74-
} // ignore non-browseable schemes, since we can't munge those in a reasonable way
74+
} // ignore non-browsable schemes, since we can't munge those in a reasonable way
7575
if ($uri->isBenign($config, $context)) {
7676
return true;
7777
} // don't redirect if a benign URL

library/HTMLPurifier/URIParser.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function parse($uri)
2929

3030
// Regexp is as per Appendix B.
3131
// Note that ["<>] are an addition to the RFC's recommended
32-
// characters, because they represent external delimeters.
32+
// characters, because they represent external delimiters.
3333
$r_URI = '!'.
3434
'(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme
3535
'(//([^/?#"<>]*))?'. // 4. Authority
@@ -43,7 +43,7 @@ public function parse($uri)
4343

4444
if (!$result) return false; // *really* invalid URI
4545

46-
// seperate out parts
46+
// separate out parts
4747
$scheme = !empty($matches[1]) ? $matches[2] : null;
4848
$authority = !empty($matches[3]) ? $matches[4] : null;
4949
$path = $matches[5]; // always present, can be empty

maintenance/PH5P.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -800,14 +800,14 @@ private function markupDeclarationOpenState()
800800
'type' => self::COMMENT
801801
);
802802

803-
/* Otherwise if the next seven chacacters are a case-insensitive match
803+
/* Otherwise if the next seven characters are a case-insensitive match
804804
for the word "DOCTYPE", then consume those characters and switch to the
805805
DOCTYPE state. */
806806
} elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
807807
$this->char += 7;
808808
$this->state = 'doctype';
809809

810-
/* Otherwise, is is a parse error. Switch to the bogus comment state.
810+
/* Otherwise, it is a parse error. Switch to the bogus comment state.
811811
The next character that is consumed, if any, is the first character
812812
that will be in the comment. */
813813
} else {

0 commit comments

Comments
 (0)