Merge branch 'master' into trinidad

1 files changed, 3 insertions, 0 deletions

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index bf9705920..435042520 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -128,6 +128,9 @@ This document assumes you're an administrator.
         When requesting a random profile, check that it actually exists first
     [b]randprofile > retry[/b]
         Number of times to retry getting a random profile
+    [b]system > photo_cache_time[/b]
+        How long to cache photos, in seconds. Default is 86400 (1 day).
+        Longer time increases performance, but it also means it takes longer for changed permissions to apply.
 
 		
 #include doc/macros/main_footer.bb;