Hello,
A Debian user pointed out that the manpages still mentioned some of
the removed modules. The attach patch either removes or updates the
manpages reference to the modules that were removed in 2.6.7.
Additionally it was also pointed out that FvwmDebug was not included
in the list of removed modules in the NEWS file.
Attached are patches to use as needed.
jaimos
--- a/doc/commands/Module.xml
+++ b/doc/commands/Module.xml
@@ -26,7 +26,6 @@ spawned. Currently several modules, incl
<fvwmref mod="FvwmButtons"/>,
<fvwmref mod="FvwmEvent"/>,
<fvwmref mod="FvwmForm"/>,
-<fvwmref mod="FvwmGtk"/>,
<fvwmref mod="FvwmPager"/>,
<fvwmref mod="FvwmScript"/>
support aliases. Aliases are useful if more than one instance of
@@ -53,12 +52,8 @@ Module FvwmForm MyForm
<fvwmref mod="FvwmCommandS"/> (a command server to use with shell's FvwmCommand client),
<fvwmref mod="FvwmConsole"/> (to execute fvwm commands directly),
<fvwmref mod="FvwmCpp"/> (to preprocess your <emphasis remap='I'>config</emphasis> with cpp),
-<fvwmref mod="FvwmDebug"/> (to help debug fvwm),
-<fvwmref mod="FvwmDragWell"/> (the place to drag&drop to),
<fvwmref mod="FvwmEvent"/> (trigger various actions by events),
<fvwmref mod="FvwmForm"/> (to bring up dialogs),
-<fvwmref mod="FvwmGtk"/> (to bring up <acronym>GTK</acronym> menus and dialogs),
-<fvwmref mod="FvwmIconBox"/> (like the mwm IconBox),
<fvwmref mod="FvwmIconMan"/> (a flexible icon manager),
<fvwmref mod="FvwmIdent"/> (to get window info),
<fvwmref mod="FvwmM4"/> (to preprocess your <emphasis remap='I'>config</emphasis> with m4),
@@ -66,16 +61,7 @@ Module FvwmForm MyForm
<fvwmref mod="FvwmPerl"/> (a Perl manipulator and preprocessor),
<fvwmref mod="FvwmProxy"/> (to locate and control obscured windows by using small proxy windows),
<fvwmref mod="FvwmRearrange"/> (to rearrange windows),
-<fvwmref mod="FvwmSave"/> (saves the desktop state in .xinitrc style),
-<fvwmref mod="FvwmSaveDesk"/> (saves the desktop state in fvwm commands),
<fvwmref mod="FvwmScript"/> (another powerful dialog toolkit),
-<fvwmref mod="FvwmScroll"/> (puts scrollbars on any window),
-<fvwmref mod="FvwmTabs"/> (a generic tabbing module),
-<fvwmref mod="FvwmTaskBar"/> (a Windows like task bar),
-<fvwmref mod="FvwmTheme"/> (managed colorsets, obsolete),
-<fvwmref mod="FvwmWharf"/> (an AfterStep like button bar),
-<fvwmref mod="FvwmWindowMenu"/> (a configurable fvwm menu listing current windows),
-<fvwmref mod="FvwmWinList"/> (a window list).
These modules have their own man
pages. There may be other modules out on there as well.</para>
--- a/doc/commands/Colorset.xml
+++ b/doc/commands/Colorset.xml
@@ -237,22 +237,15 @@ uses Colorset 10 as background. If you w
the
<emphasis>RootTransparent</emphasis>
option.
-<fvwmref mod="FvwmButtons"/>,
+<fvwmref mod="FvwmButtons"/>
<fvwmref mod="FvwmIconMan"/>,
-<fvwmref mod="FvwmIdent"/>,
-<fvwmref mod="FvwmScroll"/>
and
-<fvwmref mod="FvwmTaskBar"/>
+<fvwmref mod="FvwmIdent"/>,
are relatively simple. There is one main colorset option which
defines the background of the window and the other colorsets (if
any) are drawn on the foreground. The case of
-<fvwmref mod="FvwmWinList"/> and
-<fvwmref mod="FvwmProxy"/>
-are simpler. With
-<fvwmref mod="FvwmWinList"/>
-all the colorsets are drawn on the foreground and with
<fvwmref mod="FvwmProxy"/>
-the two colorsets refer to the window backgrounds.
+is simpler, the two colorsets refer to the window backgrounds.
<fvwmref mod="FvwmPager"/>
is more complicated as almost everything in the pager are windows
with some parental relations (the mini windows are the child and
--- a/doc/fvwm/initialization.xml
+++ b/doc/fvwm/initialization.xml
@@ -136,14 +136,14 @@ is used instead of ExitFunction.</para>
<fvwmref cmd="DestroyFunc"/> InitFunction
<fvwmref cmd="AddToFunc"/> InitFunction
+ I <fvwmref cmd="Module"/> <fvwmref mod="FvwmBanner"/>
- + I <fvwmref cmd="Module"/> <fvwmref mod="FvwmTaskBar"/>
+ + I <fvwmref cmd="Module"/> <fvwmref mod="FvwmIconMan"/>
+ I <fvwmref cmd="Exec"/> xsetroot -solid cyan
+ I <fvwmref cmd="Exec"/> xterm
+ I <fvwmref cmd="Exec"/> netscape
<fvwmref cmd="DestroyFunc"/> RestartFunction
<fvwmref cmd="AddToFunc"/> RestartFunction
- + I <fvwmref cmd="Module"/> <fvwmref mod="FvwmTaskBar"/>
+ + I <fvwmref cmd="Module"/> <fvwmref mod="FvwmIconMan"/>
<fvwmref cmd="DestroyFunc"/> SessionInitFunction
<fvwmref cmd="AddToFunc"/> SessionInitFunction
--- a/doc/commands/LocalePath.xml
+++ b/doc/commands/LocalePath.xml
@@ -87,8 +87,6 @@ parameter:</para>
available.</para>
<para>Note that the
-<fvwmref mod="FvwmTaskBar"/>
-module has its own catalog and that the
<fvwmref mod="FvwmScript"/>
module has a set of special instructions for string
translation. It is out of the scope of this discussion to explain
--- a/doc/commands/Style.xml
+++ b/doc/commands/Style.xml
@@ -1105,7 +1105,7 @@ window. This miniature icon can be drawn
(see
<fvwmref cmd="ButtonStyle"/>),
and can be used by various fvwm modules
-(<fvwmref mod="FvwmWinList"/>, <fvwmref mod="FvwmIconMan"/> and <fvwmref mod="FvwmTaskBar"/>).
+(<fvwmref mod="FvwmIconMan"/> and <fvwmref mod="FvwmPager"/>).
It takes the name of a pixmap as an argument.</para>
<para><fvwmopt cmd="Style" opt="WindowShadeShrinks"/> and <fvwmopt cmd="Style" opt="WindowShadeScrolls"/>
@@ -2265,8 +2265,8 @@ Style rxvt !State 11
<fvwmopt cmd="Style" opt="WindowListSkip"/>
styles do not appear in the menu that is created with the
<fvwmref cmd="WindowList"/>
-command or the lists shown in several modules like
-<fvwmref mod="FvwmIconMan"/> or <fvwmref mod="FvwmWinList"/>.
+command or the lists shown in modules like
+<fvwmref mod="FvwmIconMan"/>.
In the modules, the style can usually be ignored with an option.
Please refer to the man page of the module in question for
further information. To disable this feature, use the default
--- a/doc/commands/Wait.xml
+++ b/doc/commands/Wait.xml
@@ -44,8 +44,8 @@ After the xmh window appears control mov
<para>Fvwm remains partially functional during a wait, but any input
from the modules is queued up and processed only after the window
appears or the command is aborted. For example, windows can not
-be focused with <fvwmref mod="FvwmTaskBar"/> or
-<fvwmref mod="FvwmWinList"/> during a wait.</para>
+be focused with <fvwmref mod="FvwmIconMan"/> or
+<fvwmref mod="FvwmPager"/> during a wait.</para>
<para>You can escape from a
<emphasis remap='B'>Wait</emphasis>
--- a/doc/fvwm/colorsets.xml
+++ b/doc/fvwm/colorsets.xml
@@ -24,7 +24,8 @@ other color operations.</para>
<fvwmref mod="FvwmTheme"/>
was introduced to manage colorsets. Starting with the 2.5.x beta
version, the <fvwmref mod="FvwmTheme"/> functionality was moved to the core fvwm,
-so this module became obsolete.</para>
+so this module became obsolete. In 2.6.7 the <fvwmref mod="FvwmTheme"/>
+module was removed.</para>
<para>The old syntax:</para>
--- a/doc/fvwm/virtualDesktop.xml
+++ b/doc/fvwm/virtualDesktop.xml
@@ -29,11 +29,11 @@ windows on a range of desktops can be vi
<fvwmref mod="FvwmPager"/>,
a miniature view of the desktops. The pager is an accessory
program, called a module, which is not essential for the window
-manager to operate. Windows may also be listed, along with their
-geometries, in a window list, accessible as a pop-up menu, or as a
-separate window, called the
-<fvwmref mod="FvwmWinList"/>
-(another module).</para>
+manager to operate. Windows may also be listed using the
+<fvwmref cmd="WindowList"/>
+command or the
+<fvwmref mod="FvwmIconMan"/>
+module.</para>
<para>Fvwm keeps the windows on the desktop in a layered stacking order;
a window in a lower layer never obscures a window in a higher
--- a/doc/commands/Asterisk.xml
+++ b/doc/commands/Asterisk.xml
@@ -26,7 +26,6 @@ optional spaces, between the module name
this is recommended to avoid conflicts.</para>
<programlisting>
-*FvwmIconBox: MaxIconSize 48x48
*FvwmPager: WindowBorderWidth 1
*FvwmButtons-TopRight: Geometry 100x100-0+0
*FvwmButtons-Bottom: Geometry +0-0
--- a/doc/commands/DestroyModuleConfig.xml
+++ b/doc/commands/DestroyModuleConfig.xml
@@ -31,7 +31,7 @@ In this case a module name (or alias) ca
<programlisting>
DestroyModuleConfig FvwmButtons*
DestroyModuleConfig FvwmForm: Fore
-DestroyModuleConfig FvwmIconBox: Max*
+DestroyModuleConfig FvwmIconMan: Tips*
</programlisting>
--- a/modules/FvwmBacker/FvwmBacker.1.in
+++ b/modules/FvwmBacker/FvwmBacker.1.in
@@ -74,7 +74,7 @@ color names may be used).
If the \fIcommand\fP is \fIcolorset\fP FvwmBacker uses the background
specified in colorset \fIn\fP for the given desk. Please refer to
-the man page of the FvwmTheme module for details about colorsets.
+the fvwm man page for details about colorsets.
Otherwise the command is sent to fvwm to execute.
@@ -85,7 +85,7 @@ has been set. This works only for the
commands. This is useful for applications which want to use the root
Pixmap on the background to simulate transparency (for example,
Eterm and Aterm use this method). This option should also be used for the
-RootTransparent colorset option (see the FvwmTheme man page).
+RootTransparent colorset option.
Note: with a colorset background this command may add a lot of memory
to the X server. For example, this adds the pixmap width times height bytes
with a TiledPixmap
--- a/modules/FvwmButtons/FvwmButtons.1.in
+++ b/modules/FvwmButtons/FvwmButtons.1.in
@@ -113,7 +113,7 @@ This is the default.
.IP "*FvwmButtons: Colorset \fIcolorset\fP"
Tells the module to use colorset \fIcolorset\fP for the window
-background. Refer to the FvwmTheme man page
+background. Refer to the fvwm man page
for details about colorsets.
.IP "*FvwmButtons: ActiveColorset \fIcolorset\fP"
@@ -299,8 +299,8 @@ is not applied to the swallowed module.
in the module configuration. If the swallowed module has a
transparent colorset background, then the FvwmButtons background
(and not the button colorset) is seen by transparency of the
-background of the swallowed module. Refer to the man page of the
-FvwmTheme module for details about colorsets.
+background of the swallowed module. Refer to the fvwm man page
+for details about colorsets.
.IP "ActiveColorset \fIcolorset\fP"
Use colorset \fIcolorset\fP for the background color/image and/or title
--- a/modules/FvwmForm/FvwmForm.1.in
+++ b/modules/FvwmForm/FvwmForm.1.in
@@ -277,7 +277,7 @@ distance from the right (bottom) of the
If this option is omitted, FvwmForm starts at the center of the screen.
.TP 4
.B *FvwmForm: Colorset \fIn\fP
-Tells the module to use colorset \fIn\fP. See FvwmTheme.
+Tells the module to use colorset \fIn\fP.
.TP 4
.B *FvwmForm: Back \fIcolor\fP
Specifies the background color of the FvwmForm window
@@ -292,7 +292,7 @@ Switches off the Colorset option.
See DEFAULTS.
.TP 4
.B *FvwmForm: ItemColorset \fIn\fP
-Tells the module to use colorset \fIn\fP for items. See FvwmTheme.
+Tells the module to use colorset \fIn\fP for items.
.TP 4
.B *FvwmForm: ItemBack \fIcolor\fP
Specifies the background color for the text input windows, and
--- a/modules/FvwmIconMan/FvwmIconMan.1.in
+++ b/modules/FvwmIconMan/FvwmIconMan.1.in
@@ -183,7 +183,7 @@ specified height is 0, then the button h
size. X and Y coordinates are ignored.
.IP "*FvwmIconMan: [id] Colorset \fIcolorset\fP"
-The default colorset used. Overrides background and foreground. See FvwmTheme.
+The default colorset used. Overrides background and foreground.
.IP "*FvwmIconMan: [id] DrawIcons \fIvalue\fP"
If your version of fvwm is capable of using mini icons, then this option
@@ -198,7 +198,7 @@ both selected, and have the keyboard foc
.IP "*FvwmIconMan: [id] FocusAndSelectColorset \fIcolorset\fP"
Works like focusandselectbutton but uses colorsets instead. The style setting can
-still only be applied with focusandselectbutton. See FvwmTheme.
+still only be applied with focusandselectbutton.
.IP "*FvwmIconMan: [id] FocusButton \fIstyle\fP [\fIforecolor\fP \fIbackcolor\fP]"
Same as the plainbutton option, but specifies the look of buttons whose
@@ -206,7 +206,7 @@ windows have the keyboard focus.
.IP "*FvwmIconMan: [id] FocusColorset \fIcolorset\fP"
Works like focusbutton but uses colorsets instead. The style setting can still
-only be applied with focusbutton. See FvwmTheme.
+only be applied with focusbutton.
.IP "*FvwmIconMan: [id] FollowFocus \fIboolean\fP"
If \fItrue\fP, then the button appearance reflects
@@ -240,11 +240,11 @@ windows are iconified.
.IP "*FvwmIconMan: [id] IconAndSelectColorset \fIcolorset\fP"
Works like IconAndSelectButton but uses colorsets instead. The style setting
-can still only be applied with iconbutton. See FvwmTheme.
+can still only be applied with iconbutton.
.IP "*FvwmIconMan: [id] IconColorset \fIcolorset\fP"
Works like iconbutton but uses colorsets instead. The style setting can still
-only be applied with iconbutton. See FvwmTheme.
+only be applied with iconbutton.
.IP "*FvwmIconMan: [id] ManagerGeometry \fIgeometry\fP"
Specifies the initial geometry of the manager, in units of buttons. If
@@ -291,7 +291,7 @@ option is ignored, but must still be set
.IP "*FvwmIconMan: [id] PlainColorset \fIcolorset\fP"
Works like plainbutton but uses colorsets instead. The style setting can
-still only be applied with plainbutton. See FvwmTheme.
+still only be applied with plainbutton.
.IP "*FvwmIconMan: [id] ReliefThickness \fInum\fP"
\fInum\fP is an integer specifying the number of pixels thick
@@ -332,7 +332,7 @@ mouse is over them.
.IP "*FvwmIconMan: [id] SelectColorset \fIcolorset\fP"
Works like selectbutton but uses colorsets instead. The style setting can
-still only be applied with selectbutton. See FvwmTheme.
+still only be applied with selectbutton.
.IP "*FvwmIconMan: [id] Shape \fIboolean\fP"
If \fITrue\fP, then use make the window shaped. Probably only useful if you
@@ -448,7 +448,6 @@ font.
.IP "*FvwmIconMan: [id] TipsColorset \fIcolorset\fP"
Specifies the colors for tips window. Default is colorset 0.
-See FvwmTheme.
.IP "*FvwmIconMan: [id] TipsFormat \fIformatstring\fP"
Similar to the Format option but for the tips window. The default is
--- a/modules/FvwmIdent/FvwmIdent.1.in
+++ b/modules/FvwmIdent/FvwmIdent.1.in
@@ -54,7 +54,7 @@ FvwmIdent reads the same .fvwm2rc file a
and looks for lines as listed below:
.IP "*FvwmIdent: Colorset \fIn\fP"
-Tells the module to use colorset \fIn\fP. See FvwmTheme.
+Tells the module to use colorset \fIn\fP.
.IP "*FvwmIdent: Fore \fIcolor\fP"
Tells the module to use \fIcolor\fP instead of black for text. Switches off the
--- a/modules/FvwmPager/FvwmPager.1.in
+++ b/modules/FvwmPager/FvwmPager.1.in
@@ -380,25 +380,21 @@ the string to display in the balloons. T
.IP "*FvwmPager: Colorset \fIdesk colorset\fP"
Tells the module to use colorset \fIcolorset\fP for \fIdesk\fP. If
you use an asterisk '*' in place of \fIdesk\fP, the colorset is
-used on all desks. Please refer to the man page of the FvwmTheme
-module for details about colorsets.
+used on all desks.
.IP "*FvwmPager: BalloonColorset \fIdesk colorset\fP"
Tells the module to use colorset \fIcolorset\fP for balloons on
\fIdesk\fP. If you use an asterisk '*' in place of \fIdesk\fP, the
-colorset is used on all desks. Please refer to the man page of the
-FvwmTheme module for details about colorsets.
+colorset is used on all desks.
.IP "*FvwmPager: HilightColorset \fIdesk colorset\fP"
Tells the module to use colorset \fIcolorset\fP for hilighting on
\fIdesk\fP. If you use an asterisk '*' in place of \fIdesk\fP, the
-colorset is used on all desks. Please refer to the man page of the
-FvwmTheme module for details about colorsets.
+colorset is used on all desks.
.IP "*FvwmPager: WindowColorsets \fIcolorset activecolorset\fP"
-Uses colorsets in the same way as *FvwmPager: WindowColors. Please
-refer to the man page of the FvwmTheme module for details about
-colorsets. The shadow and hilight colors of the colorset are only
+Uses colorsets in the same way as *FvwmPager: WindowColors.
+The shadow and hilight colors of the colorset are only
used for the window borders if the *FvwmPager: Window3DBorders is
specified too.
--- a/modules/FvwmScript/FvwmScript.1.in
+++ b/modules/FvwmScript/FvwmScript.1.in
@@ -84,8 +84,6 @@ command or in the script with the Shadow
.IP "*FvwmScript: DefaultColorset \fIcolorset\fP"
Tells the module to use colorset \fIcolorset\fP as the default colorset.
-Refer to the FvwmTheme man page for details about
-colorsets.
.SH ANATOMY OF A SCRIPT
FvwmScript uses a particular programming language. A script is composed of
@@ -813,7 +811,7 @@ that the script has destroyed
FvwmScript-Buttons is a buttons panel which can replace FvwmButtons (this
script supports popup menus and requires xload, xclock, FvwmPager, TkDesk).
-FvwmScript-Colorset allows you to edit your colorset (see FvwmTheme).
+FvwmScript-Colorset allows you to edit your colorset.
FvwmScript-Date allows you to set date and time.
FvwmScript-FileBrowser is a file browser used by the other scripts.
FvwmScript-Find is an elementary front-end to find.
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ Changes in stable release 2.6.7 (06-Mar-
- GTK1.x support has been removed.
- GNOME-specific window hints (pre-EWMH) have been removed.
- Some fvwm modules have been removed:
+ - FvwmDebug (no replacement)
- FvwmDragWell (no replacement)
- FvwmGTK (no replacement)
- FvwmSave (no replacement)
