Noissue - Update preferences page for Adblock Plus 2.9 release

pages/preferences.tmpl

Index: pages/preferences.tmpl
===================================================================
--- a/pages/preferences.tmpl
+++ b/pages/preferences.tmpl
@@ -157,34 +157,26 @@ title=Adblock Plus preferences
 
 {% macro sendReport_keyDescription() %}
 {{"Defines the keyboard shortcut to be used to send issue reports."|translate("sendReport_key-s1")}} {{"For\ndescription of possible values see <a href=\"#sidebar_key\"><fix>sidebar_key</fix></a>."|translate("sendReport_key-s2")}}
 <br><br>
 
 {{"<em>Note</em>: This setting will only apply after the browser is restarted."|translate("sendReport_key-s3")}}
 {% endmacro %}
 
-{% macro data_directoryDescription() %}
-{{"The directory where Adblock Plus should store its data.  This can be either an\nabsolute path, or it can a directory location relative to the user's profile.\nIf <a href=\"#patternsfile\"><fix>patternsfile</fix></a> preference is set it will override\nthe location for patterns.ini file while other files stay in this directory."|translate("data_directory-s1")}}
-{% endmacro %}
-
 {% macro subscriptions_exceptionscheckboxDescription() %}
 {{"If <code><fix>true</fix></code>, the filter list for <a href=\"acceptable-ads\">non-intrusive ads</a>\nwill get special treatment and will be displayed as a checkbox in the user\ninterface."|translate("subscriptions_exceptionscheckbox-s1")}}
 {% endmacro %}
 
 {% macro subscriptions_autoupdateDescription() %}
 {{"Defines whether filters in filter subscriptions will be updated\nautomatically."|translate("subscriptions_autoupdate-s1")}}<br><br>
 
 {{"<em>Note</em>: Disabling updates is not recommended."|translate("subscriptions_autoupdate-s2")}}
 {% endmacro %}
 
-{% macro please_kill_startup_performanceDescription() %}
-{{"If set to <code><fix>true</fix></code> processing filters on startup will happen synchronously and delay browser startup."|translate("please_kill_startup_performance-s1")}} {{"Changing this setting is not recommended but it makes it less likely that ads will appear on the first page loaded by the browser."|translate("please_kill_startup_performance-s2")}}
-{% endmacro %}
-
 {% macro fastcollapseDescription() %}
 {{"If set to <code><fix>true</fix></code> blocked elements will no longer be hidden."|translate("fastcollapse-s1")}} {{"This might have the effect that\nplaceholders will show up for blocked images for example, unless hidden by other means."|translate("fastcollapse-s2")}} {{"This functionality was available\nas \"Hide placeholders of blocked elements\" before Adblock Plus 2.6.7."|translate("fastcollapse-s3")}}
 {% endmacro %}
 
 {% macro currentVersionDescription() %}
 {{"Stores the last used Adblock Plus version, this will trigger actions that need to be done on upgrade or first install"|translate("currentVersion-s1")}}
 {% endmacro %}
 
@@ -343,16 +335,20 @@ title=Adblock Plus preferences
 {% macro notifications_showuiDescription() %}
 {{"Determines whether notification management UI should be displayed (only if the user opted out of notifications before)."|translate("notifications_showui-description")}}
 {% endmacro %}
 
 {% macro notifications_ignoredcategoriesDescription() %}
 {{"List of notification categories that the user opted out of."|translate("notifications_ignoredcategories-description")}}
 {% endmacro %}
 
+{% macro removedIn2_9() %}
+{{"Unused in Adblock Plus 2.9 and higher."|translate("removedIn2.9")}}
+{% endmacro %}
+
 {#
   Preference descriptions are defined in the macros above and only referenced
   here.
 #}
 
 {% from "includes/preftable" import display_preftable %}
 
 {{ display_preftable([
@@ -394,17 +390,17 @@ title=Adblock Plus preferences
       {
         "name": "composer_default",
         "default": "2",
         "description": composer_defaultDescription
       },
       {
         "name": "data_directory",
         "default": "adblockplus",
-        "description": data_directoryDescription
+        "description": removedIn2_9
       },
       {
         "name": "defaultstatusbaraction",
         "default": "0",
         "description": defaultstatusbaractionDescription
       },
       {
         "name": "defaulttoolbaraction",
@@ -444,17 +440,17 @@ title=Adblock Plus preferences
       {
         "name": "patternsfile",
         "default": None,
         "description": patternsfileDescription
       },
       {
         "name": "please_kill_startup_performance",
         "default": "false",
-        "description": please_kill_startup_performanceDescription
+        "description": removedIn2_9
       },
       {
         "name": "previewimages",
         "default": "true",
         "description": previewimagesDescription
       },
       {
         "name": "sendReport_key",