fix merge conflicts with lxqt-panel.

source/1/Installing_lubuntu.rst

@@ -1,4 +1,4 @@
-Chapter 1: Installing Lubuntu
+Chapter 1 Installing Lubuntu
 ==============================
 
 This chapter will show you how to download and install Lubuntu on your computer.

source/5/5.1/lxqt-panel.rst

@@ -7,6 +7,9 @@ Usage
 The application menu allows you to browse and search through available programs, a keyboard shortcut is conveniently available for this. The desktop switcher allows you to switch to another virtual desktop, allowing you to keep your workspace organized. The quick launch bar allows you to conveniently launch your file explorer (PCMan) and web browser (Firefox).
 
 
+The application menu allows you to browse and search through available programs; a keyboard shortcut is conveniently available for this. The desktop switcher allows you to switch to another virtual desktop, allowing you to keep your workspace organized. The quick launch bar allows you to conveniently launch your file explorer (PCManFM) and web browser (Firefox).
+
+
 .. image:: menu_search.png
 
 The taskbar lists the windows you currently have open. To bring one of these windows to focus simply left click the windows on the task bar. If you have multiple of the same window left clicking will open the group, allowing you to select between the different windows. If you want to close a group of multiple windows you can right click the group and click close all.
@@ -14,9 +17,6 @@ The taskbar lists the windows you currently have open. To bring one of these win
 .. image:: multiple_tasks.png
 
 In the system tray there there are multiple widgets. With the volume applet you can change the volume by using the mouse-wheel with the mouse over the speaker icon left click the speaker icon and drag the volume up and down and toggle mute with the button at the bottom. To the far right is a clock, you can click the clock to bring up a pop up calendar window.  
-
-
-
 .. image:: system_tray.png
 
 As mentioned before, the panel is highly configurable and you can customize it by right clicking at various places.

source/5/5.2/desktop_icons.rst

@@ -1,4 +1,15 @@
 Chapter 5.2 Desktop Icons
 =========================
 
-The icons on your desktop can be moved by clicking and holding and dragging the desktop icon to the position you want it. To open a desktop entry file on an icon double click on it. To remove a desktop icon right click on the file and click move to trash. If you want a file to show up on your desktop you can save it to the Desktop folder in your home directory. Similar to the file manager you can right click the file and open with and select the program that way. 
+The icons on your desktop can be moved by left clicking, holding and dragging the desktop icon to the position you want it. Shortcuts or desktop entry files can be opened by double click on the icon. 
+
+Adding and removing items from the desktop
+------------------------------------------
+1.  Shortcuts can be copied to the desktop by dragging and dropping them from the application menu. 
+2.  You can also create shortcuts by dragging and dropping files and folders from the File manager onto the desktop.
+
+
+.. image:: desktop_entry.png
+
+To remove a desktop icon right click on the file and click move to trash.  
+

source/5/5.3/lxqt-runner.rst

@@ -7,16 +7,23 @@ Runner allows you to search for and launch applications and commands in the LXQt
 Usage
 ------
 
-To search for a program, Alt + F2 and start typing a command. The search results will show below, similar to addressbar behavior in browsers. All installed applications can be launched this way and lxqt-runner can configured to store a history of recent programs.
+To search for a program, press Alt + F2 and start typing a command. The search results will show below, similar to address bar behavior in browsers. All installed applications can be launched this way and lxqt-runner can configured to store a history of recent programs.
 
 
 Configuration
 -------------
 
-lxqt-runner has a few configuration options. If you want to change the keyboard shortcut to launch programs, click the the downward arrow on the right side of the search bar, to open up the menu. Select the gear icon to configure, at the bottom there is a label that says shortcut and then a button that lists the current shortcut. Left click on the button and a countdown will begin in which time you need to press the key or combination of keystrokes you want to launch lxqt-runner. In this screen there are also tickboxes to keep a history of your commands and if you want the historical items shown first.
+Runner has a few configuration options. If you want to change the keyboard shortcut to launch programs, click the the downward arrow on the right side of the search bar to open up the menu. Select the gear icon to configure, at the bottom there is a label that says shortcut and then a button that lists the current shortcut. Left click on the button and a countdown will begin in which time you need to press the key or combination of keystrokes you want to launch lxqt-runner. In this screen there are also tick-boxes to keep a history of your commands and if you want the historical items shown first. 
+
 
 Screenshot
 ---------------
 
 
-    .. image:: runner.png
+.. image:: runner.png
+
+
+How to launch
+-------------
+Runner should be running in the background and Alt + F2 should. If you need to manually start it for some reason run lxqt-runner from the command line. 
+

source/5/5.4/window_management.rst

@@ -1,10 +1,37 @@
 Chapter 5.4 Window Management
 =============================
 
-Window management is how to manage the windows on your desktop. Underneath, Lubuntu uses Openbox by default as the window manager. This manages window allows you to drag, close, and make windows take up the whole screen. You also can drag the whole window around by clicking on the titlebar and dragging the window with the mouse.
+Window are the area which contains the graphical user interface that we interact with programs. In Lubuntu these windows can typically be opened, closed, resized and minimized. Underneath Lubuntu uses Openbox as default a window manager. 
 
-If you want to make your window bigger or smaller, you can grab the border of the window which should be highlighted in blue by default to drag or make the window bigger or smaller. To make a window take up the full screen or maximize it is to press the button on the titlebar to make the window that look like to arrows pointing towards opposite corners of the window. Pressing the X button will close the window. The button that looks like a - will iconify the window to make it only appear on the taskbar of lxqt-panel and in the window switching dialog better known to microsoft windows users as minimize.
+Using the mouse
+---------------
+In the top-right corner of a windows a few commands allow you basic controls of the window. Starting from left to right
 
-On the far left at the top of the window is the icon for the program. If you left click on the icon brings up a menu for window management. The send to desktop to send to desktop for several different desktops or all desktops at the bottom. The layer option on the menu always on top to make the window appear always on top. If you want to move something to always show to bottom or you can move it back to normal. The third icon is move and then you can drag them to where you want. Resize lets you move the mouse by resizing. Iconify lets you see it only on the taskbar. Maximize maximizes the window to make it take up all of the monitor. Roll up roll down makes the window just a titlebar. On the far bottom is this menu you can move it to close.
+-   Iconify (-) hides/minimizes the window making it only appear on the task bar of the Panel. It can be recalled by clicking on the application on the task bar, or cycling through open windows with (ALT + Tab)
+-   Maximize reshapes the window to fix the entire screen.
+-   Close (x) attempts to end the window and probably the program.
 
-If you want some useful keyboard shortcuts use the Super Key and press an arrow key to snap the window to that side of the screen.
+.. image:: window_corner.png
+
+The window can be moved by by clicking on the title-bar and dragging the mouse.
+You can resize the window by grabbing the border (sides or corners which should be highlighted in blue) and dragging. 
+
+Right clicking on the title bar and left clicking on the icon located at the top-left of the window  brings the window management menu. Here you can:
+-   Using Send to desktop, send the window to a virtual desktop of your choice
+-   Using Layer option allows you to set  whether this windows is always on top, etc. 
+-   If you want to move something to always show to bottom or you can move it back to normal. 
+-   The earlier mentioned Iconify, Maximize, Close, and Resize option are also available here.
+-   Roll up/down rolls the window into the title-bar.
+-   Decorate/Undecorate hides them title-bar.
+
+Useful keyboard shortcuts
+-------------------------
+-   Closing a window (Alt + F4)
+-   Switching through windows (Hold Alt + hit Tab)
+-   Resizing windows, Super (windows key) + directional arrows.
+
+Screenshots
+-----------
+.. image:: snap_left_right.png
+
+.. image:: snap_up_down.png

source/5/Panel_Desktop_and_Runner.rst

@@ -1,5 +1,5 @@
-Chapter 5 Panel Desktop and Runner
+Chapter 5 Panel, Desktop, and Runner
-==================================
+==================================== 
 
 This chapter will teach you how to use the panel desktop icons the runner to launch applications and window management.