From ad23d1ec1ff555998de62243892d4b700a71fb53 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Sep 2018 10:43:48 +0200
Subject: [PATCH] docs: deprecate beaker.cache in docs

---
 docs/admin/enable-debug.rst |  8 +-------
 docs/admin/vcs-server.rst   | 38 ++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/docs/admin/enable-debug.rst b/docs/admin/enable-debug.rst
index 0d61f8f6..19cfa039 100644
--- a/docs/admin/enable-debug.rst
+++ b/docs/admin/enable-debug.rst
@@ -47,7 +47,7 @@ the ``debug`` level.
     ### LOGGING CONFIGURATION   ####
     ################################
     [loggers]
-    keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper
+    keys = root, sqlalchemy, rhodecode, ssh_wrapper
 
     [handlers]
     keys = console, console_sql, file, file_rotating
@@ -69,12 +69,6 @@ the ``debug`` level.
     ## "level = DEBUG" logs the route matched and routing variables.
     propagate = 1
 
-    [logger_beaker]
-    level = DEBUG
-    handlers =
-    qualname = beaker.container
-    propagate = 1
-
     [logger_rhodecode]
     level = DEBUG
     handlers =
diff --git a/docs/admin/vcs-server.rst b/docs/admin/vcs-server.rst
index 8f07438e..8bd9e368 100644
--- a/docs/admin/vcs-server.rst
+++ b/docs/admin/vcs-server.rst
@@ -113,33 +113,33 @@ match, for example:
 VCS Server Memory Optimization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To configure the VCS server to manage the cache efficiently, you need to
+To optimize the VCS server to manage the cache and memory usage efficiently, you need to
 configure the following options in the
 :file:`/home/{user}/.rccontrol/{vcsserver-id}/vcsserver.ini` file. Once
-configured, restart the VCS Server.
+configured, restart the VCS Server. By default we use an optimal settings, but in certain
+conditions tunning expiration_time and max_size can affect memory usage and performance
 
-.. rst-class:: dl-horizontal
+.. code-block:: ini
 
-    \beaker.cache.repo_object.type = memorylru
-        Configures the cache to discard the least recently used items.
-        This setting takes the following valid options:
+    ## cache region for storing repo_objects cache
+    rc_cache.repo_object.backend = dogpile.cache.rc.memory_lru
 
-        * ``memorylru``: The default setting, which removes the least recently
-          used items from the cache.
-        * ``memory``: Runs the VCS Server without clearing the cache.
-        * ``nocache``: Runs the VCS Server without a cache. This will
-          dramatically reduce the VCS Server performance.
+    ## cache auto-expires after N seconds, setting this to 0 disabled cache
+    rc_cache.repo_object.expiration_time = 300
 
-    \beaker.cache.repo_object.max_items = 100
-        Sets the maximum number of items stored in the cache, before the cache
-        starts to be cleared.
+    ## max size of LRU, old values will be discarded if the size of cache reaches max_size
+    ## Sets the maximum number of items stored in the cache, before the cache
+    ## starts to be cleared.
 
-        As a general rule of thumb, running this value at 120 resulted in a
-        5GB cache. Running it at 240 resulted in a 9GB cache. Your results
-        will differ based on usage patterns and |repo| sizes.
+    ## As a general rule of thumb, running this value at 120 resulted in a
+    ## 5GB cache. Running it at 240 resulted in a 9GB cache. Your results
+    ## will differ based on usage patterns and |repo| sizes.
+
+    ## Tweaking this value to run at a fairly constant memory load on your
+    ## server will help performance.
+
+    rc_cache.repo_object.max_size = 120
 
-        Tweaking this value to run at a fairly constant memory load on your
-        server will help performance.
 
 To clear the cache completely, you can restart the VCS Server.