Merge branch 'master' into keyboardshortcuts

source/1/1.3/installation.rst

@@ -4,7 +4,7 @@ This is a guide to through the installation process of Lubuntu.
 
 Starting the installer
 ----------------------
-<<<<<<< HEAD
+
 Once you have booted the Lubuntu image, you will be greeted by a screen with the following options: Start Lubuntu, Check disk for defects, Test RAM, and Boot from first hard disk. To start the install select Start Lubuntu, you will now be booting into a live session. 
 
 .. image:: boot_installer.png
@@ -14,17 +14,7 @@ Once you have booted into the live session, feel free to explore Lubuntu. Once y
 .. image:: live_session.png
 
 You will be taken to the Lubuntu installer Welcome screen. You can change the installer language in the drop down box. After selecting the language the next button will move you on to the next task.
-=======
-Once you have booted the lubuntu image, you will be greeted by a screen with the following options: Start Lubuntu, Check disk for defects, Test RAM, and Boot from first hard disk. To start the install select Start Lubuntu, you will now be booting into a live session. 
 
-.. image:: boot_installer.png
-
-Once you have booted into the live session, feel free to explore lubuntu. Once you are ready to install lubuntu, double click the icon in the top-left corner of the desktop "Install Lubuntu 18.10". 
-
-.. image:: live_session.png
-
-You will be taken to the lubuntu installer Welcome screen. You can change the installer language in the drop down box. After selecting the language the next button will move you on to the next task.
->>>>>>> 649e6743269e13afc131419c1258b458ca0596c5
 
 .. image:: welcome_installer.png
 

source/2/2.1/2.1.2/qtransmission.rst

@@ -5,23 +5,20 @@ Qtransmission is a bittorrent client.
 
 Screenshot
 ----------
+
 .. image:: transmission.png
 
 Version
 -------
+
 Lubuntu ships with version 2.94 of Qtransmission.
 
 How to launch
 -------------
-<<<<<<< HEAD
-To launch Qtransmission go to menu -> Internet -> Qtransmission bittorent client or run transmission-qt from the command line.
 
-tags: transmission, torrent, bittorrent, download
-=======
 To launch Qtransmission go to menu -> Internet -> Qtransmission bittorent client or run 
 .. code:: 
  
    transmission-qt 
 
 from the terminal. 
->>>>>>> 649e6743269e13afc131419c1258b458ca0596c5

source/2/2.1/2.1.4/bluedevil.rst

@@ -3,6 +3,12 @@ Chapter 2.1.4 Bluedevil
 
 bluedevil is the default application to make bluetooth devices for lubuntu.
 
+
+
 Version
 -------
 Lubuntu ships with version 5.13.5 of bluedevil. 
+
+Pairing
+-------
+To launch bluedevil to pair with a device from the menu -> Internet -> Bluedevil Wizard. If bluetooth is disabled you will be asked to enable it. In the main part of the window will show detected bluetooth devices.   

source/2/2.1/Internet_Applications.rst

@@ -1,6 +1,8 @@
 Chapter 2.1 Internet Applications
 =================================
 
+This chapter documents how to use webbrowsers email clinets and torent clients. 
+
 .. toctree::
    :maxdepth: 2
    :titlesonly:

source/2/2.2/2.2.5/libreoffice_writer.rst

@@ -22,6 +22,8 @@ To change the font size There is a drop down box with a number in it you can typ
 
 To check the spelling of your document press the ABC button with a checkmark, from the menu -> tools spelling or press f7. After you are done writing your document you can press the button that looks like a printer to print, press control+ p or file -> print.  
 
+To insert special symbols or characters press the button with the Ω symbol or from the menu Insert -> Special character. To insert a page break press control + enter or from the menu Insert -> Page Break.  
+
 Screenshot
 ----------
 .. image:: libreoffice_writer.png

source/2/2.2/Office_Applications.rst

@@ -1,6 +1,8 @@
 Chapter 2.2 Office Applications
 ===============================
 
+This chapter documents office applications including the libreoffice office suite and qpdfview for viewing pdfs. 
+
 .. toctree::
   :maxdepth: 2
   :titlesonly:

source/2/2.3/2.3.1/lximage.rst

@@ -21,4 +21,10 @@ Lubuntu ships with version 0.7.0 or lximage.
 
 How to launch
 -------------
-To launch lximage from the menu -> graphics - > lximage or run lximage-qt from the command line.  
+To launch lximage from the menu -> graphics - > lximage or run
+
+.. code:: 
+
+   lximage-qt 
+
+from the command line.  

source/2/2.3/2.3.2/screenshot.rst

@@ -13,4 +13,9 @@ Lubuntu ships with version 0.7.0 of screenshot.
 
 How to Launch
 -------------
-To launch screenshot from the menu -> Grapics -> Screenshot or run lximage-qt -s from the command line. Pressing the printscreen key also brings up the screenshot dialog. 
+To launch screenshot from the menu -> Grapics -> Screenshot or run
+.. code:: 
+
+   lximage-qt -s 
+
+from the command line. Pressing the printscreen key also brings up the screenshot dialog. 

source/2/2.3/Graphics_Applications.rst

@@ -1,6 +1,8 @@
 Chapter 2.3 Graphics Applications
 ===================================
 
+This chapters documents programs with viewing pictures taking screenshots and scanning pictures or documents. 
+
 .. toctree::
   :maxdepth: 2
   :titlesonly:

source/2/2.4/Accessories.rst

@@ -1,6 +1,7 @@
 Chapter 2.4 Accessories
 =======================
 
+This chapter documents accessories on your system and the one game 2048-qt. 
 
 .. toctree::
   :maxdepth: 2

source/2/2.5/Sound_and_Video.rst

@@ -1,6 +1,8 @@
 Chapter 2.5 Sound and Video
 ===========================
 
+This chapter documents playing media, burning disks, and controlling volume.
+
 .. toctree::
   :maxdepth: 2
   :titlesonly:

source/3/3.1/3.1.5/nm-tray.rst

@@ -7,6 +7,10 @@ Useage
 ------
 If you want to connect to  a network on nm-tray left click the icon in the system tray. If you have a wired connection with DHCP it should connect automatically. If you want to disconnect your from a network under active connections left click to disconnect.  
 
+Screenshot
+----------
+.. image:: nm-tray.png
+
 Version
 -------
 Lubuntu ships with version 0.4.0 of nm-tray.

source/3/3.1/3.1.6/qps.rst

@@ -7,6 +7,11 @@ Version
 -------
 Lubuntu ships with version 1.10.18 of qps. 
 
+Useage
+------
+To see your memory useage in qps look at the bar that says MEM. The bar for CPU useage shows CPU useage with a bar graph with useage with a bar graphc for cpu useage. The Uptime in the top bar shows how long your computer has been running.  
+
+
 Screenshot
 ----------
 .. image:: qps.png

source/3/3.1/3.1.7/kde_partitionmanager.rst

@@ -14,6 +14,10 @@ To check the health of your hard drive on the menu Device ->  SMART status.
 
 You can see your disk useage for each partition graphically with the bars at the top with the shaded in part showing a bar graph as the percentage full of the partition. The Column size shows the size of the entire system while the Used shows the amount of space used on the drive. The type field lets you see which filesystem is on the parttion.   
 
+Screensaver
+-----------
+.. image:: kde_partitionmanager.png
+
 How to launch
 -------------
 To launch kde partition manager from the menu -> system tools -> KDE partition manager or run partitionmanager from the command line. 

source/3/3.2/3.2.1/LXQt_configuration_center.rst

@@ -3,6 +3,14 @@ Chapter 3.2.1 LXQt configuration center
 
 LXQt configuration center is an application with buttons that launches configuration options for lxqt the default desktop environment of Lubuntu. 
 
+Screenshot
+----------
+.. image:: configuration_center.png
+
+Version
+-------
+Lubuntu ships with version 0.13.0 of LXQt configuration center.
+
 How to Launch
 -------------
 To launch LXQt configuration center from the menu -> Prefrences -> LXQt settings -> LXQt configuration center or run lxqt-config from the command line.

source/3/3.2/3.2.11/openbox_settings.rst

@@ -21,4 +21,10 @@ Screenshot
 
 How to launch
 -------------
-To launch openbox settings from the menu -> Prefrences -> LXQt settings -> openbox settings. From LXQt settings press the openbox settings button with the wrench and screwdriver on a computer window or run obconf-qt from the command line.
+To launch openbox settings from the menu -> Prefrences -> LXQt settings -> openbox settings. From LXQt settings press the openbox settings button with the wrench and screwdriver on a computer window or run
+
+.. code:: 
+
+   obconf-qt
+
+from the command line.

source/3/3.2/3.2.13/session_settings.rst

@@ -13,6 +13,10 @@ Screenshot
 ----------
 .. image:: session_settings.png
 
+Screenshot
+----------
+.. image:: session_settings.png
+
 Version
 -------
 Lubuntu ships with version 0.13.0 of session settings. 

source/5/5.1/lxqt-panel.rst

@@ -8,6 +8,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 (PCManFM) 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.

source/5/Panel_Desktop_and_Runner.rst

@@ -1,5 +1,5 @@
 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.