Changeset a861450

Timestamp:

12/13/2014 11:17:27 AM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

eba08ed

Parents:

a0814e3e

Message:

IceWM-1.3.8: Fix example menu and reformat xml.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15201 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/wm/icewm.xml (modified) (11 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
          <listitem>
+          <para>[fernando] - IceWM-1.3.8: Fix example menu and
+          reformat xml.</para>
+        </listitem>
+         <listitem>
           <para>[fernando] - Update to gpgme-1.5.3. Fixes
           <ulink url="&blfs-ticket-root;5944">#5944</ulink>.</para>

x/wm/icewm.xml

@@ -103 +103 @@
     <title>Command Explanations</title>
 
-    <para><parameter>sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/' src/Makefile.in</parameter>:
-    this fixes the build with recent versions of <application>binutils</application>.
+    <para>
+      <parameter>sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/'
+      src/Makefile.in</parameter>: this fixes the build with recent versions of
+      <application>binutils</application>.
     </para>
 
@@ -116 +118 @@
 
       <para><filename>~/.icewm/keys</filename>,
-      <filename>~/.icewm/menu</filename>, and
-      <filename>~/.icewm/preferences</filename>, and
-      <filename>~/.icewm/toolbar</filename>, and
-      <filename>~/.icewm/winoptions</filename>. The default versions are installed
-      in <filename class="directory">/usr/share/icewm/</filename> and will be used
-      if you have not copied them to <filename class="directory">~/.icewm</filename>.
+        <filename>~/.icewm/menu</filename>, and
+        <filename>~/.icewm/preferences</filename>, and
+        <filename>~/.icewm/toolbar</filename>, and
+        <filename>~/.icewm/winoptions</filename>. The default versions are
+        installed in <filename class="directory">/usr/share/icewm/</filename>
+        and will be used if you have not copied them to <filename
+        class="directory">~/.icewm</filename>.
       </para>
 
@@ -149 +152 @@
       <title>Configuration Information</title>
 
-      <para>If <application>IceWM</application> is the only Window Manager
-      you want to use, you can start it with an <filename>.xinitrc</filename>
-      file in your home folder. Be sure to backup your
-      current <filename>.xinitrc</filename> before proceeding.</para>
+      <para>If <application>IceWM</application> is the only Window Manager you
+      want to use, you can start it with an <filename>.xinitrc</filename> file
+      in your home folder. Be sure to backup your current
+      <filename>.xinitrc</filename> before proceeding.</para>
 
       <indexterm zone="icewm icewm-config">
@@ -170 +173 @@
 cp -v /usr/share/icewm/winoptions ~/.icewm/winoptions</userinput></screen>
 
-      <para>You can now edit these files to meet your requirements. In particular,
-      review the <filename>preferences</filename> file. You can use
+      <para>You can now edit these files to meet your requirements. In
+      particular, review the <filename>preferences</filename> file. You can use
       <command>Logout -> Restart-IceWM</command> on the main menu to load your
       changed preferences, but changes to the background only take effect when
@@ -181 +184 @@
       old applications on the main menu, everything else on the
       <command>Programs</command> menu) will benefit from being updated to meet
-      your needs. The following examples are  provided to encourage you to think
-      about how you wish to organise your menus. Please note the following:</para>
+      your needs. The following examples are  provided to encourage you to
+      think about how you wish to organise your menus. Please note the
+      following:</para>
 
       <itemizedlist>
@@ -188 +192 @@
           <para>If a program listed in the menu has not been installed, it will
           not appear when the menu is displayed. Similarly, if the program
-          exists but the specified icon does not, no icon will be displayed in the
-          menu.</para>
+          exists but the specified icon does not, no icon will be displayed in
+          the menu.</para>
         </listitem>
         <listitem>
@@ -195 +199 @@
           <filename>.png</filename> files, and there is no need to specify the
           extension. If the icon is located in the &quot;library&quot;
-          (<filename class="directory">/usr/share/icewm/icons</filename>) there is
-          no need to specifiy the path.</para>
-        </listitem>
-        <listitem>
-          <para>Most programs are in sub-menus, and the main menu will always append
-          entries for <literal>windows, help, settings, logout</literal> at the
-          bottom.</para>
-        </listitem>
-        <listitem>
-          <para>An icon for <application>firefox</application> was copied to the
-          library directory and given a meaningful name. The icon for
-          <application>xine</application> is <filename>xine.xpm</filename> which
-          was installed to a pixmap directory.</para>
+          (<filename class="directory">/usr/share/icewm/icons</filename>) there
+          is no need to specifiy the path.</para>
+        </listitem>
+        <listitem>
+          <para>Most programs are in sub-menus, and the main menu will always
+          append entries for <literal>windows, help, settings, logout</literal>
+          at the bottom.</para> </listitem>
+        <listitem>
+          <para>An icon for <application>firefox</application> was copied to
+          the library directory and given a meaningful name. The icon for
+          <application>xine</application> is <filename>xine.xpm</filename>
+          which was installed to a pixmap directory.</para>
         </listitem>
         <listitem>
@@ -214 +217 @@
       </itemizedlist>
 
-      <para>It is unlikely that these examples meet your desires, but if you wish
-      to use them run the following commands:</para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.icewm/menu &lt;&lt; "EOF"
+      <para>It is unlikely that these examples meet your desires, but if you
+      wish to use them run the following commands:</para>
+
+<screen role="nodump"><userinput>cat &gt; ~/.icewm/menu &lt;&lt; "EOF" &amp;&amp;
 <literal>prog Urxvt xterm urxvt
 prog GVolWheel /usr/share/pixmaps/gvolwheel/audio-volume-medium gvolwheel
@@ -224 +227 @@
 menufile Multimedia folder multimedia
 menufile Tool_bar folder toolbar</literal>
-EOF &amp;&amp;
->cat &gt; ~/.icewm/general &lt;&lt; "EOF"
+EOF
+cat &gt; ~/.icewm/general &lt;&lt; "EOF" &amp;&amp;
 <literal>prog Firefox firefox firefox
 prog Epiphany /usr/share/icons/gnome/16x16/apps/web-browser epiphany
@@ -234 +237 @@
 prog Evince /usr/share/icons/hicolor/16x16/apps/evince evince
 prog Epdfview /usr/share/epdfview/pixmaps/icon_epdfview-48 epdfview</literal>
-EOF &amp;&amp;
->cat &gt; ~/.icewm/multimedia &lt;&lt; "EOF"
+EOF
+cat &gt; ~/.icewm/multimedia &lt;&lt; "EOF"
 <literal>prog Audacious /usr/share/icons/hicolor/48x48/apps/audacious audacious
 separator
@@ -242 +245 @@
 prog Vlc /usr/share/icons/hicolor/16x16/apps/vlc vlc
 prog Xine /usr/share/pixmaps/xine xine</literal>
-EOF &amp;&amp;</userinput></screen>
-
-      <para>If you wish to put icons on your desktop, you will need to install a
-      program such as <xref linkend="rox-filer"/> which provides a pinboard. If you
-      do that you will no longer be able to access the menu by right-clicking on the
-      desktop, you will have to use the <application>IceWM</application> button. To
-      ensure that the <application>rox</application> pinboard is running, the
-      following commands will put it in the startup file:</para>
+EOF</userinput></screen>
+
+      <para>If you wish to put icons on your desktop, you will need to install
+      a program such as <xref linkend="rox-filer"/> which provides a pinboard.
+      If you do that you will no longer be able to access the menu by
+      right-clicking on the desktop, you will have to use the
+      <application>IceWM</application> button. To ensure that the
+      <application>rox</application> pinboard is running, the following
+      commands will put it in the startup file:</para>
 
 <screen role="nodump"><userinput>cat &gt; ~/.icewm/startup &lt;&lt; "EOF"