Merge lp:~valorie-zimmerman/kubuntu-docs/valorieEdits into lp:kubuntu-docs/oneiric

[Valorie Zimmerman]

fixed ref to kpackagekit

Unmerged revisions

235. By Valorie Zimmerman on 2011-09-15

fixed ref. to OpenOffice.org and Kpackagekit

234. By Valorie Zimmerman on 2011-09-15

fixed ref to Kpackagekit

233. By Valorie Zimmerman on 2011-09-15

fixed ref to Kpackagekit

232. By Valorie Zimmerman on 2011-09-15

Soooo many changes! Updated to 11.10.

=== modified file 'docs/desktop/C/desktop.xml'
--- docs/desktop/C/desktop.xml	2011-09-15 05:46:53 +0000
+++ docs/desktop/C/desktop.xml	2011-09-15 09:10:07 +0000
@@ -67,8 +67,15 @@
 <para>
 Choose <menuchoice><guimenu>Kickoff Application
 Launcher</guimenu><guisubmenu>System
+<<<<<<< TREE
 Settings</guisubmenu><guimenuitem>Startup and Shutdown</guimenuitem></menuchoice>
 from the <guilabel>System Administation</guilabel> section at the bottom.
+=======
+Settings</guisubmenu><guisubmenu>System Administration</guisubmenu> section<guimenuitem>Startup and Shutdown</guimenuitem><guimenuitem>Session
+Manager</guimenuitem></menuchoice>. Click the <guibutton>Session Manager</guibutton>
+choice on the left. Ensure that the <guibutton>Restore manually saved
+session</guibutton> checkbox is enabled.
+>>>>>>> MERGE-SOURCE
 </para>
 </step>
 
@@ -96,6 +103,7 @@
 <step>
 <para>
 Go to <application>System Settings</application> by going to &menusysset;.
+<<<<<<< TREE
 </para>
 </step>
 
@@ -103,6 +111,10 @@
 <para>
 Under the <guilabel>System Administation</guilabel> section, select the <guilabel>Login
 Screen</guilabel>.
+=======
+Under the <guilabel>System Administration</guilabel> section, select the <guilabel>Login
+Screen</guilabel>.
+>>>>>>> MERGE-SOURCE
 </para>
 </step>
 
@@ -110,7 +122,7 @@
 <para>
 Select the <guibutton>Convenience</guibutton> tab. Check the <guilabel>Enable
 Autologin</guilabel> and select the user to autologin from the drop-down menu
-and select an appropriate time delay.
+and select an appropriate time delay. You will be asked to enter your user password in order to save your change.
 </para>
 </step>
 </procedure>
@@ -150,13 +162,21 @@
 <para>
 Open <application>System Settings</application> by going to &menusysset;. In
 the <application>System Settings</application> window, select the
+<<<<<<< TREE
 <guilabel>Input Devices</guilabel> option.
+=======
+<guilabel>Hardware</guilabel> section, <guilabel>Input Devices</guilabel> option.
+>>>>>>> MERGE-SOURCE
 </para>
 </step>
 
 <step>
 <para>
+<<<<<<< TREE
 Under the <guilabel>Keyboard</guilabel> section, click on the <guilabel>Hardware</guilabel> tab, locate the subsection titled
+=======
+Under the <guilabel>Keyboard</guilabel> section, <guilabel>Hardware</guilabel> tab, locate the subsection titled
+>>>>>>> MERGE-SOURCE
 <guilabel>NumLock on KDE Startup</guilabel>, enable the <guibutton>Turn
 On</guibutton> checkbox. Click on <guibutton>Apply</guibutton> to save the
 settings.
@@ -186,7 +206,11 @@
 <para>
 Open <application>KDE Menu Editor</application> by
 <mousebutton>right</mousebutton> clicking on <application>Kickoff Application
+<<<<<<< TREE
 Launcher</application> icon (the KDE Menu) and choosing <guimenuitem>Edit Applications...</guimenuitem>. If the <application>Kicker</application> is locked,
+=======
+Launcher</application> icon (the KDE Menu) and choosing <guimenuitem>Edit Applications</guimenuitem>. If the <application>Kicker</application> is locked,
+>>>>>>> MERGE-SOURCE
 <application>KDE Menu Editor</application> can be opened by pressing
 <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> and typing
 <userinput>kmenuedit</userinput> followed by pressing the <keycap>Enter</keycap>
@@ -309,14 +333,18 @@
 
 <step>
 <para>
+<<<<<<< TREE
 In the <guilabel>Worksapce Appearance and Behavior</guilabel> section, click on <guibutton>Workspace Appearance</guibutton>
+=======
+In the <guimenuitem>Workspace Appearance and Behavior</guimenuitem> section, choose <guimenuitem>Workspace Appearance</guimenuitem>.
+>>>>>>> MERGE-SOURCE
 </para>
 </step>
 
 </procedure>
 
 <para>
-From here, it's possible to choose from the list of installed themes. 
+From here, it's possible to choose from the list of installed Desktop, Cursor and Splash themes. 
 </para>
 
 <procedure>

=== modified file 'docs/games/C/games.xml'
--- docs/games/C/games.xml	2011-09-15 08:07:30 +0000
+++ docs/games/C/games.xml	2011-09-15 09:10:07 +0000
@@ -384,9 +384,16 @@
 </itemizedlist>
 <para>
 To see the games available in the &kubuntu; repositories, open
+<<<<<<< TREE
 <application>muon</application>, &kubuntu;&apos;s package management
 application by going to &menusysmuon; and then selecting
 <guilabel>Games</guilabel>.
+=======
+<application>Muon</application>, &kubuntu;&apos;s package management
+application by going to &menusysmuon; and then selecting
+<guilabel>Games</guilabel> from the <guilabel>Text Search</guilabel> drop-down
+menu.
+>>>>>>> MERGE-SOURCE
 </para>
 </sect1>
 

=== modified file 'docs/graphics/C/graphics.xml'
--- docs/graphics/C/graphics.xml	2010-07-25 16:40:35 +0000
+++ docs/graphics/C/graphics.xml	2011-09-15 09:10:07 +0000
@@ -27,7 +27,7 @@
 <application>Blender</application>, <application>InkScape</application> and
 more. These applications are not part of a default &kubuntu; installation.
 However, they can be installed easily with the package manager
-<application>KpackageKit</application>. This topic is an introduction to common
+<application>Muon</application>. This topic is an introduction to common
 tasks in graphics editing applications, such as editing images, creating new
 images, saving your work, and so forth.
 </para>
@@ -320,7 +320,7 @@
 the GNU General Public License. Blender provides a broad spectrum of modeling,
 texturing, lighting, animation and video post-processing functionality in one
 package. Blender can be installed from the package manager
-<application>KPackageKit</application>; &menukpackagekit;
+<application>Muon</application>; &menumuon;
 </para>
 
 <sect2 id="blender-basics">

=== modified file 'docs/index/C/index.xml'
--- docs/index/C/index.xml	2011-09-15 06:39:33 +0000
+++ docs/index/C/index.xml	2011-09-15 09:10:07 +0000
@@ -229,7 +229,11 @@
 </term>
 <listitem>
 <para>
+<<<<<<< TREE
 Learn about staying productive with LibreOffice, the office suite which is
+=======
+Learn about staying productive with Libre Office, the office suite which is
+>>>>>>> MERGE-SOURCE
 installed by default with &kubuntu;
 </para>
 </listitem>