aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-08-21 12:04:29 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-18 21:04:27 (GMT)
commit0b46ff32e0bb7d48e6d3aa88f1d95a1805bdbc6b (patch)
treea36250824dd7806cbce2028f6f5e7a1b1905aff9
parent9e93ff6c5303a3d53a55df02461f3f81796729dd (diff)
downloadfluxbox_pavel-0b46ff32e0bb7d48e6d3aa88f1d95a1805bdbc6b.zip
fluxbox_pavel-0b46ff32e0bb7d48e6d3aa88f1d95a1805bdbc6b.tar.bz2
Documentation: update fluxbox(1) with the new default config file names
-rw-r--r--doc/asciidoc/fluxbox.txt21
1 files changed, 10 insertions, 11 deletions
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index bf552b3..61c93b3 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -74,7 +74,7 @@ OPTIONS
74 Starting fluxbox with this option will designate a file in which you 74 Starting fluxbox with this option will designate a file in which you
75 want to log events to. 75 want to log events to.
76*-rc* 'rcfile':: 76*-rc* 'rcfile'::
77 Use a different config file other than the default *~/.fluxbox/init*. 77 Use a different config file other than the default *~/.fluxbox/init.lua*.
78*-v*, *-version*:: 78*-v*, *-version*::
79 The version of fluxbox installed. 79 The version of fluxbox installed.
80*-screen* all|'scr','scr'...:: 80*-screen* all|'scr','scr'...::
@@ -105,7 +105,7 @@ file location, this is where you can provide a system-wide menu file for your
105users. 105users.
106 106
107On exit or restart, fluxbox will save user defaults in the file 107On exit or restart, fluxbox will save user defaults in the file
108*~/.fluxbox/init*. Resources in this file can also be edited by hand, see the 108*~/.fluxbox/init.lua*. Resources in this file can also be edited by hand, see the
109*RESOURCES* section for more details. *fluxbox(1)* also has many tools to edit 109*RESOURCES* section for more details. *fluxbox(1)* also has many tools to edit
110these; look through the main menu once fluxbox has started to find different 110these; look through the main menu once fluxbox has started to find different
111ways of managing your session. 111ways of managing your session.
@@ -799,12 +799,11 @@ All changes take effect immediately. Here are the settings:
799 255 is not transparent at all. 799 255 is not transparent at all.
800 800
801*Clients*::: 801*Clients*:::
802 This submenu lets you reorder the the applications running in the 802 This submenu lets you reorder the the applications running in the slit. You
803 slit. You are able to hide apps from the slit by unselecting them in the 803 are able to hide apps from the slit by unselecting them in the list showing.
804 list showing. This will not kill the app. You can make them re-appear by 804 This will not kill the app. You can make them re-appear by selecting them in
805 selecting them in the list. The "Save SlitList" option saves the new order 805 the list. The "Save SlitList" option saves the new order to the
806 to you slitlist located in *~/.fluxbox/slitlist*. See the next section for 806 *session.screen0.slit.clientList* resource.
807 details.
808 807
809LAYERS 808LAYERS
810------ 809------
@@ -830,7 +829,7 @@ method is described in *fluxbox-apps(5)*.
830 829
831RESOURCES 830RESOURCES
832--------- 831---------
833Usually the *~/.fluxbox/init* resource file is created and maintained by 832Usually the *~/.fluxbox/init.lua* resource file is created and maintained by
834fluxbox itself. You can use the *Configure Menu*, mentioned above, to set most 833fluxbox itself. You can use the *Configure Menu*, mentioned above, to set most
835of these options. However, we'll cover all of the resource options that are 834of these options. However, we'll cover all of the resource options that are
836available to the user. If you edit this file while fluxbox is running, you must 835available to the user. If you edit this file while fluxbox is running, you must
@@ -1211,14 +1210,14 @@ be located in the user's *~/.fluxbox* directory.
1211 1210
1212*session.screen0.windowMenu* = "'location'":: 1211*session.screen0.windowMenu* = "'location'"::
1213This optionally specifies the location of a user-defined window menu. If left 1212This optionally specifies the location of a user-defined window menu. If left
1214blank, it will use *~/.fluxbox/windowmenu*. 1213blank, it will use *~/.fluxbox/windowmenu.lua*.
1215+ 1214+
1216Default: *blank* 1215Default: *blank*
1217 1216
1218ENVIRONMENT 1217ENVIRONMENT
1219----------- 1218-----------
1220*HOME*:: 1219*HOME*::
1221 fluxbox uses *$HOME* to find the .fluxbox/init file and to resolve style file 1220 fluxbox uses *$HOME* to find the .fluxbox/init.lua file and to resolve style file
1222 and -directory names. 1221 and -directory names.
1223 1222
1224*DISPLAY*:: 1223*DISPLAY*::