3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f66863..aae3c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/03/10:
+   * Changed default toolbar layer to DOCK, as a large window could render
+     fluxbox useless to a new user otherwise (Mark)
+     Toolbar.cc doc/asciidoc/fluxbox.txt
    * Fixed changing iconbar text padding requiring a toolbar refresh (Mark)
      IconbarTool.cc
    * Fixed stealing focus from unmanaged windows (Mark)
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 5ee9745..d530584 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -732,7 +732,7 @@ session.screen0.slit.layer: <layer>
 session.screen0.toolbar.layer: <layer>
       With these two resources, you can set the layer you want the toolbar and
       the slit to appear on. Please read the LAYER section for more information.
-      Default: Desktop
+      Default: Dock
 
 session.screen0.slit.placement: <placement>
 session.screen0.toolbar.placement: <placement>
@@ -954,8 +954,9 @@ session.screen0.colPlacementDirection: TopToBottom|BottomToTop
       Default: LeftToRight/TopToBottom
 
 session.screen0.fullMaximization: <boolean>
-      If this setting is enabled, windows will maximize over the toolbar and
-      slit, no matter what their individual settings are. Default: False
+      If this setting is enabled, windows will maximize over the toolbar, slit,
+      and any other window that creates a strut, no matter what their individual
+      settings are. Default: False
 
 session.screen0.rootCommand: <command>
       This runs a command when fluxbox starts, intended for setting a default
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 4d2f191..6063b5e 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -229,7 +229,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
                        scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"),
     m_rc_alpha(scrn.resourceManager(), 255,
                        scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"),
-    m_rc_layernum(scrn.resourceManager(), Layer(Layer::DESKTOP),
+    m_rc_layernum(scrn.resourceManager(), Layer(Layer::DOCK),
                   scrn.name() + ".toolbar.layer", scrn.altName() + ".Toolbar.Layer"),
     m_rc_on_head(scrn.resourceManager(), 0,
                  scrn.name() + ".toolbar.onhead", scrn.altName() + ".Toolbar.onHead"),