Merge lp:~mistrynitesh/kubuntu-docs/k-docs-natty-fixes into lp:kubuntu-docs/oneiric

Proposed by Nitesh Mistry
Status: Merged
Approved by: David Wonderly
Approved revision: 209
Merged at revision: 209
Proposed branch: lp:~mistrynitesh/kubuntu-docs/k-docs-natty-fixes
Merge into: lp:kubuntu-docs/oneiric
Diff against target: 30 lines (+3/-3)
2 files modified
docs/development/C/development.xml (+1/-1)
libs/kde-menus-C.ent (+2/-2)
To merge this branch: bzr merge lp:~mistrynitesh/kubuntu-docs/k-docs-natty-fixes
Reviewer Review Type Date Requested Status
David Wonderly (community) Approve
Review via email: mp+60300@code.launchpad.net

Commit message

Description of the change

fixed bug #775055 by editing docs/development/C/development.xml &
fixed bug #774759 by editing libs/kde-menus-C.ent

To post a comment you must log in.
Revision history for this message
David Wonderly (david.wonderly) wrote :

As always, good work!

review: Approve
Revision history for this message
David Wonderly (david.wonderly) wrote :

Merged into Oneiric docs. Needs another merge request for natty and to lp:kubuntu-docs/natty

-DW

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/development/C/development.xml'
2--- docs/development/C/development.xml 2011-03-01 04:11:22 +0000
3+++ docs/development/C/development.xml 2011-05-08 09:06:36 +0000
4@@ -77,7 +77,7 @@
5 </itemizedlist>
6 </para>
7 <para>
8-Addtional plugins for Code:Blocks can be obtained at their wiki website:
9+Additional plugins for Code:Blocks can be obtained at their wiki website:
10 <ulink url="http://wiki.codeblocks.org/index.php?title=Code::Blocks_Plugins"> http://wiki.codeblocks.org/index.php?title=Code::Blocks_Plugins </ulink>
11 </para>
12 </sect1>
13
14=== modified file 'libs/kde-menus-C.ent'
15--- libs/kde-menus-C.ent 2011-01-25 02:29:44 +0000
16+++ libs/kde-menus-C.ent 2011-05-08 09:06:36 +0000
17@@ -126,11 +126,11 @@
18 <!ENTITY menukontact
19 '<menuchoice>&maloff;<guimenuitem>Personal Information Manager (Kontact)</guimenuitem></menuchoice>'>
20 <!ENTITY menuooimpress
21-'<menuchoice>&maloff;<guimenuitem>Presentation (LibreOffice Present</guimenuitem></menuchoice>'>
22+'<menuchoice>&maloff;<guimenuitem>Presentation (LibreOffice Impress)</guimenuitem></menuchoice>'>
23 <!ENTITY menuoocalc
24 '<menuchoice>&maloff;<guimenuitem>Spreadsheet (LibreOffice Calc)</guimenuitem></menuchoice>'>
25 <!ENTITY menuoowriter
26-'<menuchoice>&maloff;<guimenuitem>Word Processor (LibreOffice Word Processor)</guimenuitem></menuchoice>'>
27+'<menuchoice>&maloff;<guimenuitem>Word Processor (LibreOffice Writer)</guimenuitem></menuchoice>'>
28 <!ENTITY menukmymoney '<menuchoice>&maloff;<guimenuitem>KMyMoney2</guimenuitem></menuchoice>'>
29
30 <!-- Science & Math -->

Subscribers

People subscribed via source and target branches