fix more warnings. (#41)

* fix warnings

* warningfix++
This commit is contained in:
Lyn Perrine 2018-05-01 17:26:26 -07:00 committed by GitHub
parent c7910a4c3c
commit e06af944f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 10 deletions

View File

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

View File

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

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

@ -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:: .. toctree::
: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,3 +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
=======
>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28

View File

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