From 102fa1eaf846272744128f3a703cfeedab62c9bb Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Sat, 26 Jun 2010 11:08:35 +0200
Subject: [PATCH] Frameset is gone.

---
 gollem/templates/login/login.html | 1 -
 horde/config/conf.xml             | 2 +-
 horde/docs/CHANGES                | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gollem/templates/login/login.html b/gollem/templates/login/login.html
index a9e3dd0a9..940cbefcc 100644
--- a/gollem/templates/login/login.html
+++ b/gollem/templates/login/login.html
@@ -12,7 +12,6 @@
 <tag:form_input />
 <input type="hidden" name="gollem_loginform" value="1" />
 <input type="hidden" name="actionID" value="<tag:actionid />" />
-<input type="hidden" name="load_frameset" value="<tag:load_frameset />" />
 <input type="hidden" name="url" value="<tag:url />" />
 <input type="hidden" name="autologin" value="<tag:autologin />" />
 <input type="hidden" name="anchor_string" id="anchor_string" value="<tag:anchor_string />" />
diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 77b7a1144..6777bd147 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1526,7 +1526,7 @@
    </configmultienum>
 
    <configboolean name="always" desc="Should we &lt;strong&gt;always
-   &lt;/strong&gt; display the Horde frameset?">false</configboolean>
+   &lt;/strong&gt; display the Horde sidebar menu?">false</configboolean>
 
    <configsection name="links">
     <configenum name="help" desc="Should we display help links in the
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 2e2fb85b2..4f276567c 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.0-cvs
 --------
 
+[jan] Remove frameset.
 [jan] Remove dhtmlHistory library.
 [mms] Removed support for krb5 authentication driver.
 [jan] Allow to specify the URL parameter name for the alternate login setting.
-- 
2.11.0