Merge lp:~mistrynitesh/kubuntu-docs/fix638258 into lp:kubuntu-docs/maverick

Proposed by Nitesh Mistry on 2010-10-15
Status: Needs review
Proposed branch: lp:~mistrynitesh/kubuntu-docs/fix638258
Merge into: lp:kubuntu-docs/maverick
Diff against target: 25 lines (+2/-2)
2 files modified
docs/netbook/C/netbook.xml (+1/-1)
libs/global.ent (+1/-1)
To merge this branch: bzr merge lp:~mistrynitesh/kubuntu-docs/fix638258
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers 2010-10-15 Pending
Review via email: mp+38501@code.launchpad.net

Description of the change

Incorrect distro-version in libs/global.ent
It is changed from Lucid Lynx to Maverick Meerkat.

To post a comment you must log in.

Unmerged revisions

189. By Nitesh Mistry on 2010-10-15

corrected an error in release name

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/netbook/C/netbook.xml'
2--- docs/netbook/C/netbook.xml 2010-09-09 21:00:21 +0000
3+++ docs/netbook/C/netbook.xml 2010-10-15 06:46:41 +0000
4@@ -27,7 +27,7 @@
5 </para>
6
7 <para>
8-Welcome to Kubuntu on your netbook running Plasma Netbook&distro-rev;, the &distro-version;
9+Welcome to Kubuntu on your netbook running Plasma Netbook &distro-rev;, the &distro-version;
10 release. Plasma Netbook was designed for netbook computers that typically have screens
11 10 inches or less and don't have optical drives. It is designed to run on systems
12 with reduced hard drive capacity.
13
14=== modified file 'libs/global.ent'
15--- libs/global.ent 2010-09-09 21:02:24 +0000
16+++ libs/global.ent 2010-10-15 06:46:41 +0000
17@@ -10,7 +10,7 @@
18 <!ENTITY kde-full '<phrase>K Desktop Environment</phrase>'>
19
20 <!-- VERSIONS -->
21-<!ENTITY distro-version 'Lucid Lynx'>
22+<!ENTITY distro-version 'Maverick Meerkat'>
23 <!ENTITY distro-rev '10.10'>
24 <!ENTITY distro-release-date "October 2010">
25 <!ENTITY distro-short-codename "maverick">

Subscribers

People subscribed via source and target branches

to all changes: