M doc/fluxbox.1.in → doc/fluxbox.1.in

@@ -783,11 +783,11 @@ .EE
 .SH TITLEBAR FILE
 Fluxbox lets you customise the button layout on the window titlebar.  This is
 done by modifying the
-.IR ~/.fluxbox/titlebar
+.IR ~/.fluxbox/init
 file.
 .EX
-Right: minimize maximize close
-Left: sticky
+session.titlebar.right: minimize maximize close
+session.titlebar.left: sticky
 .EE
 .SH THE SLIT
 The slit is a special Fluxbox window frame that can contain dockable

M src/Makefile.am → src/Makefile.am

@@ -25,7 +25,6 @@ 
 
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
-DEFAULT_TITLEBAR=$(pkgdatadir)/titlebar
 DEFAULT_KEYSFILE=$(pkgdatadir)/keys
 DEFAULT_INITFILE=
 
@@ -33,7 +32,6 @@ CPPFLAGS= -Wall @CPPFLAGS@ \
 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DDEFAULTTITLEBAR=\"$(DEFAULT_TITLEBAR)\"\
 -DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\
 -DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"