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

Proposed by Nitesh Mistry
Status: Merged
Approved by: David Wonderly
Approved revision: 227
Merge reported by: David Wonderly
Merged at revision: not available
Proposed branch: lp:~mistrynitesh/kubuntu-docs/oneiric-fixes
Merge into: lp:kubuntu-docs/oneiric
Diff against target: 61 lines (+7/-7)
1 file modified
docs/development/C/development.xml (+7/-7)
To merge this branch: bzr merge lp:~mistrynitesh/kubuntu-docs/oneiric-fixes
Reviewer Review Type Date Requested Status
David Wonderly (community) Approve
Review via email: mp+73984@code.launchpad.net

Commit message

Merged Bug fixes 801973, 801977, 808312, 812197, 840803

Description of the change

fixes typos and broken links as reported in following bugs:
bug #801973
bug #801977
bug #808312
bug #812197
bug #840803

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

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-09-04 08:18:22 +0000
4@@ -300,10 +300,10 @@
5 <application>Monkey Studio (MkS)</application> is a cross platform IDE written in C++/Qt 4. Its primary goal was to be a Qt 4 only IDE, but it evolved beyond only Qt development. The current version is the v2 branch which succeeded the v1 branch and is dependent on Qt 4.4.0 or greater. It supports Qt 4 projects management and embeds Designer and Assistant to form a complete, fast and power full Qt 4 IDE.
6 </para>
7 <para>
8-<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways. Currentlyu there are a lot of plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python).
9+<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways. Currently there are a lot of plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python).
10 </para>
11 <para>
12-Monkey Studio is released under the GPL. Its based on Qt 4.4.x and higher, and is working on Linux, Windows and Mac.
13+Monkey Studio is released under the GPL. It is based on Qt 4.4.x and higher, and is working on Linux, Windows and Mac.
14 </para>
15 </sect1>
16
17@@ -417,7 +417,7 @@
18 Qt's the three major components are the Designer, the Linguist and the Application Programming Interface (API). The Qt toolkit allows you to write source code for advanced applications with graphical user interfaces on either Linux, Windows or Mac and compile them on all three platforms and embedded operating systems with little or no rewriting of the source code, saving time and development cost.
19 </para>
20 <para>
21-Since the Qt Toolkit is under the GPL/LGPL it is not threatened by this partnership, and Canonical announced that they are going to use Qt instead of Gnome to develop their Unity 2D desktop. So, considering that, and the fact that Qt is under the GPL/LGPL license, Qt remains as viable a development tool as it was before the announcement. Because Kubuntu uses the KDE desktop and KDE was built with Qt, and Qt is the most powerful GUI RAD tool available on Linux, and some would say Windows as well, the following is information is about how to install Qt.
22+Since the Qt Toolkit is under the GPL/LGPL it is not threatened by this partnership, and Canonical announced that they are going to use Qt instead of Gnome to develop their Unity 2D desktop. So, considering that, and the fact that Qt is under the GPL/LGPL license, Qt remains as viable a development tool as it was before the announcement. Because Kubuntu uses the KDE desktop and KDE was built with Qt, and Qt is the most powerful GUI RAD tool available on Linux, and some would say Windows as well, the following information is about how to install Qt.
23 </para>
24 <sect2>
25 <title>Installation of Qt</title>
26@@ -446,7 +446,7 @@
27 <sect2>
28 <title>Qt Designer</title>
29 <para>
30-The Designer is the graphical user interface (GUI) designing tool for graphical applications written using the Qt toolkit. Qt provides the building blocks — a broad set of customizable widgets, graphics canvas, style engine and more that you need to build modern user interfaces. You can incorporate 3D graphics, multimedia audio or video, visual effects, and animations into your projects. Qts integration with the WebKit web rendering engine means that one can quickly incorporate content and services from the Web into their native application, and can use the web environment to deliver their services and functionality.
31+The Designer is the graphical user interface (GUI) designing tool for graphical applications written using the Qt toolkit. Qt provides the building blocks — a broad set of customizable widgets, graphics canvas, style engine and more that you need to build modern user interfaces. You can incorporate 3D graphics, multimedia audio or video, visual effects, and animations into your projects. Qt's integration with the WebKit web rendering engine means that one can quickly incorporate content and services from the Web into their native application, and can use the web environment to deliver their services and functionality.
32 </para>
33 </sect2>
34 <sect2>
35@@ -491,7 +491,7 @@
36 The <application>SeaMonkey</application> project is a community effort to develop the SeaMonkey all-in-one internet application suite. Such a software suite was previously made popular by Netscape and Mozilla, and the SeaMonkey project continues to develop and deliver high-quality updates to this concept. It includes an Internet browser, email &amp; newsgroup client with an included web feed reader, HTML editor, IRC chat and web development tools. On February 14, 2011 version 2.1 Beta 2 was released.
37 </para>
38 <para>
39-Powered by Mozilla Under the hood, SeaMonkey uses much of the same Mozilla source code which powers such successful siblings as Firefox, Thunderbird, Camino, Sunbird and Miro. Legal backing is provided by the Mozilla Foundation. The code is licensed under a MPL/GPL/LGPL tri-licsense, allowing it to be easily reused in different environments. If your Internet activity consists of just browsing, emailing, using the IRC, reading web feeds and doing some light HTML editing then this application fills all your needs.
40+Powered by Mozilla Under the hood, SeaMonkey uses much of the same Mozilla source code which powers such successful siblings as Firefox, Thunderbird, Camino, Sunbird and Miro. Legal backing is provided by the Mozilla Foundation. The code is licensed under a MPL/GPL/LGPL tri-license, allowing it to be easily reused in different environments. If your Internet activity consists of just browsing, emailing, using the IRC, reading web feeds and doing some light HTML editing then this application fills all your needs.
41 </para>
42 </sect1>
43
44@@ -501,7 +501,7 @@
45 <ulink url="http://pythonide.stani.be/"> http://pythonide.stani.be </ulink>
46 </para>
47 <para>
48-<application>SPE</application> is a python IDE with auto indentation and completion, call tips, syntax coloring &amp; highlighting, uml viewer, class explorer, source index, todo list, pycrust shell, file browsers, drag and drop, Blender support. SPE ships with wxGlade,PyChecker and Kiki. SPE is a mature project but development seems to have stopped around 2008.
49+<application>SPE</application> is a python IDE with auto indentation and completion, call tips, syntax coloring &amp; highlighting, uml viewer, class explorer, source index, todo list, pycrust shell, file browsers, drag and drop, Blender support. SPE ships with wxGlade, PyChecker and Kiki. SPE is a mature project but development seems to have stopped around 2008.
50 </para>
51 </sect1>
52
53@@ -511,7 +511,7 @@
54 <ulink url="http://sourceforge.net/apps/wordpress/wxformbuilder"> http://sourceforge.net/apps/wordpress/wxformbuilder </ulink>
55 </para>
56 <para>
57-<application>wxFormBuilder</application> is an open-source, cross-platform RAD tool for wxWidgets. It aims to be an application that as well as enabling visual development and generating the corresponding code, allows the inclusion of non-graphical components, as well as providing facilities for extending the set of widgets easily via plugins. One should not edit the code generated by wxFormbuilder, so the correct way to implement a GUI generated by wxFormBuilder is by using inheritance. The generated classes which create the GUI are intended to be used as base classes for the user-entered classes which implement the GUI. See the <ulink url="http://wiki.wxformbuilder.org/Tutorials/WhyCantIEditTheGeneratedCode"> Why Can't I Edit the Generated Code</ulink> web page.
58+<application>wxFormBuilder</application> is an open-source, cross-platform RAD tool for wxWidgets. It aims to be an application that as well as enabling visual development and generating the corresponding code, allows the inclusion of non-graphical components, as well as providing facilities for extending the set of widgets easily via plugins. One should not edit the code generated by wxFormbuilder, so the correct way to implement a GUI generated by wxFormBuilder is by using inheritance. The generated classes which create the GUI are intended to be used as base classes for the user-entered classes which implement the GUI. See the <ulink url="http://sourceforge.net/apps/mediawiki/wxformbuilder/index.php?title=Tutorials:WhyCantIEditTheGeneratedCode"> Why Can't I Edit the Generated Code</ulink> web page.
59 </para>
60 </sect1>
61 </article>

Subscribers

People subscribed via source and target branches