jenkins-bot has submitted this change and it was merged.

Change subject: Shorten our in-comment urls to the whatwg HTML spec.
......................................................................


Shorten our in-comment urls to the whatwg HTML spec.

whatwg.org has a redirect to /specs/web-apps/current-work/multipage/ from 
/html/.

Change-Id: If21705c214ca8f14db5a0c6dda3c43c22f9ca811
---
M includes/Html.php
M includes/Sanitizer.php
M includes/User.php
3 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Html.php b/includes/Html.php
index e7455b7..a8432f8 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -172,7 +172,7 @@
 
                // In text/html, initial <html> and <head> tags can be omitted 
under
                // pretty much any sane circumstances, if they have no 
attributes.  See:
-               // 
<http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags>
+               // <http://www.whatwg.org/html/syntax.html#optional-tags>
                if ( !$wgWellFormedXml && !$attribs
                && in_array( $element, array( 'html', 'head' ) ) ) {
                        return '';
@@ -238,7 +238,7 @@
                $element = strtolower( $element );
 
                // Reference:
-               // 
http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+               // http://www.whatwg.org/html/syntax.html#optional-tags
                if ( !$wgWellFormedXml && in_array( $element, array(
                        'html',
                        'head',
@@ -902,7 +902,7 @@
                $candidates = array();
                foreach ( $urls as $density => $url ) {
                        // Image candidate syntax per current whatwg live spec, 
2012-09-23:
-                       // 
http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content-1.html#attr-img-srcset
+                       // 
http://www.whatwg.org/html/embedded-content-1.html#attr-img-srcset
                        $candidates[] = "{$url} {$density}x";
                }
                return implode( ", ", $candidates );
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index b4a1c62..8a0522b 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -740,7 +740,7 @@
 
                        # WAI-ARIA
                        # http://www.w3.org/TR/wai-aria/
-                       # 
http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#wai-aria
+                       # http://www.whatwg.org/html/elements.html#wai-aria
                        # For now we only support role="presentation" until we 
work out what roles should be
                        # usable by content and we ensure that our code 
explicitly rejects patterns that
                        # violate HTML5's ARIA restrictions.
@@ -1011,7 +1011,7 @@
         *                                                          in the id 
and
         *                                                          name 
attributes
         * @see http://www.w3.org/TR/html401/struct/links.html#h-12.2.3 Anchors 
with the id attribute
-        * @see 
http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#the-id-attribute
+        * @see http://www.whatwg.org/html/elements.html#the-id-attribute
         *   HTML5 definition of id attribute
         *
         * @param string $id id to escape
@@ -1467,7 +1467,7 @@
                }
 
                if ( $wgAllowMicrodataAttributes ) {
-                       # add HTML5 microdata tags as specified by 
http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#the-microdata-model
+                       # add HTML5 microdata tags as specified by 
http://www.whatwg.org/html/microdata.html#the-microdata-model
                        $common = array_merge( $common, array(
                                'itemid', 'itemprop', 'itemref', 'itemscope', 
'itemtype'
                        ) );
@@ -1623,7 +1623,7 @@
                        'bdi' => $common,
 
                        # HTML5 elements, defined by:
-                       # 
http://www.whatwg.org/specs/web-apps/current-work/multipage/
+                       # http://www.whatwg.org/html/
                        'data' => array_merge( $common, array( 'value' ) ),
                        'time' => array_merge( $common, array( 'datetime' ) ),
                        'mark' => $common,
@@ -1740,7 +1740,7 @@
         * Does a string look like an e-mail address?
         *
         * This validates an email address using an HTML5 specification found 
at:
-        * 
http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
+        * 
http://www.whatwg.org/html/states-of-the-type-attribute.html#valid-e-mail-address
         * Which as of 2011-01-24 says:
         *
         *   A valid e-mail address is a string that matches the ABNF production
diff --git a/includes/User.php b/includes/User.php
index 699ea67..ef3f9ac 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -731,7 +731,7 @@
         * Does a string look like an e-mail address?
         *
         * This validates an email address using an HTML5 specification found 
at:
-        * 
http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
+        * 
http://www.whatwg.org/html/states-of-the-type-attribute.html#valid-e-mail-address
         * Which as of 2011-01-24 says:
         *
         *     A valid e-mail address is a string that matches the ABNF 
production

-- 
To view, visit https://gerrit.wikimedia.org/r/63407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If21705c214ca8f14db5a0c6dda3c43c22f9ca811
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Peachey88 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to