From b2df5a5b4742c7f7979e0b8f0cc0e2b28ff9df87 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 4 Apr 2015 15:30:58 +0200
Subject: [PATCH] docs: Make it clear cache settings are global.

Closes #602.
---
 doc/help/settings.asciidoc       | 8 ++++----
 qutebrowser/config/configdata.py | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index d2b1ab985..66c3b7378 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -114,8 +114,8 @@
 |==============
 |Setting|Description
 |<<storage-download-directory,download-directory>>|The directory to save downloads to. An empty value selects a sensible os-specific default. Will expand environment variables.
-|<<storage-maximum-pages-in-cache,maximum-pages-in-cache>>|The maximum number of pages to hold in the memory page cache.
-|<<storage-object-cache-capacities,object-cache-capacities>>|The capacities for the memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
+|<<storage-maximum-pages-in-cache,maximum-pages-in-cache>>|The maximum number of pages to hold in the global memory page cache.
+|<<storage-object-cache-capacities,object-cache-capacities>>|The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
 |<<storage-offline-storage-default-quota,offline-storage-default-quota>>|Default quota for new offline storage databases.
 |<<storage-offline-web-application-cache-quota,offline-web-application-cache-quota>>|Quota for the offline web application cache.
 |<<storage-offline-storage-database,offline-storage-database>>|Whether support for the HTML 5 offline storage feature is enabled.
@@ -990,7 +990,7 @@ Default: empty
 
 [[storage-maximum-pages-in-cache]]
 === maximum-pages-in-cache
-The maximum number of pages to hold in the memory page cache.
+The maximum number of pages to hold in the global memory page cache.
 
 The Page Cache allows for a nicer user experience when navigating forth or back to pages in the forward/back history, by pausing and resuming up to _n_ pages.
 
@@ -1000,7 +1000,7 @@ Default: empty
 
 [[storage-object-cache-capacities]]
 === object-cache-capacities
-The capacities for the memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
+The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
 
 The _cacheMinDeadCapacity_ specifies the minimum number of bytes that dead objects should consume when the cache is under pressure.
 
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 692f14a0d..fcbaa2ace 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -490,7 +490,8 @@ DATA = collections.OrderedDict([
         ('maximum-pages-in-cache',
          SettingValue(
              typ.Int(none_ok=True, minval=0, maxval=MAXVALS['int']), ''),
-         "The maximum number of pages to hold in the memory page cache.\n\n"
+         "The maximum number of pages to hold in the global memory page "
+         "cache.\n\n"
          "The Page Cache allows for a nicer user experience when navigating "
          "forth or back to pages in the forward/back history, by pausing and "
          "resuming up to _n_ pages.\n\n"
@@ -500,7 +501,7 @@ DATA = collections.OrderedDict([
         ('object-cache-capacities',
          SettingValue(
              typ.WebKitBytesList(length=3, maxsize=MAXVALS['int']), ''),
-         "The capacities for the memory cache for dead objects such as "
+         "The capacities for the global memory cache for dead objects such as "
          "stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, "
          "totalCapacity.\n\n"
          "The _cacheMinDeadCapacity_ specifies the minimum number of bytes "