Merge branch '0.9.x'

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 726ef165af43bf90214866efe0b251eea8b8616a..4a8aba104e26849c7c7988f5b7d99e4c03238b7b 100644 (file)
--- a/README
+++ b/README
@@ -1148,6 +1148,9 @@ ssl: Whether to use SSL for JavaScript files. Default is null, which means
 sslserver: SSL server to use when page is HTTPS-encrypted. If
     unspecified, site ssl server and so on will be used.
 sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
+bustframes: If true, all web pages will break out of framesets. If false,
+           can comfortably live in a frame or iframe... probably. Default
+           to true.
 
 xmpp
 ----