=== modified file 'docs/contact/C/contact.xml' --- docs/contact/C/contact.xml 2011-09-14 14:35:48 +0000 +++ docs/contact/C/contact.xml 2011-09-18 08:38:06 +0000 @@ -125,12 +125,8 @@ All Ubuntu and Kubuntu channels are on the freenode network. The server address to use with your IRC client is -<<<<<<< TREE irc.ubuntu.com, the port to use which is the most secure is 8001. -======= -irc.freenode.net. The most secure port to use is 8001. ->>>>>>> MERGE-SOURCE Kubuntu <acronym>IRC</acronym> channels === modified file 'docs/contribute/C/contribute.xml' --- docs/contribute/C/contribute.xml 2011-09-14 10:02:12 +0000 +++ docs/contribute/C/contribute.xml 2011-09-17 11:04:26 +0000 @@ -67,7 +67,7 @@ (LoCo team for short) to join. There are LoCo teams spread out all over the world, and you can find the directory here. If there isn't a LoCo team near you, you can start a new one! Just follow the instructions on the wiki. To get more information you can join your local LoCo Team mailing list and IRC channel. Details can be found on -the LoCoTeam List wiki page. +the LoCo Team List wiki page. === 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-17 10:50:59 +0000 @@ -68,7 +68,7 @@ Choose Kickoff Application LauncherSystem SettingsStartup and Shutdown -from the System Administation section at the bottom. +from the System Administration section at the bottom. @@ -101,7 +101,7 @@ -Under the System Administation section, select the Login +Under the System Administration section, select the Login Screen. @@ -186,7 +186,7 @@ Open KDE Menu Editor by right clicking on Kickoff Application -Launcher icon (the KDE Menu) and choosing Edit Applications.... If the Kicker is locked, +Launcher icon (the KDE Menu) and choosing Edit Applications.... If the Plasma is locked, KDE Menu Editor can be opened by pressing AltF2 and typing kmenuedit followed by pressing the Enter @@ -309,7 +309,7 @@ -In the Worksapce Appearance and Behavior section, click on Workspace Appearance +In the Workspace Appearance and Behavior section, click on Workspace Appearance === modified file 'docs/development/C/development.xml' --- docs/development/C/development.xml 2011-03-01 04:11:22 +0000 +++ docs/development/C/development.xml 2011-09-18 09:11:57 +0000 @@ -77,7 +77,7 @@ -Addtional plugins for Code:Blocks can be obtained at their wiki website: +Additional plugins for Code:Blocks can be obtained at their wiki website: http://wiki.codeblocks.org/index.php?title=Code::Blocks_Plugins @@ -98,7 +98,7 @@ http://www.eclipse.org -Eclipse began life as a $40 million dollars woth of code contributed by IBM to the FOSS community, whose projects are focused on building an extensible development platform, runtimes and application frameworks for building, deploying and managing software across the entire software lifecycle. Many people know Eclipse as a Java IDE but it is much more than that. The Eclipse open source community has over 60 open source projects. +Eclipse began life as a $40 million dollars worth of code contributed by IBM to the FOSS community, whose projects are focused on building an extensible development platform, runtimes and application frameworks for building, deploying and managing software across the entire software lifecycle. Many people know Eclipse as a Java IDE but it is much more than that. The Eclipse open source community has over 60 open source projects. These projects can be conceptually organized into seven different "pillars" or categories: @@ -235,10 +235,10 @@ KimageMapEditor - HTML Image Map Editor for KDE Home Page: - http://www.nongnu.org/kimagemap/index.html + http://kde.org/applications/development/kimagemapeditor/ -The home pages states that KImageMapEditor is a tool for Linux/KDE that allows you to edit image maps of HTML files. It can be fully integrated with Quanta since it is based on KPart technology. Initially written for KDE 2.0, it is probably the oldest unsupported editor project in the repository. The last update was November 18, 2003, when version 1.0.1 was released. It requires Qt 3.0.3 or greater, but obviously won't work with the Qt4 library or on the KDE4 desktop if the Qt3 libraries are not installed. +The home pages states that KImageMapEditor is a tool for Linux/KDE that allows you to edit image maps of HTML files. It can be fully integrated with Quanta since it is based on KPart technology. It can work with the Qt4 library on the KDE4 desktop. @@ -300,7 +300,7 @@ Monkey Studio (MkS) 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. -MkS 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). +MkS 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). Monkey Studio is released under the GPL. Its based on Qt 4.4.x and higher, and is working on Linux, Windows and Mac. @@ -314,7 +314,7 @@ http://monodevelop.com -MonoDevelop is an IDE primarily designed for C# and other .NET languages. MonoDevelop enables developers to quickly write desktop and ASP.NET Web applications on Linux, Windows and Mac OSX. MonoDevelop makes it easy for developers to port .NET applications created with Visual Studio to Linux and to maintain a single code base for all platforms. It brings a clone of Microsoft's .NET API to the Linux desktop. It is at version 2.4. The MonoDevelop Core is licensed under the LGPLv2, though much of the code and addins are licensed under the MIT/X11 license. +MonoDevelop is an IDE primarily designed for C# and other .NET languages. MonoDevelop enables developers to quickly write desktop and ASP.NET Web applications on Linux, Windows and Mac OSX. MonoDevelop makes it easy for developers to port .NET applications created with Visual Studio to Linux and to maintain a single code base for all platforms. It brings a clone of Microsoft's .NET API to the Linux desktop. It is at version 2.4. The MonoDevelop Core is licensed under the LGPLv2, though much of the code and addons are licensed under the MIT/X11 license. MonoDevelop does not contain a visual designer, so C# bindings to the GUI designer components of GTK+ were created to allow for the creation of graphical user interfaces. These bindings are collectively called "GTK#", or GTK Sharp. The parts of .NET which are legally allowed in Mono are defined in the EMCA 334, which covers the C# specifications, and the EMCA 335 standard, which covers the CLI specifications. A license must be obtained from Microsoft to use the tools described in these two standards to create a commercial application. Microsoft expanded on its EMCA offerings with a Community Promise(CP), which adds several technologies to those listed in ECMA 334 and 335. Some specifications include special terms, which are are noted. The CP applies to anyone who is building software and-or hardware to implement one or more of those specifications. The CP does not apply to any work that you do beyond the scope of the covered specifications. @@ -375,7 +375,7 @@ http://www.gnu.org/software/gnustep/experience/ProjectCenter.html -ProjectCenter is GNUstep's integrated development environment (IDE) and allows a rapid development and easy managment of ProjectCenter running on GNUstepapplications, tools and frameworks. It is at version 0.6, is under the GPL and is being actively developed. +ProjectCenter is GNUstep's integrated development environment (IDE) and allows a rapid development and easy management of ProjectCenter running on GNUstepapplications, tools and frameworks. It is at version 0.6, is under the GPL and is being actively developed. === modified file 'docs/web/C/web.xml' --- docs/web/C/web.xml 2011-08-28 23:50:10 +0000 +++ docs/web/C/web.xml 2011-09-17 10:21:21 +0000 @@ -61,7 +61,7 @@ Open the Bookmark Editor by going to -BookmarksEdits +BookmarksEdit Bookmarks. === modified file 'docs/welcome/C/welcome.xml' --- docs/welcome/C/welcome.xml 2011-06-06 19:37:50 +0000 +++ docs/welcome/C/welcome.xml 2011-09-17 10:16:11 +0000 @@ -96,7 +96,7 @@ &kubuntu; System Documentation -&kubuntu; Kubuntu ships with system documentation covering various topics +&kubuntu; ships with system documentation covering various topics which provide an introduction to Kubuntu as well as configuration and troubleshooting topics.