aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-04-23 18:53:45 (GMT)
committermathias <mathias>2006-04-23 18:53:45 (GMT)
commit2fe2cf0c95e79e957bda59a4ac26e6cb4b4cdf0c (patch)
tree75756350de26d47bcb45bbe4966c9f035d931a4e
parentf25c72e79bd1a1c56ce484b314e02be2be059d0a (diff)
downloadfluxbox_pavel-2fe2cf0c95e79e957bda59a4ac26e6cb4b4cdf0c.zip
fluxbox_pavel-2fe2cf0c95e79e957bda59a4ac26e6cb4b4cdf0c.tar.bz2
fixed typos, patches from php-coder (slava)
-rw-r--r--ChangeLog2
-rw-r--r--doc/asciidoc/fluxbox.txt59
2 files changed, 37 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index a9ca1d2..e173f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/23: 3*06/04/23:
4 * Fixed typos in new docs (thanks Semushin Slava)
5 docs/asciidoc/fluxbox.txt
4 * Added support for _NET_WM_ALLOWED_ACTIONS and all the _NET_WM_ACTION_*, 6 * Added support for _NET_WM_ALLOWED_ACTIONS and all the _NET_WM_ACTION_*,
5 _NET_WM_STATE_MODAL and _NET_WM_WINDOW_TYPE_SPLASH. (Henrik) 7 _NET_WM_STATE_MODAL and _NET_WM_WINDOW_TYPE_SPLASH. (Henrik)
6 Ewmh.hh/cc, Window.hh, WinClient.hh, WinClientUtil.hh/cc 8 Ewmh.hh/cc, Window.hh, WinClient.hh, WinClientUtil.hh/cc
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 536e8d1..7008602 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -1,6 +1,6 @@
1fluxbox(1) 1fluxbox(1)
2========== 2==========
3Henri Kinnunen <fluxgen@fluxbox.org> 3Henrik Kinnunen <fluxgen@fluxbox.org>
4v0.9.15, 18th March 2006 4v0.9.15, 18th March 2006
5 5
6NAME 6NAME
@@ -9,7 +9,14 @@ fluxbox - A lightweight window manager for the X Windowing System
9 9
10SYNOPSIS 10SYNOPSIS
11-------- 11--------
12'fluxbox' [-vhi] [-rc rcfile] [-l logfile] [-d display] [-screens scr,scr] 12'fluxbox' [-v | -version]
13 [-h | -help]
14 [-i | -info]
15'fluxbox' [-rc rcfile]
16 [-log logfile]
17 [-display display]
18 [-screen scr,scr|all]
19 [-verbose]
13 20
14DESCRIPTION 21DESCRIPTION
15----------- 22-----------
@@ -39,7 +46,7 @@ standard features used by applications and desktop utilities.
39 46
40OPTIONS 47OPTIONS
41------- 48-------
42-d display, -display display:: 49-display display::
43 Start fluxbox on the specified display. Programs started by fluxbox 50 Start fluxbox on the specified display. Programs started by fluxbox
44 will share the DISPLAY environment variable also. 51 will share the DISPLAY environment variable also.
45-h, -help:: 52-h, -help::
@@ -47,13 +54,17 @@ OPTIONS
47-i, -info:: 54-i, -info::
48 Display useful information concerning the defaults and compiled-in 55 Display useful information concerning the defaults and compiled-in
49 options. 56 options.
50-l logfile:: 57-log logfile::
51 Starting fluxbox with this option will designate a file in which you 58 Starting fluxbox with this option will designate a file in which you
52 want to log events to. 59 want to log events to.
53-rc rcfile:: 60-rc rcfile::
54 Use a different config file other than the default ~/.fluxbox/init. 61 Use a different config file other than the default ~/.fluxbox/init.
55-v, -version:: 62-v, -version::
56 The version of fluxbox installed. 63 The version of fluxbox installed.
64-screen scr,scr|all::
65 Run on specified screens only or all (by default).
66-verbose::
67 Print more information in process.
57 68
58STARTING FLUXBOX 69STARTING FLUXBOX
59---------------- 70----------------
@@ -100,7 +111,7 @@ RootMenu and WorkspaceMenu
100~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 111~~~~~~~~~~~~~~~~~~~~~~~~~~~~
101From the RootMenu you can launch applications and configure fluxbox. The 112From the RootMenu you can launch applications and configure fluxbox. The
102WorkspaceMenu shows all windows and on which workspaces they are. See 113WorkspaceMenu shows all windows and on which workspaces they are. See
103section MENUS on how to customize thess menus. 114section MENUS on how to customize these menus.
104 115
105Toolbar 116Toolbar
106~~~~~~~ 117~~~~~~~
@@ -127,7 +138,7 @@ Slit
127Initially you won't be able to see the slit. It is there, it just isn't 138Initially you won't be able to see the slit. It is there, it just isn't
128being utilized yet. The slit confuses some people initially. Think of it 139being utilized yet. The slit confuses some people initially. Think of it
129as a dock where you can place smaller programs. If you've looked at any 140as a dock where you can place smaller programs. If you've looked at any
130screenshots on the offical fluxbox web site you'll have noticed some small 141screenshots on the official fluxbox web site you'll have noticed some small
131programs on the edge of some of the screens. These were more than likely 142programs on the edge of some of the screens. These were more than likely
132those docked programs in the slit. To learn more about the slit, we have 143those docked programs in the slit. To learn more about the slit, we have
133an entire section below that goes into detail about the options you have. 144an entire section below that goes into detail about the options you have.
@@ -234,7 +245,7 @@ if not all, of those here.
234 245
235- *Configure*: 246- *Configure*:
236 The next level under this menu is where you can set certain resources and 247 The next level under this menu is where you can set certain resources and
237 really begin to cus- tomize the look and feel of your desktop. 248 really begin to customize the look and feel of your desktop.
238 249
239- *System Styles*: 250- *System Styles*:
240 This is where the standard styles are listed. You can select one of these 251 This is where the standard styles are listed. You can select one of these
@@ -288,7 +299,7 @@ editing the init file, but this is a easier and faster way to most users.
288 Please read the FOCUS MODEL section at the end of this manual. 299 Please read the FOCUS MODEL section at the end of this manual.
289 300
290- *Slit*: 301- *Slit*:
291 This Menu can be opend by right clicking the slit (if visible). 302 This Menu can be opened by right clicking the slit (if visible).
292 303
293- *Placement*: 304- *Placement*:
294 This lets you set the position of the slit. 305 This lets you set the position of the slit.
@@ -299,7 +310,7 @@ editing the init file, but this is a easier and faster way to most users.
299- *Auto hide*: 310- *Auto hide*:
300 If enabled, the slit will disappear after a given amount of time and hide 311 If enabled, the slit will disappear after a given amount of time and hide
301 from the view of the user. You can make it appear if you move the mouse to 312 from the view of the user. You can make it appear if you move the mouse to
302 the edge of the desktop where the slit is psitioned. 313 the edge of the desktop where the slit is positioned.
303 314
304- *Maximize over*: 315- *Maximize over*:
305 If this is enabled, all windows, if you maximize them, will stretch 316 If this is enabled, all windows, if you maximize them, will stretch
@@ -333,14 +344,14 @@ editing the init file, but this is a easier and faster way to most users.
333 the window will be shown as a "border". 344 the window will be shown as a "border".
334 345
335- *Full Maximization*: 346- *Full Maximization*:
336 Enabling this will override the seperate settings for the slit/toolbar. 347 Enabling this will override the separate settings for the slit/toolbar.
337 Windows will always maximize over/under both of them. 348 Windows will always maximize over/under both of them.
338 349
339- *Focus New Window*: 350- *Focus New Window*:
340 If enabled, a newly opend window will gain focus. 351 If enabled, a newly opened window will gain focus.
341 352
342- *Focus Last Window on Workspace*: 353- *Focus Last Window on Workspace*:
343 This focuses the last window if switching back to a worspace if the option 354 This focuses the last window if switching back to a workspace if the option
344 is enabled. 355 is enabled.
345 356
346- *Windows Warping*: 357- *Windows Warping*:
@@ -506,7 +517,7 @@ The supported tags are:
506 When selected this item re-reads the current style and menu files and 517 When selected this item re-reads the current style and menu files and
507 applies any changes. This is useful for creating a new style or theme, 518 applies any changes. This is useful for creating a new style or theme,
508 as you don't have to constantly restart fluxbox every time you save 519 as you don't have to constantly restart fluxbox every time you save
509 your style. However, fluxbox automagically rereads the menu whenever 520 your style. However, fluxbox automatically rereads the menu whenever
510 it changes. 521 it changes.
511 522
512[restart] (label) \{command\};; 523[restart] (label) \{command\};;
@@ -567,7 +578,7 @@ Using '\' inserts a literal back-slash into the label/command/filename field.
567TOOLBAR 578TOOLBAR
568------- 579-------
569The toolbar is a small area to display information by fluxbox like a clock, 580The toolbar is a small area to display information by fluxbox like a clock,
570the identifier for the workspaces, a systemtray or a taskbar (iconbar) 581the identifier for the workspaces, a system tray or a taskbar (iconbar)
571that can contain the running programs. The color, look, font etc. is 582that can contain the running programs. The color, look, font etc. is
572defined in the the style and can't be defined as a global setting. 583defined in the the style and can't be defined as a global setting.
573 584
@@ -577,7 +588,7 @@ arguments given to the line:
577 session.screen0.toolbar.tools 588 session.screen0.toolbar.tools
578 589
579The order and the count of the Tools is freely selectable and has to be 590The order and the count of the Tools is freely selectable and has to be
580seperated by a ",". E.g.: 591separated by a ",". E.g.:
581 592
582 session.screen0.toolbar.tools: workspacename, systemtray, iconbar, clock 593 session.screen0.toolbar.tools: workspacename, systemtray, iconbar, clock
583 594
@@ -654,7 +665,7 @@ visible:
654- *Maximize Over*: 665- *Maximize Over*:
655 Enabling this option will prevent windows from maximizing over the 666 Enabling this option will prevent windows from maximizing over the
656 toolbar. With this switched on they will only dock to the edge of the bar. 667 toolbar. With this switched on they will only dock to the edge of the bar.
657 To use this option, "Full Maximazition" from the fluxbox Configuration 668 To use this option, "Full Maximization" from the fluxbox Configuration
658 menu has to be DISABLED. Otherwise this option will not work. 669 menu has to be DISABLED. Otherwise this option will not work.
659 670
660 session.screen0.toolbar.maxOver: <boolean> 671 session.screen0.toolbar.maxOver: <boolean>
@@ -673,7 +684,7 @@ visible:
673 session.screen0.toolbar.placement: <direction> 684 session.screen0.toolbar.placement: <direction>
674 685
675- *Alpha*: 686- *Alpha*:
676 This sets the alpa value for the toolbar. Use the left mouse-button to 687 This sets the alpha value for the toolbar. Use the left mouse-button to
677 decrease and the right mouse-button to increase the value. 0 is invisible, 688 decrease and the right mouse-button to increase the value. 0 is invisible,
678 255 is not transparent at all. 689 255 is not transparent at all.
679 690
@@ -686,17 +697,17 @@ visible:
686 - *None*: 697 - *None*:
687 will show not a single window 698 will show not a single window
688 - *Icons*: 699 - *Icons*:
689 will only show the windows of all workspaces that are minimzed 700 will only show the windows of all workspaces that are minimized
690 (iconified) 701 (iconified)
691 - *NoIcons*: 702 - *NoIcons*:
692 will only show the windows of all workspaces that are not minimzed 703 will only show the windows of all workspaces that are not minimized
693 (iconified) 704 (iconified)
694 - *WorkspaceIcons*: 705 - *WorkspaceIcons*:
695 will only show the windows of the current workspace that are 706 will only show the windows of the current workspace that are
696 minimzed (iconified) 707 minimized (iconified)
697 - *WorkspaceNoIcons*: 708 - *WorkspaceNoIcons*:
698 will only show the windows of the current workspace that are not 709 will only show the windows of the current workspace that are not
699 minimzed (iconified) 710 minimized (iconified)
700 - *Workspace*: 711 - *Workspace*:
701 will show all windows of the current workspace 712 will show all windows of the current workspace
702 - *All Windows*: 713 - *All Windows*:
@@ -1265,7 +1276,7 @@ specify colors, textures, pixmaps and fonts, and thus the overall look of your
1265window borders, menus and the toolbar. 1276window borders, menus and the toolbar.
1266 1277
1267The default installation of fluxbox provides some of these style files. See 1278The default installation of fluxbox provides some of these style files. See
1268fluxstyle(1) to accomodate the growing number of style components. 1279fluxstyle(1) to accommodate the growing number of style components.
1269 1280
1270APPLICATIONS 1281APPLICATIONS
1271------------ 1282------------
@@ -1485,7 +1496,7 @@ and to the last window that was focused.
1485THE SLIT 1496THE SLIT
1486-------- 1497--------
1487The slit is a special fluxbox window frame that can contain dockable 1498The slit is a special fluxbox window frame that can contain dockable
1488applicatioins, e.g. 'bbtools' or 'wmapps'. 1499applications, e.g. 'bbtools' or 'wmapps'.
1489 1500
1490When applications are run in the slit they have no window borders of their 1501When applications are run in the slit they have no window borders of their
1491own; instead they are framed in the slit, and they are always visible in the 1502own; instead they are framed in the slit, and they are always visible in the
@@ -1585,7 +1596,7 @@ This manpage is the combined work of:
1585- Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11) 1596- Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11)
1586 1597
1587- Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11) 1598- Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11)
1588- Grupert <grubert at users sourceforge net> (fluxbox) 1599- Grubert <grubert at users sourceforge net> (fluxbox)
1589 1600
1590- Matthew Hawkins <matt at mh dropbear id au> (blackbox) 1601- Matthew Hawkins <matt at mh dropbear id au> (blackbox)
1591- Wilbert Berendsen <wbsoft at xs4all nl> (blackbox) 1602- Wilbert Berendsen <wbsoft at xs4all nl> (blackbox)