Merge lp:~jjfrv8/xubuntu-docs/chapters-3-4-revisions into lp:xubuntu-docs/trusty

[Jack Fromm]

Revised guide-desktop and settings-preferences to reflect Whisker Menu and new panel changes.
Added four new icons to the images folder display how they look on Whisker Menu.
Added a duplicate set of entities for all the Settings Manager entries to display the Whisker Menu icon.

[David Pires (slickymaster)]

In my opinion, the new icons added, are a good and needed addition hence they should be merged and used throughout the documentation.

[lp:~jjfrv8/xubuntu-docs/chapters-3-4-revisions]

149. By Jack Fromm <email address hidden> on 2014-03-07

Revised guide-desktop and settings-preferences to reflect changes in new panel.

[Pasi Lallinaho (knome)]

I will drop the mention of any specific release when merging in:

+ <para>Beginning with version 14.04, Trusty Tahr, the Xubuntu desktop has a single panel which is located at the top of the screen.</para>

Otherwise good as it is.

review: Approve

=== modified file 'desktop-guide/C/guide-desktop.xml'
--- desktop-guide/C/guide-desktop.xml	2014-01-29 11:50:18 +0000
+++ desktop-guide/C/guide-desktop.xml	2014-03-07 13:19:24 +0000
@@ -18,45 +18,18 @@
 	<section id="desktop">
 		<title>Desktop</title>
 
-		<para>Your desktop has two panels: one on top, which is always visible, and one at the bottom
-			of the screen, which is hidden when not in use.</para>
+		<para>Beginning with version 14.04, Trusty Tahr, the Xubuntu desktop has a single panel which is located at the top of the screen.</para>
 
 		<section id="desktop-top-panel">
-			<title>Top Panel</title>
-
-			<para>The top panel is mainly used for starting applications and navigating to different
-				places on your computer. It also comes with an <guilabel>Action button</guilabel>,
-				<guilabel>Workspace Switcher</guilabel>, <guilabel>Notification Area</guilabel> and a
-				clock. Clicking on &appmenu; will open the <guilabel>Applications Menu</guilabel>,
-				offering you many choices of applications to start. Note that you can also access the
-				<guilabel>Settings Manager</guilabel>, <guilabel>Help</guilabel>, and a logout dialog from the	
-				menu. Clicking on the <guilabel>Action button</guilabel> (your username in the upper
-				right) will bring up a menu with choices for logging out, shutting down, locking the
-				screen, switching users and, depending on your hardware, suspending or hibernating your
-				computer.</para>
-
-			<para>To the left of the <guilabel>Action button</guilabel> is the <guilabel>Workspace
-				Switcher</guilabel> which looks like two colored rectangles. Clicking on these allows
-				you to instantly switch between two different workspaces which can each contain
-				different running applications. If you're used to running many applications
-				simultaneously, this is a handy way to keep your screen from getting too crowded.</para>
-
-			<para>To the left of the clock is the <guilabel>Notification Area</guilabel>. Here you will
-				see icons displaying the status of your network connection and the system sound volume. 
-				Other notification icons may appear as necessary, for instance when software updates 
-				are available.</para>
-		</section>
-
-		<section id="desktop-bottom-panel">
-			<title>Bottom Panel</title>
-
-			<para>At the bottom of the screen is a hidden panel called the Launcher Panel. To see this
-				panel, drag your mouse to the bottom of the screen and pause there. As the name
-				indicates, the purpose of this panel is to provide you with a quick way to launch any of
-				the most commonly used Xubuntu applications with a single click. Hovering over each icon
-				with your mouse will display the name of the application.</para>
-		</section>
-
+			<title>The Panel</title>
+
+			<para>The panel is used for starting and switching applications and for receiving information about your system. On the left side of the panel you will see the Xubuntu logo, &appmenu;. Clicking on this icon will open the <guilabel>Menu</guilabel>, offering you many choices of applications to start. Along the bottom of the menu window are icons for <guilabel>Settings Manager &settings;</guilabel> , <guilabel>Lock Screen &lockscreen;</guilabel> and <guilabel>Log Out &logout;</guilabel> .</para>
+
+			<para>The middle section of the panel is dedicated to window buttons for open applications. On the far right is the clock, displaying the date and time. To the left of that is the <guilabel>Notification Area</guilabel>. Here you will see indicators which give you information on your system, including network connectivity, sound volume level, battery status (when appropriate), instant messages and more. Some notification icons will only appear as necessary, for instance when software updates are available.</para>
+
+			<para>Both the position of the panel as well as the items it contains are configurable. The <guilabel>Menu</guilabel> is also customizable. See <xref linkend="settings-preferences" /> for more information on those topics.</para>
+		</section>
+		
 		<section id="desktop-desktop">
 			<title>The Desktop</title>
 
@@ -166,6 +139,8 @@
 				Style</guimenuitem></menuchoice>. If you prefer a tree view in the left pane, choose
 				<menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem>
 				<guimenuitem>Tree</guimenuitem></menuchoice>.</para>
+
+			<para>For more choices, explore the options under <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.</para>
 		</section>
 	</section>
 </chapter>

=== modified file 'desktop-guide/C/settings-preferences.xml'
--- desktop-guide/C/settings-preferences.xml	2014-02-11 13:31:35 +0000
+++ desktop-guide/C/settings-preferences.xml	2014-03-07 13:19:24 +0000
@@ -12,13 +12,29 @@
 	<title>Settings and Preferences</title>
 
 	<para>The options to customize Xubuntu to your needs and preferences are virtually unlimited, ranging from desktop looks to low level operation tweaks. The sections in this chapter describe how to keep your personal information updated, customize the looks of the desktop and edit the main applications menu to your liking.</para>
-	
-	<section id="personal-info">
+
+	<section id="whisker-menu">
+		<title>Customizing the Menu</title>
+
+		<para>Xubuntu 14.04 features a new menu called <application>Whisker Menu</application>. It was chosen, in part, because it is so simple to navigate and customize.</para>
+
+		<para>The easiest and probably most useful tweak you can make to the Menu is to customize your <guilabel>Favorites</guilabel>. Accomplishing this is a simple matter of locating the application you want, right-clicking on it and selecting <guilabel>Add to Favorites</guilabel>. From that same right-click popup, you can also choose to add the application to the Desktop or to the Panel. Right-clicking on applications already in <guilabel>Favorites</guilabel> gives you to option to remove them or to sort the list. You can also rearrange <guilabel>Favorites</guilabel> just by dragging them.</para>
+
+		<para>If you're not sure where a program is listed or what it is called, you can use the search feature. When you open the Menu, your cursor is already positioned in the search bar. Just start typing and an incremental search is performed on both application names and descriptions. Once you see your application listed in the results, you can directly launch it or right-click on it and add it to your preferred launch location.</para>
+
+		<para>For more options to customize the Menu, right-click on &appmenu; and select <guilabel>Properties</guilabel>. There you will find three tabs to change <guilabel>Appearance</guilabel>, <guilabel>Behavior</guilabel> and <guilabel>Search Actions</guilabel>.
+		</para>
+
+		<para>To add directories and launchers which don't appear as entries in the default Menu, you'll need another tool. A more advanced menu editing utility called MenuLibre can be found by clicking &wm-settings-menulibre;. Using this editor you can create, hide and reorder the directories which appear in the right-hand pane of the Menu. Within those directories you can then create application launchers and customize their behavior by configuring the many options available in this utility. For more in-depth information on how to use all of those options, consult the <ulink url="&menulibre-help;">MenuLibre</ulink> online documenation.</para>
+
+	</section>
+
+		<section id="personal-info">
 		<title>Customizing your personal info</title>
 		
 		<para><application>Mugshot</application> is a lightweight user configuration utility that allows you to easily set the profile image and user details for your user profile and any supported applications.</para>
 		
-		<para>To launch <application>Mugshot</application> navigate to &settings-mugshot;.</para>
+		<para>To launch <application>Mugshot</application> navigate to &wm-settings-mugshot;.</para>
 		
 		<para>To change your profile image, click the <guibutton>image</guibutton> button on the left of the GUI, select one of the given options and follow the instructions.</para>
 		
@@ -40,7 +56,7 @@
 		<section id="customizing-wallpaper">
 			<title>Changing your wallpaper</title>
 			
-			<para>You can easily change your desktop wallpaper navigating to &settings-desktop;, or alternatively, by right clicking your desktop and selecting the <menuchoice><guimenuitem>Desktop Settings...</guimenuitem></menuchoice> option.</para>
+			<para>You can easily change your desktop wallpaper navigating to &wm-settings-desktop;, or alternatively, by right clicking your desktop and selecting the <menuchoice><guimenuitem>Desktop Settings...</guimenuitem></menuchoice> option.</para>
 
 			<para>Once the <application>Desktop</application> settings dialog is open, the <guilabel>Background</guilabel> tab gives you options for configuring the look of your desktop background. You can choose to use a single image or multiple images as wallpaper or you can use a color scheme.</para>
 						
@@ -73,15 +89,17 @@
 				configuration:</para>
 
 			<itemizedlist>
-				<listitem><para>Right-click any panel</para></listitem>
+				<listitem><para>Right-click on an empty area of the panel</para></listitem>
 				<listitem><para>From the context menu, select <menuchoice><guimenuitem>Panel</guimenuitem>
 					<guimenuitem>Panel Preferences</guimenuitem></menuchoice></para></listitem>
-				<listitem><para>At the top of the dialog, you can select which panel to edit, add a new panel
-					or delete an existing panel</para></listitem>
-				<listitem><para>In the <guilabel>Display</guilabel> tab, you can control the selected
-					panel appearance</para></listitem>
-				<listitem><para>In the <guilabel>Items</guilabel> tab, you can control the selected
-					panel applets and other items</para></listitem>
+				<listitem><para>In the <guilabel>Display</guilabel> tab, you can control the panel's size and positioning, including:</para>
+					<itemizedlist>
+						<listitem><para>Displaying the panel vertically along either side of the screen</para></listitem>
+						<listitem><para>Moving the panel to the bottom or the right by unchecking <guilabel>Lock panel</guilabel>, grabbing the handle which appears at either side of the panel and dragging it</para></listitem>
+						<listitem><para>Extending the panel across multiple monitors</para></listitem>
+					</itemizedlist></listitem>
+				<listitem><para>In the <guilabel>Appearance</guilabel> tab, you can pick another background for the panel and regulate its transparency</para></listitem>
+				<listitem><para>In the <guilabel>Items</guilabel> tab, you can add, remove and rearrange panel applets and other items</para></listitem>
 			</itemizedlist>
 		</section>
 
@@ -92,13 +110,13 @@
 
 			<itemizedlist>
 				<listitem><para>xfwm themes - control how your window borders look. To change your xfwm
-					theme, go to &settings-window-manager;. In the <guilabel>Style</guilabel> tab, select
+					theme, go to &wm-settings-window-manager;. In the <guilabel>Style</guilabel> tab, select
 					a new theme to change the window borders appearance.</para></listitem>
 				<listitem><para>GTK themes - control how the content of the windows look. To change your
-					GTK theme, go to &settings-appearance;. In the <guilabel>Style</guilabel> tab, select
+					GTK theme, go to &wm-settings-appearance;. In the <guilabel>Style</guilabel> tab, select
 					a new theme to change the window content appearance.  The tool <application>gtk-theme-config</application> will also allow you to customize your window look.</para></listitem>
 				<listitem><para>Icon themes - control how your icons look. To change your icon theme, go
-					to &settings-appearance;. In the <guilabel>Icons</guilabel> tab, select a new theme
+					to &wm-settings-appearance;. In the <guilabel>Icons</guilabel> tab, select a new theme
 					to change the icon appearance. Note that not all icon sets will work well with dark
 					panel/window backgrounds!</para></listitem>
 			</itemizedlist>
@@ -139,7 +157,7 @@
 				by default. In the default Xubuntu configuration, the Xfce compositor is used to draw
 				shadows for windows and to enable translucent panels. If you have a low-end GPU or you
 				don't like the desktop effects mentioned, you can turn off the compositor or change the
-				settings by navigating to &settings-window-manager-tweaks; and in the
+				settings by navigating to &wm-settings-window-manager-tweaks; and in the
 				<guilabel>Compositor</guilabel> tab either unticking <guilabel>Enable display
 				compositing</guilabel> or modifying settings.</para>
 		</section>

=== added file 'desktop-guide/libs/images/preferences-desktop.png'
Binary files desktop-guide/libs/images/preferences-desktop.png	1970-01-01 00:00:00 +0000 and desktop-guide/libs/images/preferences-desktop.png	2014-03-07 13:19:24 +0000 differ
=== added file 'desktop-guide/libs/images/system-lock-screen.png'
Binary files desktop-guide/libs/images/system-lock-screen.png	1970-01-01 00:00:00 +0000 and desktop-guide/libs/images/system-lock-screen.png	2014-03-07 13:19:24 +0000 differ
=== added file 'desktop-guide/libs/images/system-log-out.png'
Binary files desktop-guide/libs/images/system-log-out.png	1970-01-01 00:00:00 +0000 and desktop-guide/libs/images/system-log-out.png	2014-03-07 13:19:24 +0000 differ
=== added file 'desktop-guide/libs/images/system-users.png'
Binary files desktop-guide/libs/images/system-users.png	1970-01-01 00:00:00 +0000 and desktop-guide/libs/images/system-users.png	2014-03-07 13:19:24 +0000 differ
=== modified file 'desktop-guide/libs/xubuntu.ent'
--- desktop-guide/libs/xubuntu.ent	2014-02-11 13:31:35 +0000
+++ desktop-guide/libs/xubuntu.ent	2014-03-07 13:19:24 +0000
@@ -37,6 +37,7 @@
 <!ENTITY kernel-web 'http://www.kernel.org/' >
 <!ENTITY laptop-qa 'http://laptop.qa.ubuntu.com/' >
 <!ENTITY launchpad-web 'http://launchpad.net/' >
+<!ENTITY menulibre-help 'http://smdavis.us/doku/doku.php?id=menulibre-docs' >
 <!ENTITY mugshot-help 'http://smdavis.us/doku/doku.php?id=mugshot-docs' >
 <!ENTITY openprinting-web 'http://www.linuxfoundation.org/collaborate/workgroups/openprinting' >
 <!ENTITY orage 'http://www.kolumbus.fi/~w408237/orage/' >
@@ -65,6 +66,10 @@
 <!-- INLINE ICONS -->
 <!ENTITY package '<inlinemediaobject role="icon-pkg"><imageobject><imagedata fileref="../libs/images/package_icon.png" /></imageobject></inlinemediaobject>' >
 <!ENTITY key '<inlinemediaobject role="icon-key"><imageobject><imagedata fileref="../libs/images/key_icon.png" /></imageobject></inlinemediaobject>' >
+<!ENTITY settings '<guiicon><inlinemediaobject><imageobject><imagedata fileref="../libs/images/preferences-desktop.png" /></imageobject></inlinemediaobject></guiicon>' >
+<!ENTITY lockscreen '<guiicon><inlinemediaobject><imageobject><imagedata fileref="../libs/images/system-lock-screen.png" /></imageobject></inlinemediaobject></guiicon>' >
+<!ENTITY users '<guiicon><inlinemediaobject><imageobject><imagedata fileref="../libs/images/system-users.png" /></imageobject></inlinemediaobject></guiicon>' >
+<!ENTITY logout '<guiicon><inlinemediaobject><imageobject><imagedata fileref="../libs/images/system-log-out.png" /></imageobject></inlinemediaobject></guiicon>' >
 
 <!-- LOCATIONS -->
 <!ENTITY location '<inlinemediaobject><imageobject><imagedata fileref="../libs/images/location_icon.png"/></imageobject></inlinemediaobject>' >
@@ -79,7 +84,6 @@
 <!-- MENUS -->
 <!ENTITY appmenu '<guiicon><inlinemediaobject><imageobject><imagedata fileref="../libs/images/menu_icon.png"/></imageobject></inlinemediaobject></guiicon>' >
 <!-- Items -->
-<!ENTITY computer-janitor '<application><menuchoice>&appmenu;<guisubmenu>System</guisubmenu><guimenuitem>Computer Janitor</guimenuitem></menuchoice></application>' >
 <!ENTITY file-manager '<application><menuchoice>&appmenu;<guisubmenu>Accessories</guisubmenu><guimenuitem>File Manager</guimenuitem></menuchoice></application>' >
 <!ENTITY gigolo '<application><menuchoice>&appmenu;<guisubmenu>System</guisubmenu><guimenuitem>Gigolo</guimenuitem></menuchoice></application>' >
 <!ENTITY gmusicbrowser '<application><menuchoice>&appmenu;<guisubmenu>Multimedia</guisubmenu><guimenuitem>gmusicbrowser</guimenuitem></menuchoice></application>' >
@@ -107,6 +111,21 @@
 <!ENTITY terminal '<application><menuchoice>&appmenu;<guisubmenu>Accessories</guisubmenu><guimenuitem>Terminal Emulator</guimenuitem></menuchoice></application>' >
 <!ENTITY users-groups '<application><menuchoice>&appmenu;<guimenuitem>Settings Manager</guimenuitem><guimenuitem>Users and Groups</guimenuitem></menuchoice></application>' >
 <!ENTITY xfburn '<application><menuchoice>&appmenu;<guisubmenu>Multimedia</guisubmenu><guimenuitem>Xfburn</guimenuitem></menuchoice></application>' >
+<!-- Items-Whisker Menu-specific -->
+<!ENTITY wm-settings-appearance '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Appearance</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-desktop '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Desktop</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-keyboard '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Keyboard</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-manager '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-menulibre '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Menu Editor</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-mouse-touchpad '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Mouse and Touchpad</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-mugshot '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>About Me</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-power-manager '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Power Manager</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-print '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Printers</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-window-manager '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Window Manager</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-settings-window-manager-tweaks '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Window Manager Tweaks</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-software-properties '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Software &amp; Updates</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-software-updater '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Software Updater</guimenuitem></menuchoice></application>' >
+<!ENTITY wm-users-groups '<application><menuchoice>&appmenu;<guimenuitem> &settings; Settings Manager</guimenuitem><guimenuitem>Users and Groups</guimenuitem></menuchoice></application>' >
 
 <!-- LANGUAGES (sorted by two letter code)-->
 <!ENTITY Afar 'aa' >