Author: Seth Schoen <[email protected]> Date: Wed, 3 Nov 2010 17:52:14 -0700 Subject: trivial-validate found dot and slash problems in shipping rules, too Commit: bea9e475e55783d8ba8ee515706d57a1bd503698
--- src/chrome/content/rules/Facebook.xml | 2 +- src/chrome/content/rules/GoogleServices.xml | 8 ++++---- src/chrome/content/rules/NYTimes.xml | 2 +- src/chrome/content/rules/Wikipedia.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml index 8d0ff96..eee23f1 100644 --- a/src/chrome/content/rules/Facebook.xml +++ b/src/chrome/content/rules/Facebook.xml @@ -6,5 +6,5 @@ <rule from="^http://(www\.)?facebook\.com/" to="https://www.facebook.com/"/> <rule from="^http://m\.facebook\.com/"; to="https://m.facebook.com/"/> - <rule from="^http://www\.v6\.facebook\.com/"; to="https://www.v6.facebook.com"/> + <rule from="^http://www\.v6\.facebook\.com/"; to="https://www.v6.facebook.com/"/> </ruleset> diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml index 098fe76..e3f5aba 100644 --- a/src/chrome/content/rules/GoogleServices.xml +++ b/src/chrome/content/rules/GoogleServices.xml @@ -47,13 +47,13 @@ <rule from="^http://news\.google((\.com?)?(\.[^/@:][^/@:])?)/" to="https://news.google$1/"; /> - <rule from="^http://www.googlecode.com/$"; + <rule from="^http://www\.googlecode\.com/$"; to="https://code.google.com/"; /> - <rule from="^http://([^/:@]*)\.googlecode.com/$" + <rule from="^http://([^/:@]*)\.googlecode\.com/$" to="https://code.google.com/p/$1/"; /> - <rule from="^http://([^/:@]*)\.googlecode.com/(.+)" + <rule from="^http://([^/:@]*)\.googlecode\.com/(.+)" to="https://$1.googlecode.com/$2"; /> - <rule from="^http://www\.google\.com/cse/intl/([^/:@][^/:@])/images/google_custom_search_watermark.gif$" to="https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif"; /> + <rule from="^http://www\.google\.com/cse/intl/([^/:@][^/:@])/images/google_custom_search_watermark\.gif$" to="https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif"; /> </ruleset> diff --git a/src/chrome/content/rules/NYTimes.xml b/src/chrome/content/rules/NYTimes.xml index 7ac589d..333174b 100644 --- a/src/chrome/content/rules/NYTimes.xml +++ b/src/chrome/content/rules/NYTimes.xml @@ -4,5 +4,5 @@ <target host="global.nytimes.com" /> <rule from="^http://(www\.)?nytimes\.com/" to="https://www.nytimes.com/"/> - <rule from="^http://global.nytimes\.com/"; to="https://global.nytimes.com/"/> + <rule from="^http://global\.nytimes\.com/"; to="https://global.nytimes.com/"/> </ruleset> diff --git a/src/chrome/content/rules/Wikipedia.xml b/src/chrome/content/rules/Wikipedia.xml index 5d78d64..a96da66 100644 --- a/src/chrome/content/rules/Wikipedia.xml +++ b/src/chrome/content/rules/Wikipedia.xml @@ -28,7 +28,7 @@ <rule from="^http://(meta|commons|incubator|species|outreach|strategy|usability|wikimania|test|survey)\.wikimedia\.org/wiki/" to="https://secure.wikimedia.org/wikipedia/$1/wiki/"/> - <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/w/index.php\?title=" + <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/w/index\.php\?title=" to="https://secure.wikimedia.org/wik$2/$1/wiki/"/> </ruleset> -- 1.7.1
![https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif"](https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif"){kind=link}