add new changes fixing warnings

This commit is contained in:
Lyn 2018-05-01 17:22:45 -07:00
commit bf827f7d3c
5 changed files with 19 additions and 1 deletions

View File

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

View File

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

View File

@ -7,6 +7,12 @@ This chapter contains the list of applications to tweak your Lubuntu desktop.
:maxdepth: 2 :maxdepth: 2
:titlesonly: :titlesonly:
<<<<<<< HEAD
4.2.1/openbox_configuration_manager.rst 4.2.1/openbox_configuration_manager.rst
4.2.2/Customize_Look_and_Feel.rst 4.2.2/Customize_Look_and_Feel.rst
4.2.3/Monitor_settings.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

View File

@ -6,5 +6,8 @@ This chapter will show you how to configure update customize your install of lub
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:titlesonly: :titlesonly:
<<<<<<< HEAD
4.2/tweaking_your_desktop 4.2/tweaking_your_desktop
=======
>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28

View File

@ -19,7 +19,7 @@ Contents
1/installing_lubuntu 1/installing_lubuntu
3/applications 3/applications
4/System Configuration, Maintenance, and Administration 4/system_configuration,_manintainece,_and_administration
Contact Us Contact Us
========== ==========