Author: lucius Date: Fri Aug 24 21:23:35 2007 New Revision: 4293 Modified: trunk/libs/global.ent trunk/xubuntu/about-xubuntu/C/about-xubuntu.xml trunk/xubuntu/administrative/C/administrative.xml trunk/xubuntu/libs/shipped-docs
Log: 3 patches from jim; small fix to ship about-xubuntu Modified: trunk/libs/global.ent ============================================================================== --- trunk/libs/global.ent (original) +++ trunk/libs/global.ent Fri Aug 24 21:23:35 2007 @@ -129,6 +129,7 @@ <!-- XUBUNTU URL RESOURCES --> <!ENTITY xubuntu-web 'http://www.xubuntu.org' > <!ENTITY xubuntu-main 'http://www.xubuntu.org' > +<!ENTITY xubuntu-web-help 'http://www.xubuntu.org/help' > <!-- DEBIAN RESOURCES --> <!ENTITY debian-apt 'http://www.debian.org/doc/user-manuals#apt-howto' > Modified: trunk/xubuntu/about-xubuntu/C/about-xubuntu.xml ============================================================================== --- trunk/xubuntu/about-xubuntu/C/about-xubuntu.xml (original) +++ trunk/xubuntu/about-xubuntu/C/about-xubuntu.xml Fri Aug 24 21:23:35 2007 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [ +<!ENTITY % gnome-menus-C SYSTEM "../../libs/gnome-menus-C.ent"> +%gnome-menus-C; <!ENTITY % globalent SYSTEM "../../../libs/global.ent"> %globalent; <!ENTITY % cdo-C SYSTEM "../../../libs/cdo-C.ent"> %cdo-C; -<!ENTITY % gnome-menus-C SYSTEM "../../libs/gnome-menus-C.ent"> -%gnome-menus-C; <!ENTITY language "&EnglishAmerican;"> <!ENTITY language "en"> ]> @@ -50,7 +50,7 @@ <listitem> <para>Xubuntu includes the very best in translations and accessibility infrastructure that the free software - community has to offer, to make Xubuntu usable for as + community has to offer, making Xubuntu usable for as many people as possible. </para> </listitem> @@ -74,31 +74,18 @@ <para>Find out more at <ulink url="&xubuntu-web;">the Xubuntu website</ulink>. </para> - <sect1 id="about-ubuntu-name" status="draft"> + <sect1 id="about-xubuntu-name" status="draft"> <title>About the Name</title> - <para>The Xubuntu operating system is based on the Ubuntu Linux core. - Ubuntu is a South African ethical ideology focusing on - people's allegiances and relations with each other. The - word comes from the Zulu and Xhosa languages. Ubuntu - (pronounced "oo-BOON-too") is seen as a - traditional African concept, is regarded as one of the - founding principles of the new republic of South Africa - and is connected to the idea of an African Renaissance. - </para> - <para>A rough translation of the principle of Ubuntu is - "humanity towards others". Another - translation could be: "the belief in a - universal bond of sharing that connects all - humanity". - </para> + <para>The "X" in Xubuntu stands for the Xfce graphical desktop environment, but the word "Ubuntu" represents both the technical and philosophical core of the operating system. "Ubuntu" is a South African ethical ideology focusing on people's allegiances and relations with each other. The word comes from the Zulu and Xhosa languages. Ubuntu (pronounced "oo-BOON-too") is seen as a traditional African concept, is regarded as one of the founding principles of the new republic of South Africa and is connected to the idea of an African Renaissance. + </para> + <para>A rough translation of the principle of Ubuntu is "humanity towards others". Another translation could be: "the belief in a universal bond of sharing that connects all humanity". + </para> <blockquote><attribution>Archbishop Desmond Tutu</attribution> <para>"A person with ubuntu is open and available to others, affirming of others, does not feel threatened that others are able and good, for he or she has a proper self-assurance that comes from knowing that he or she belongs in a greater whole and is diminished when others are humiliated or diminished, when others are tortured or oppressed." </para> </blockquote> - <para>As a part of the Ubuntu family of Linux-based distributions, the Xubuntu - operating system brings the spirit of ubuntu to the software - world. - </para> + <para>As a part of the Ubuntu family of Linux-based distributions, the Xubuntu operating system brings the spirit of ubuntu to the software world. + </para> </sect1> <sect1 id="free-software" status="draft"> <title>Free Software</title> @@ -107,7 +94,7 @@ are encouraged to use free software, improve it, and pass it on. </para> - <para>"Free software" doesn't mean that you shouldn't have to pay for it (although Xubuntu is committed to being free of charge as well); it means that you should be able to use the software in any way you wish: the code that makes up free software is available for anyone to download, change, fix, and use in any way. Alongside ideological benefits, this freedom also has technical advantages: when programs are developed, the hard work of others can be used and built upon. With non-free software, this cannot happen and when programs are developed, they have to start from scratch. For this reason the development of free software is fast, efficient and exciting! + <para>"Free software" doesn't mean that you shouldn't have to pay for it (although Xubuntu is committed to being free of charge as well); it means that you should be able to use the software in any way you wish: the code that makes up free software is available for anyone to download, change, fix, and use in any way. Alongside ideological benefits, this freedom also has technical advantages: when programs are developed, the hard work of others can be used and built upon. With non-free software, this cannot happen and when programs are developed, they have to start from scratch. For this reason the development of free software is fast, efficient and exciting! </para> <para>You can find out more about free software and the ideological and technical philosophy behind it at the <ulink url="&gnu-philosophy;">GNU website</ulink>. </para> @@ -115,8 +102,8 @@ <sect1 id="xubuntu-difference" status="draft"> <title>The Difference</title> <para>There are many different operating systems based on Linux: - Debian, SuSE, Gentoo, Red Hat, and Mandriva are examples. - Xubuntu is yet another contender in what + Debian, SuSE, Gentoo, Red Hat, and Mandriva are examples. + Xubuntu is yet another contender in what is already a highly competitive world. So what makes Xubuntu different? </para> @@ -150,7 +137,7 @@ </sect1> <sect1 id="xubuntu-desktop" status="draft"> <title>The Desktop</title> - <para>The default desktop environment for Xubuntu is <ulink + <para>As mentioned above, the default desktop environment for Xubuntu is <ulink url="&xfce;">Xfce</ulink>, one of the top three Unix and Linux desktop suite and development platforms. In the words of Olivier Fourdan, the creator of the Xfce desktop environment, "Xfce is a lightweight desktop environment for various *NIX @@ -170,7 +157,7 @@ Once ubuntu-desktop is installed, you can choose to use either an Xfce or Gnome desktop environment. </para> - <para>Another leading UNIX and Linux desktop is <ulink + <para>A third leading UNIX and Linux desktop is <ulink url="&kde;">KDE</ulink>. The <ulink url="&kubuntu-main;">Kubuntu</ulink> project offers Ubuntu users an alternative choice @@ -190,23 +177,24 @@ version number comes from the year and month of the release rather than reflecting the actual version of the software. The first official release of Xubuntu (Dapper Drake) was in - June of 2006 so its version was 6.06. This version (&distro-version;) was + June of 2006 so its version was 6.06. This version of Xubuntu (&distro-version;) was released in &distro-release-date; so its version number is &distro-rev;. </para> </sect1> <sect1 id="xubuntu-backing-support" status="draft"> <title>Backing and Support</title> - <para>Xubuntu is maintained by a quickly growing community. + <para>Xubuntu is developed and supported by a quickly growing community. The project is sponsored by <ulink url="&canonical-url;">Canonical Ltd.</ulink>, a holding company founded by Mark Shuttleworth. Canonical employs the core Ubuntu developers and offers support and consulting services - for Ubuntu. Canonical does not provide consulting services support for - Xubuntu at this time. - </para> - <para>Canonical Ltd. also sponsors a number of other Open Source software - projects, about which more information can be found on the <ulink - url="&canonical-url;">Canonical website</ulink>. + for Ubuntu. More information about Canonical's support offerings can be found on the + <ulink url="&canonical-url;">Canonical website</ulink>. + </para> + <para>Although Canonical does not provide professional consulting services support + for Xubuntu at this time, Xubuntu user support is available through the Xubuntu + community. Information regarding community support can be found at the + <ulink url="&xubuntu-web-help;">Help & Support</ulink> page of the Xubuntu website. </para> </sect1> <sect1 id="about-linux" status="complete"> Modified: trunk/xubuntu/administrative/C/administrative.xml ============================================================================== --- trunk/xubuntu/administrative/C/administrative.xml (original) +++ trunk/xubuntu/administrative/C/administrative.xml Fri Aug 24 21:23:35 2007 @@ -17,7 +17,7 @@ <title>Administrative Tasks</title> &legalnotice; </articleinfo> - <para>In Ubuntu, for security reasons, administrative tasks are confined to users with special privileges. Administrative access is given to individual users, who may use the <application>sudo</application> command to perform administrative tasks. The first user account you created on your system during installation will, by default, have access to sudo. You can restrict and enable sudo access to users with the <application>Users and Groups</application> application (see <xref linkend="users-and-groups"/> for more information). + <para>In Xubuntu, for security reasons, administrative tasks are confined to users with special privileges. Administrative access is given to individual users, who may use the <application>sudo</application> command to perform administrative tasks. The first user account you created on your system during installation will, by default, have access to sudo. You can restrict and enable sudo access to users with the <application>Users and Groups</application> application (see <ulink url="users-groups;">users and groups</ulink> for more information). </para> <para>When you run an application that requires administrative privileges, sudo will ask you to input your user password. This ensures that rogue applications cannot damage your system, and serves as a reminder that you are about to perform administrative actions which require you to be careful! However, each time you insert the password, the system remembers it for 15 minutes so that you do not have to type it again. </para> Modified: trunk/xubuntu/libs/shipped-docs ============================================================================== --- trunk/xubuntu/libs/shipped-docs (original) +++ trunk/xubuntu/libs/shipped-docs Fri Aug 24 21:23:35 2007 @@ -1,4 +1,4 @@ -about-ubuntu +about-xubuntu add-applications administrative advanced-topics -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
