[Branch ~ubuntu-core-doc/ubuntu-doc/kubuntu-intrepid] Rev 22: update about-kubuntu for intrepid

Jonathan Jesse jjesse at gmail.com
Mon Oct 6 23:34:41 UTC 2008


On Mon, Oct 6, 2008 at 12:17 PM, Matthew East <mdke at ubuntu.com> wrote:

> Hi Jon,
>
> We're in documentation string freeze at the moment, these changes
> should really be discussed first:
>
> https://wiki.ubuntu.com/DocumentationStringFreeze
>
> Obviously if there are serious issues with the document that fall
> within the grounds for exceptions, no one will get in the way of you
> correcting them, provided that an updated pot template is uploaded to
> Rosetta and the change communicated to translators. But it looks from
> the diff below like there have been some non-essential changes made:
> can you clarify?
>
> Thanks
>
> --
> Matthew East
> http://www.mdke.org
> gnupg pub 1024D/0E6B06FF
>
> ---------- Forwarded message ----------
> From:  <noreply at launchpad.net>
> Date: Mon, Oct 6, 2008 at 4:50 PM
> Subject: [Branch ~ubuntu-core-doc/ubuntu-doc/kubuntu-intrepid] Rev 22:
> update about-kubuntu for intrepid
> To: matthew.east at gmail.com
>
>
> ------------------------------------------------------------
> revno: 22
> committer: Jonathan Riddell <jriddell at canonical.com>
> branch nick: kubuntu-intrepid
> timestamp: Mon 2008-10-06 16:49:36 +0100
> message:
>  update about-kubuntu for intrepid
> modified:
>  debian/rules
>  docs/about-kubuntu/C/about-kubuntu.xml
>  libs/global.ent
>  libs/kde.ent
>
> === modified file 'debian/rules'
> --- a/debian/rules      2008-08-19 14:23:43 +0000
> +++ b/debian/rules      2008-10-06 15:49:36 +0000
> @@ -18,13 +18,13 @@
>       # about-kubuntu.desktop file for LiveCD desktop icon
>       cp docs/about-kubuntu/desktop/about-kubuntu.desktop \
>
> docs/about-kubuntu/desktop/about-kubuntu.desktop.tobemoved
> -       dh_install docs/about-kubuntu/desktop/*.tobemoved
> usr/share/apps/khelpcenter4/plugins/kubuntu/
> +       dh_install docs/about-kubuntu/desktop/*.tobemoved
> usr/share/kde4/apps/khelpcenter4/plugins/kubuntu/
>
>       # *.desktop files to make documents appear in khelpcenter
> -       dh_install docs/khelpdesktop/kubuntu/*.desktop
> usr/share/apps/khelpcenter4/plugins/kubuntu/
> +       dh_install docs/khelpdesktop/kubuntu/*.desktop
> usr/share/kde4/apps/khelpcenter4/plugins/kubuntu/
>
>       # this is the .directory file for proper naming in khelpcenter.
> -       dh_install docs/khelpdesktop/kubuntu/.directory
> usr/share/apps/khelpcenter4/plugins/kubuntu/
> +       dh_install docs/khelpdesktop/kubuntu/.directory
> usr/share/kde4/apps/khelpcenter4/plugins/kubuntu/
>
>       # now add a pinch of css
>       dh_install build/kubuntu/common/kubuntu-default.css
> usr/share/doc/kde4/HTML/en/common/
>
> === modified file 'docs/about-kubuntu/C/about-kubuntu.xml'
> --- a/docs/about-kubuntu/C/about-kubuntu.xml    2008-08-12 03:34:20 +0000
> +++ b/docs/about-kubuntu/C/about-kubuntu.xml    2008-10-06 15:49:36 +0000
> @@ -33,8 +33,8 @@
>
>  <para>
>  Welcome to Kubuntu &distro-rev;: the &distro-version; Release. Kubuntu is
> a
> -user-friendly Linux operating system that utilizes KDE, the K Desktop
> -Environment. With a predictable 6 month release cycle as part of the
> Ubuntu
> +user-friendly Linux operating system that uses KDE for its desktop.
> +With a predictable 6 month release cycle as part of the Ubuntu
>  project, Kubuntu is the Linux distribution for everyone. The entire
> Kubuntu team
>  would like to thank you for using Kubuntu.
>  </para>
> @@ -45,7 +45,7 @@
>  version &linux-kernel-version; and KDE &kde-version;, and then covers
> every
>  standard desktop application from word processing and spreadsheet to
> Internet
>  access applications, web server software, email software, programming
> -languages and tools, and more.
> +languages and much more.
>  </para>
>
>  <sect2 id="philosophy" status="draft">
> @@ -83,7 +83,7 @@
>  <para>
>  Kubuntu is entirely committed to the principles of free software and
> open source
>  development; we encourage people to use free and open source software,
> improve
> -it, and pass it on.
> +it and pass it on.
>  </para>
>  </listitem>
>  </itemizedlist>
> @@ -94,10 +94,10 @@
>
>  <note><title>Your data is safe</title>
>  <para>
> -If you have not initiated the install of Kubuntu, and are just running the
> +If you have not started the install of Kubuntu, and are just running the
>  Live CD to see what Kubuntu has to offer, then your data is safe. This
> Live CD
>  will not harm your data unless you intend to do so by clicking the
> -<guibutton>Install</guibutton> icon and utilize the entire hard disk
> during the
> +<guibutton>Install</guibutton> icon and use the entire hard disk during
> the
>  install.
>  </para>
>  </note>
> @@ -106,7 +106,7 @@
>  Welcome to the Kubuntu Live CD. The Live CD provides you with a test run
> of
>  Kubuntu without destroying the data that is currently on your computer.
> The
>  Live CD also provides you the option to install Kubuntu onto your system
> in a
> -variety of ways. You can install it as a standalone system by utilizing
> your
> +variety of ways. You can install it as a standalone system by using your
>  entire hard drive or you can set it up as an option in a multi-boot
> system.
>  </para>
>
> @@ -266,9 +266,9 @@
>  <varlistentry><term>Adobe Acrobat Reader</term>
>  <listitem>
>  <para>
> -<application>KPDF</application> is the default <acronym>PDF</acronym>
> viewer for
> +<application>Okular</application> is the default
> <acronym>PDF</acronym> viewer for
>  Kubuntu. Further information is available in the <ulink type="help"
> -url="help:/kpdf">KPDF Handbook</ulink>.
> +url="help:/okular">Okular Handbook</ulink>.
>  </para>
>  </listitem>
>  </varlistentry>
> @@ -303,11 +303,6 @@
>  <ulink url="http://en.wikipedia.org/wiki/Linux">Wikipedia</ulink>
>  </para>
>  </listitem>
> -<listitem>
> -<para>
> -<ulink url="http://www.getgnulinux.org/">get GNU/Linux</ulink>
> -</para>
> -</listitem>
>  </itemizedlist>
>  </para>
>  </sect2>
> @@ -316,7 +311,7 @@
>  <title>What is KDE?</title>
>
>  <para>
> -The default desktop environment for Kubuntu is KDE, a powerful Free
> Software
> +The default desktop for Kubuntu is KDE, a powerful Free Software
>  graphical desktop environment for Linux and Unix workstations. It combines
> ease
>  of use, contemporary functionality, and outstanding graphical design with
> the
>  technological superiority of the Unix operating system. KDE is one of many
> @@ -340,17 +335,17 @@
>  <para>
>  KDE is in many ways similar to GNOME, but there are a few distinct
> differences
>  which distinguish KDE as a desktop environment. KDE uses C++ at its base,
> with
> -Qt (the Q-toolkit), whereas GNOME, using GTK, is written in C. KDE is the
> older
> +Qt, whereas GNOME, using GTK, is written in C. KDE is the older
>  and most widely used desktop environment, and is known to stress more the
>  importance of features, and more recently, usability. GNOME more
> notoriously
>  prides itself on simplicity and ease of use. Popular criticisms of GNOME
> are
> -that it's lacking in features and applications, while it's often commented
> that
> +that it's lacking in features and applications, while it is often
> commented that
>  KDE has too many features which may themselves be hard to locate.
>  </para>
>
>  <para>
>  Nevertheless, KDE and GNOME respectively target different audiences, and
> are
> -fundamentally different in some respects, and the question of which
> desktop
> +fundamentally different in some respects.  The question of which desktop
>  environment is superior is inherently a subjective opinion in many ways.
>  Because of this, to at least make a proper decision about which is more
> suited
>  to yourself, it is advised that you try them both out. Thus, it is very
> easy to
> @@ -365,8 +360,8 @@
>  <para>
>  As an Ubuntu user, you may be concerned that your favorite GNOME
> applications
>  will not run under Kubuntu. That is not the case. In recent times,
> much work has
> -been done to increase compatibility between GNOME and KDE. Today,
> virtually
> -all GNOME applications will run under KDE and vice versa.
> +been done to increase compatibility between GNOME and KDE.
> +All GNOME applications will run under KDE and vice versa.
>  </para>
>
>  <para>
>
> === modified file 'libs/global.ent'
> --- a/libs/global.ent   2008-08-12 03:34:20 +0000
> +++ b/libs/global.ent   2008-10-06 15:49:36 +0000
> @@ -9,9 +9,9 @@
>  <!ENTITY distro-version 'Intrepid Ibex'>
>  <!ENTITY distro-rev '8.10'>
>  <!ENTITY distro-release-date "October 2008">
> -<!ENTITY distro-short-codename "hardy">
> +<!ENTITY distro-short-codename "intrepid">
>  <!ENTITY distro-apt-cd-name "Ubuntu 8.10_Intrepid_Ibex">
> -<!ENTITY linux-kernel-version "2.6.24">
> +<!ENTITY linux-kernel-version "2.6.27">
>  <!ENTITY gcc-version "4.1.2">
>  <!ENTITY glibc-version "2.8">
>  <!ENTITY python-version "2.5">
>
> === modified file 'libs/kde.ent'
> --- a/libs/kde.ent      2008-04-02 06:59:12 +0000
> +++ b/libs/kde.ent      2008-10-06 15:49:36 +0000
> @@ -1,7 +1,7 @@
>  <?xml version="1.0" encoding="UTF-8"?>
>  <!-- VERSIONS -->
> -<!ENTITY kde-version '4.0.2'>
> -<!ENTITY kubuntu-support 'http://kubuntu.org/support.php'>
> +<!ENTITY kde-version '4.1.2'>
> +<!ENTITY kubuntu-support 'http://kubuntu.org/support'>
>  <!ENTITY adept 'Adept'>
>  <!ENTITY appshort '<application>Adept</application>'>
> -<!ENTITY different-user 'kdesu'>
> +<!ENTITY different-user 'kdesudo'>
>
>
>
> --
> Kubuntu Docs for Intrepid
> https://code.launchpad.net/~ubuntu-core-doc/ubuntu-doc/kubuntu-intrepid<https://code.launchpad.net/%7Eubuntu-core-doc/ubuntu-doc/kubuntu-intrepid>
>
> You are receiving this branch notification because you are subscribed to
> it.
>
> --
> ubuntu-doc mailing list
> ubuntu-doc at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc
>
Matt,

I would hope this could make the freeze exception.  Also system-settings.xml
was somehow deleted in one of my commits and i'm working on
reverting/recommitting it.  both of these need freeze exceptions

Jonathan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20081006/f85104fd/attachment.html>


More information about the ubuntu-doc mailing list