fix more warnings. (#41)

* fix warnings

* warningfix++

source/3/3.3/3.3.10/pavucontrol.rst

@@ -12,8 +12,13 @@ Description
 
 Screenshot
 ----------
+<<<<<<< HEAD
+  .. image:: pavucontrol.png
+   :width: 80%
+=======
 .. image:: pavucontrol.png
    :width:80%
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
  
 Version
 -------

source/3/3.3/3.3.9/GNOME_mpv.rst

@@ -1,10 +1,12 @@
-3.2.9 GNOME_MPlayer
-===================
-
-
+3.2.9 GNOME_MPV
+===============
 
 Description
 -----------
-Gnome MPlayer is an application where you can listen to music or watch videos. 
-Features include
+  Gnome MPV is an application where you can listen to music or watch videos. 
+Features include able to open mp3, ogg, and other audio and video files and fullscreen playback.
+
+Version 
+-------
+Gnome MPV ships version 0.13
 

source/4/4.2/4.2.3/Monitor_settings.rst

@@ -12,7 +12,11 @@ Monitor settings has for a multiple monitors and the ability to turn on and off
 Screenshot
 ----------
  .. image:: Monitor_settings.png
+<<<<<<< HEAD
+      :width:80%
+=======
      :width:80%
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
 
 How to Launch
 -------------

source/4/4.2/tweaking_your_desktop.rst

@@ -1,12 +1,18 @@
-Chapter 3.3: Accessories
-==============================
+Chapter 4.2: Tweaking your desktop
+==================================
 
-This chapter contains the list of accessories installed by default.
+This chapter contains the list of applications to tweak your Lubuntu desktop.
 
 .. toctree::
    :maxdepth: 2
    :titlesonly:
 
+<<<<<<< HEAD
+   4.2.1/openbox_configuration_manager.rst
+   4.2.2/Customize_Look_and_Feel.rst
+   4.2.3/Monitor_settings.rst
+=======
     4.2.1/openbox_configuration_manager.rst
     4.2.2/Customize_Look_and_Feel.rst
     4.2.3/Monitor_settings.rst
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28

source/4/system_configuration,_manintainece,_and_administration.rst

@@ -2,7 +2,12 @@ Chapter 4: System Configuration, Maintenance, and Administration
 ================================================================
 
 This chapter will show you how to configure update customize your install of lubuntu as well as to install new software that does not ship with the repositories.
-
+   
 .. toctree::
   :maxdepth: 2
   :titlesonly:
+<<<<<<< HEAD
+
+  4.2/tweaking_your_desktop
+=======
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28

source/index.rst

@@ -19,6 +19,7 @@ Contents
 
    1/installing_lubuntu
    3/applications
+   4/system_configuration,_manintainece,_and_administration
 
 Contact Us
 ==========