------------------------------------------------------------
revno: 3655
committer: Jim Campbell <[EMAIL PROTECTED]>
branch nick: xubuntu-hardy
timestamp: Sun 2008-03-09 12:16:45 -0500
message:
  removed inappropriate references to Ubuntu in Xubuntu documentation, closing 
bug 150209.  Added small bit of information regarding pyxfce to programming.xml
modified:
  xubuntu/administrative/C/administrative.xml
  xubuntu/programming/C/programming.xml
  xubuntu/windows/C/glossary.xml
  xubuntu/windows/C/migratingdata.xml
  xubuntu/windows/C/preparing.xml
  xubuntu/windows/C/windows.xml

=== modified file 'xubuntu/administrative/C/administrative.xml'
--- a/xubuntu/administrative/C/administrative.xml       2008-02-28 23:40:03 
+0000
+++ b/xubuntu/administrative/C/administrative.xml       2008-03-09 17:16:45 
+0000
@@ -14,7 +14,7 @@
 ]>
        <article id="root-and-sudo" status="complete">
                        <title>Administrative Tasks</title>     
-                       <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>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="../../newtoubuntu/C/usersandgroups.xml">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 file 'xubuntu/programming/C/programming.xml'
--- a/xubuntu/programming/C/programming.xml     2008-02-28 23:40:03 +0000
+++ b/xubuntu/programming/C/programming.xml     2008-03-09 17:16:45 +0000
@@ -10,22 +10,37 @@
 <!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
 %xinclude;
 <!ENTITY language "en">
-<!ENTITY ubuntu '<phrase>Ubuntu</phrase>'>
+<!ENTITY Xubuntu '<phrase>Xubuntu</phrase>'>
 ]>
        <chapter id="programming" status="complete">
                <title>Programming</title>
 
-                       <para>This section contains some basic information for 
those wishing to use Ubuntu for writing and running their own programs.</para>
+                       <para>This section contains some basic information for 
those wishing to use Xubuntu for writing and running their own programs.</para>
                
                <sect1 status="complete">
                                <title>Learning how to program</title>
-                               <para>Ubuntu provides a number of resources 
intended to help you to learn how to develop and run programs yourself. Below 
is a list of some resources which you may find useful.</para>
+                               <para>Xubuntu provides a number of resources 
intended to help you to learn how to develop and run programs yourself. Below 
is a list of some resources which you may find useful.</para>
                                <sect2 id="diveintopython" status="complete">
                                        <title><citetitle>Dive Into 
Python</citetitle></title>
                                        <para><citetitle>Dive Into 
Python</citetitle> is a book for learning how to program in Python, aimed at 
programmers with some previous experience.</para>
                                        <itemizedlist>
                                                <listitem><para><ulink 
url="file:///usr/share/doc/diveintopython/html/toc/index.html">Read 
<citetitle>Dive Into Python</citetitle></ulink></para></listitem>
                                        </itemizedlist>
+                               </sect2>
+                               <sect2 id="pyxfce-information" status="draft">
+                                   <title>Xfce development using Python</title>
+                                       <para>Pyxfce are a collection of Xfce 
bindings for Python. You can use Python to create Xfce programs after you have 
installed Pyxfce.
+                                       </para>
+                                       <procedure>
+                                                       <step>
+                                                               <para>Install 
the <application>pyxfce</application> package (see <ulink 
url="../../add-applications/C/add-applications.xml">Add Applications</ulink>). 
+                                                               </para>
+                                                       </step>
+                                                       <step>
+                                                               <para>For 
futher information about Pyxfce, visit the <ulink 
url="http://pyxfce.xfce.org/";>Pyxfce website</ulink>.
+                                                               </para>
+                                                       </step>
+                                               </procedure>
                                </sect2>                        
                                <sect2 id="pygtk-tutorial" status="complete">
                                        <title>PyGTK Tutorial</title>
@@ -66,7 +81,7 @@
                         <para>Install the 
<application>build-essential</application> package  (see <ulink 
url="../../add-applications/C/add-applications.xml">Add 
Applications</ulink>).</para>
                     </step>
                 </procedure>
-                <para>There are many tools available for C and C++ developers. 
Those wishing to develop graphical applications will find that choosing a 
graphical toolkit/platform will make development more convenient. The two most 
popular development platforms for Ubuntu are <quote>GTK/GNOME</quote> and 
<quote>Qt/KDE</quote>, each of which has its own set of tools and 
documentation.</para>
+                <para>There are many tools available for C and C++ developers. 
Those wishing to develop graphical applications will find that choosing a 
graphical toolkit/platform will make development more convenient. The two most 
popular development platforms for Xubuntu are <quote>GTK/GNOME</quote> and 
<quote>Qt/KDE</quote>, each of which has its own set of tools and 
documentation.</para>
                  <sect2 id="anjuta-ide" status="review">
                                <title>Anjuta IDE for GNOME</title>
                       <para><application>Anjuta</application> is an IDE for 
developing applications in C and C++ for the <quote>GNOME</quote> 
platform.</para>
@@ -97,7 +112,7 @@
                 <title>Java</title>
                 <note>
                     <para>
-                        These instructions are for <emphasis>i386</emphasis> 
and <emphasis>AMD64</emphasis> computers only. For <emphasis>PowerPC</emphasis> 
machines, see <ulink url="https://help.ubuntu.com/community/Java";>Ubuntu Help 
Online</ulink>.
+                        These instructions are for <emphasis>i386</emphasis> 
and <emphasis>AMD64</emphasis> computers only. For <emphasis>PowerPC</emphasis> 
machines, see the Ubuntu <ulink 
url="https://help.ubuntu.com/community/Java";>Java help page</ulink>.
                     </para>
                 </note>
                 <procedure>
@@ -133,7 +148,7 @@
                        
                        <sect1 status="review">
                                <title>Other programming languages</title>
-                               <para>There are many programming tools 
available in Ubuntu for many different programming languages. This section 
provides a short list of some of the more commonly-used languages.</para>
+                               <para>There are many programming tools 
available in Xubuntu for many different programming languages. This section 
provides a short list of some of the more commonly-used languages.</para>
                                
                                <sect2 id="mono" status="review">
                                        <title>Mono .NET development 
environment</title>
@@ -168,7 +183,7 @@
                        
                        <sect1 status="complete">
                                <title>Development Tools</title>
-                               <para>There are many development tools 
available for Ubuntu. A list of some of these is included below.</para>
+                               <para>There are many development tools 
available for Xubuntu. A list of some of these is included below.</para>
                                        <sect2 id="ides-and-editors" 
status="review">
                                                <title>Integrated Development 
Environments (IDEs) and source-code editors</title>
                                                <itemizedlist>
@@ -197,7 +212,7 @@
                                                <title>Source-code management 
systems</title>
                                                <itemizedlist>
                                                
-                                                       <listitem><para><ulink 
url="http://www.bazaar-ng.org/";>Bazaar-NG</ulink> is a decentralised version 
control system used for Ubuntu development.</para>
+                                                       <listitem><para><ulink 
url="http://www.bazaar-ng.org/";>Bazaar-NG</ulink> is a decentralised version 
control system used for Xubuntu development.</para>
                                                                </listitem>
                                                        <listitem><para><ulink 
url="http://www.nongnu.org/cvs/";>CVS</ulink> is an advanced version control 
system used by many open-source projects.</para>
                                                                </listitem>

=== modified file 'xubuntu/windows/C/glossary.xml'
--- a/xubuntu/windows/C/glossary.xml    2007-12-04 04:03:53 +0000
+++ b/xubuntu/windows/C/glossary.xml    2008-03-09 17:16:45 +0000
@@ -20,7 +20,7 @@
                <glossterm>Add/Remove Programs</glossterm>
                <glossdef>
                        <para>
-                               Use &gnome-app-install; to install applications 
from Ubuntu&rsquo;s
+                               Use &gnome-app-install; to install applications 
from Xubuntu&rsquo;s
                                software library,
                                or to remove existing applications from your 
computer.
                                Use &synaptic; for more advanced tasks.
@@ -31,7 +31,7 @@
                <glossterm>Control Panel</glossterm>
                <glossdef>
                        <para>
-                               Settings that affect everyone who uses Ubuntu 
on this computer
+                               Settings that affect everyone who uses Xubuntu 
on this computer
                                are found in &administration;.
                                Settings that just affect you are accessed from 
&preferences;.
                        </para>
@@ -81,7 +81,7 @@
                <glossdef>
                        <para>
                                Equivalent items to those in the <quote>My 
Computer</quote> window
-                               are found in various places in Ubuntu.
+                               are found in various places in Xubuntu.
                        </para>
                        <itemizedlist>
                                <listitem>
@@ -113,7 +113,7 @@
                <glossterm>Printers &amp; Faxes</glossterm>
                <glossdef>
                        <para>
-                               Open &printing; to set up printers. Ubuntu does 
not support faxing.
+                               Open &printing; to set up printers. Xubuntu 
does not support faxing.
                        </para>
                </glossdef>
        </glossentry>
@@ -172,7 +172,7 @@
                <glossterm>Windows Update</glossterm>
                <glossdef>
                        <para>
-                               To check for updates to Ubuntu, open 
&ubuntu-update-manager;.
+                               To check for updates to Xubuntu, open 
&ubuntu-update-manager;.
                        </para>
                </glossdef>
        </glossentry>

=== modified file 'xubuntu/windows/C/migratingdata.xml'
--- a/xubuntu/windows/C/migratingdata.xml       2007-12-04 04:03:53 +0000
+++ b/xubuntu/windows/C/migratingdata.xml       2008-03-09 17:16:45 +0000
@@ -10,12 +10,12 @@
          <!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
          %xinclude;
          <!ENTITY language "en">
-         <!ENTITY ubuntu '<phrase>Ubuntu</phrase>'>
+         <!ENTITY xubuntu '<phrase>Xubuntu</phrase>'>
          ]>
 
 <section id="md" status="needs review">        
-       <title>Migrating your data into Ubuntu</title>
-       <para>This chapter provides instructions on importing your data from 
Windows applications to the corresponding Ubuntu applications. The instructions 
assume that you will use the default collection of applications installed with 
Ubuntu and have followed the instructions in the <xref linkend="preparing"/> 
chapter.</para>
+       <title>Migrating your data into Xubuntu</title>
+       <para>This chapter provides instructions on importing your data from 
Windows applications to the corresponding Xubuntu applications. The 
instructions assume that you will use the default collection of applications 
installed with Xubuntu and have followed the instructions in the <xref 
linkend="preparing"/> chapter.</para>
        <section id="md-files">
                <title>Files</title>
                <para>You will probably want to move your files into your 
<emphasis>Home folder</emphasis>. It is considered good practice to store 
<emphasis>all</emphasis> of your personal files (such as documents, pictures, 
music and the like) in your Home folder. Then, they are all in one 
easily-accessed location.</para>
@@ -70,7 +70,7 @@
 -->
        <section id="md-bookmarks">
                <title>Browser Bookmarks/Favorites</title>
-               <para>If you saved the list of favorite web pages from the 
browser you used on Windows, you can now import them into the web browser 
available with Ubuntu. The following instructions are intended for users of the 
default <application>Firefox Web Browser</application> who are importing their 
favorites from <application>Microsoft Internet Explorer 6</application>. Please 
see <xref linkend="preparing-bookmarks"/> for more information.</para>
+               <para>If you saved the list of favorite web pages from the 
browser you used on Windows, you can now import them into the web browser 
available with Xubuntu. The following instructions are intended for users of 
the default <application>Firefox Web Browser</application> who are importing 
their favorites from <application>Microsoft Internet Explorer 6</application>. 
Please see <xref linkend="preparing-bookmarks"/> for more information.</para>
                <orderedlist>
                        <listitem><para>Press 
<menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>Internet</guimenuitem><guimenuitem>Firefox
 Web Browser</guimenuitem></menuchoice> to start the <application>Firefox Web 
Browser</application>.</para></listitem>
                        <listitem><para>Press 
<menuchoice><guimenuitem>Bookmarks</guimenuitem><guimenuitem>Manage 
Bookmarks...</guimenuitem></menuchoice> to launch the <application>Bookmark 
Manager</application>.</para></listitem>

=== modified file 'xubuntu/windows/C/preparing.xml'
--- a/xubuntu/windows/C/preparing.xml   2007-12-04 04:03:53 +0000
+++ b/xubuntu/windows/C/preparing.xml   2008-03-09 17:16:45 +0000
@@ -10,15 +10,15 @@
          <!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
          %xinclude;
          <!ENTITY language "en">
-         <!ENTITY ubuntu '<phrase>Ubuntu</phrase>'>
+         <!ENTITY xubuntu '<phrase>Xubuntu</phrase>'>
          ]>
          
 <section id="preparing" status="complete">
        <title>Preparing to switch</title>
-       <para>While using Windows you will have probably stored a great deal of 
data, including documents, emails, photographs and music. The chances are that 
you will want to transfer most of this information for use with Ubuntu. This 
section provides instructions on how to prepare yourself and your data for 
moving to Ubuntu. For the purposes, of this guide, you'll need access to your 
Windows system.</para>
+       <para>While using Windows you will have probably stored a great deal of 
data, including documents, emails, photographs and music. The chances are that 
you will want to transfer most of this information for use with Xubuntu. This 
section provides instructions on how to prepare yourself and your data for 
moving to Xubuntu. For the purposes, of this guide, you'll need access to your 
Windows system.</para>
        <section id="preparing-organising-files">
                <title>Organising your files</title>
-               <para>A good way of making sure that your data is safe and 
ready to be used in Ubuntu is to organise your files before you make the 
switch.</para>
+               <para>A good way of making sure that your data is safe and 
ready to be used in Xubuntu is to organise your files before you make the 
switch.</para>
                <itemizedlist>
                        <listitem><para><emphasis role='strong'>Delete files 
which you do not use or need any more</emphasis></para></listitem>
                        <listitem><para><emphasis role='strong'>Organize your 
files neatly into folders</emphasis></para></listitem>
@@ -27,14 +27,14 @@
                </itemizedlist>
                <section id="preparing-organising-general">
                        <title>General file organisation</title>
-                       <para>Of all of the data on your computer, a sizeable 
portion is likely to be <emphasis>redundant</emphasis>. That is, it is data 
which you will never need to use again, and there is no value in saving it for 
posterity. Before switching to Ubuntu, it is a good idea to identify and remove 
this redundant data. This has the advantage of reducing the amount of data 
which you must copy across from your Windows installation to your new Ubuntu 
installation.</para>
+                       <para>Of all of the data on your computer, a sizeable 
portion is likely to be <emphasis>redundant</emphasis>. That is, it is data 
which you will never need to use again, and there is no value in saving it for 
posterity. Before switching to Xubuntu, it is a good idea to identify and 
remove this redundant data. This has the advantage of reducing the amount of 
data which you must copy across from your Windows installation to your new 
Xubuntu installation.</para>
                        <para>If your data is organised neatly, back-up and 
retrieval of that data when you make the switch will be much simplified. It is 
worth spending a little time organising your data into one location, with 
different directories for different files and folders. If you have a tidy 
collection of documents, you are less likely to forget an important document 
when making the switch.</para>
                        <para>It is recommended that you move all of the files 
you wish to save into your <filename>My Documents</filename> folder and then 
organize them into folders (for example, by category or by type of file). This 
way, everything you need is in one location rather than being spread across 
multiple directories.</para>
                        <para>There are many tools available to help you to 
organise your data and to remove unused files. Windows XP has a built-in tool 
to help you to clean-up your files. Press 
<menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>All 
Programs</guimenuitem><guimenuitem>Accessories</guimenuitem><guimenuitem>System 
Tools</guimenuitem><guimenuitem>Disk Cleanup</guimenuitem></menuchoice> to run 
the <application>Windows XP Disk Cleanup Tool</application>.</para>
                </section>
                <section id="preparing-organising-finding">
                        <title>Finding forgotten files</title>
-                       <para>You may have stored files in a location which you 
have forgotten about. As such, you may miss these files out of your back-up 
procedure and so they will not be transferred across to your Ubuntu 
installation. To find files of a specific type, regardless of their location, 
follow this procedure:</para>
+                       <para>You may have stored files in a location which you 
have forgotten about. As such, you may miss these files out of your back-up 
procedure and so they will not be transferred across to your Xubuntu 
installation. To find files of a specific type, regardless of their location, 
follow this procedure:</para>
                        <orderedlist>
                                <listitem><para>Press 
<menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>Search</guimenuitem></menuchoice>
 to start the <application>Search</application> application.</para></listitem>
                                <listitem><para>Press the <guibutton>All files 
and folders</guibutton> button.</para></listitem>
@@ -46,66 +46,66 @@
        </section>
        <section id="preparing-converting-file-types">
                <title>Converting unsupported file types</title>
-               <para>While applications available for Ubuntu support most 
common file types, there are still many file types which are not supported. If 
you have files in an unsupported format, it is recommended that you try to 
convert them to a supported format before switching. This section covers some 
common, unsupported or only partially-supported file types and lists possible 
alternatives and methods of conversion.</para>
+               <para>While applications available for Xubuntu support most 
common file types, there are still many file types which are not supported. If 
you have files in an unsupported format, it is recommended that you try to 
convert them to a supported format before switching. This section covers some 
common, unsupported or only partially-supported file types and lists possible 
alternatives and methods of conversion.</para>
                <itemizedlist>
-                       <listitem><para><emphasis role='strong'>Some types of 
file cannot be used in Ubuntu</emphasis></para></listitem>
+                       <listitem><para><emphasis role='strong'>Some types of 
file cannot be used in Xubuntu</emphasis></para></listitem>
                        <listitem><para><emphasis role='strong'>Check to see 
whether the file types you use are supported</emphasis></para></listitem>
                        <listitem><para><emphasis role='strong'>Convert the 
files which are of an unsupported type</emphasis></para></listitem>
                </itemizedlist>
                <section id="preparing-converting-audio">
                        <title>Converting unsupported audio formats</title>
                        <itemizedlist>
-                               <listitem><para><emphasis role='strong'>Many 
common audio formats cannot be played on Ubuntu without the installation of 
additional software. This is due to legal 
restrictions.</emphasis></para></listitem>
+                               <listitem><para><emphasis role='strong'>Many 
common audio formats cannot be played on Xubuntu without the installation of 
additional software. This is due to legal 
restrictions.</emphasis></para></listitem>
                        </itemizedlist>
-                       <para>Unfortunately, due to legal restrictions and 
technical issues with some common audio formats, Ubuntu cannot play some audio 
formats out-of-the-box. While support for certain restricted formats can be 
added after you have installed Ubuntu, it can be advantageous to convert audio 
files to a well-supported format. This is especially important if the files 
have been encoded using some form of <emphasis>Digital Rights Management 
(DRM)</emphasis> software, as DRM restrictions can render files unplayable in 
all applications but the one in which they were applied.</para>
-                       <para>The following major audio formats are proprietary 
and so are not supported by default in Ubuntu:</para>
+                       <para>Unfortunately, due to legal restrictions and 
technical issues with some common audio formats, Xubuntu cannot play some audio 
formats out-of-the-box. While support for certain restricted formats can be 
added after you have installed Xubuntu, it can be advantageous to convert audio 
files to a well-supported format. This is especially important if the files 
have been encoded using some form of <emphasis>Digital Rights Management 
(DRM)</emphasis> software, as DRM restrictions can render files unplayable in 
all applications but the one in which they were applied.</para>
+                       <para>The following major audio formats are proprietary 
and so are not supported by default in Xubuntu:</para>
                        <itemizedlist>
                                <listitem><para>MP3</para></listitem>
                                <listitem><para>WMA</para></listitem>
                                <listitem><para>AAC</para></listitem>
                                <listitem><para>RealAudio</para></listitem>
                        </itemizedlist>
-                       <para>For a well-supported audio format to replace MP3 
and WMA, consider the <emphasis>Ogg Vorbis</emphasis> format. For a 
well-supported lossless (very high quality) format to replace AAC Lossless and 
WMA-VBR, consider the <emphasis>FLAC</emphasis> format. Both of these formats 
are open, and can be played in Ubuntu without the installation of any 
additional software.</para>
+                       <para>For a well-supported audio format to replace MP3 
and WMA, consider the <emphasis>Ogg Vorbis</emphasis> format. For a 
well-supported lossless (very high quality) format to replace AAC Lossless and 
WMA-VBR, consider the <emphasis>FLAC</emphasis> format. Both of these formats 
are open, and can be played in Xubuntu without the installation of any 
additional software.</para>
                        <para>There are many audio conversion applications for 
Windows available for download, and some of these can be obtained free of 
charge. These applications are also sometimes referred to as <emphasis>audio 
(re)encoders</emphasis>. Your choice of application depends on the formats 
which you wish to convert from and to. See websites such as <ulink 
url="http://www.download.com/Rippers-Encoders/3150-2140_4-0.html?tag=dir";>Download.com</ulink>
 for a list of potentially useful applications.</para>
-                       <para>It is still possible to add support for many 
restricted formats (such as those listed above) to Ubuntu after installation. 
See the <ulink 
url="https://help.ubuntu.com/community/RestrictedFormats";>Restricted 
Formats</ulink> document on the Ubuntu community support website for more 
information.</para>
+                       <para>It is still possible to add support for many 
restricted formats (such as those listed above) to Xubuntu after installation. 
See the <ulink 
url="https://help.ubuntu.com/community/RestrictedFormats";>Restricted 
Formats</ulink> document on the Ubuntu community support website for more 
information.</para>
                </section>
                <section id="preparing-converting-video">
                        <title>Converting unsupported video formats</title>
                        <itemizedlist>
-                               <listitem><para><emphasis role='strong'>Many 
common video formats cannot be played on Ubuntu without the installation of 
additional software. This is due to legal 
restrictions.</emphasis></para></listitem>
+                               <listitem><para><emphasis role='strong'>Many 
common video formats cannot be played on Xubuntu without the installation of 
additional software. This is due to legal 
restrictions.</emphasis></para></listitem>
                        </itemizedlist>
-                       <para>As with audio formats, due to legal and technical 
issues, many video formats are not supported by the default Ubuntu install. 
While support for some formats can be added at a later date, it is recommended 
that you convert important video files in unsupported formats to a format which 
is well supported in Ubuntu.</para>
-                       <para>As with the audio formats, there are many video 
converter applications available as free-of-charge downloads for Windows. 
Consider converting your video files to a format which is well-supported by 
Ubuntu, such as <emphasis>Ogg Theora</emphasis>.</para>
-                       <para>The following major video formats are not 
supported by default in Ubuntu:</para>
+                       <para>As with audio formats, due to legal and technical 
issues, many video formats are not supported by the default Xubuntu install. 
While support for some formats can be added at a later date, it is recommended 
that you convert important video files in unsupported formats to a format which 
is well supported in Xubuntu.</para>
+                       <para>As with the audio formats, there are many video 
converter applications available as free-of-charge downloads for Windows. 
Consider converting your video files to a format which is well-supported by 
Xubuntu, such as <emphasis>Ogg Theora</emphasis>.</para>
+                       <para>The following major video formats are not 
supported by default in Xubuntu:</para>
                        <itemizedlist>
                                <listitem><para>WMV</para></listitem>
                                <listitem><para>RealVideo</para></listitem>
                                <listitem><para>DivX</para></listitem>
                                <listitem><para>QuickTime</para></listitem>
                        </itemizedlist>
-                       <para>It is still possible to add support for many 
restricted formats (such as those listed above) to Ubuntu after installation. 
See the <ulink 
url="https://help.ubuntu.com/community/RestrictedFormats";>Restricted 
Formats</ulink> document on the Ubuntu community support website for more 
information.</para>
+                       <para>It is still possible to add support for many 
restricted formats (such as those listed above) to Xubuntu after installation. 
See the <ulink 
url="https://help.ubuntu.com/community/RestrictedFormats";>Restricted 
Formats</ulink> document on the Ubuntu community support website for more 
information.</para>
                </section>
                <section id="preparing-converting-office">
                        <title>Converting unsupported office document 
formats</title>
                        <itemizedlist>
-                               <listitem><para><emphasis role='strong'>Ubuntu 
office applications can read most common office document formats without the 
need for conversion</emphasis></para></listitem>
+                               <listitem><para><emphasis role='strong'>Xubuntu 
office applications can read most common office document formats without the 
need for conversion</emphasis></para></listitem>
                        </itemizedlist>
-                       <para>The default office suite of Ubuntu, 
<application>OpenOffice.org</application>, supports very many office document 
formats right out of the box. These include many of the Microsoft Office, Corel 
and Lotus formats. If you find that you do have files in formats which are 
unsupported, it is likely that your existing office suite or application will 
have the ability to save the files to a better-supported format.</para>
-                       <para>The OpenDocument file formats are gaining 
popularity and are expected to become the de facto supported office formats for 
Ubuntu. While many older applications cannot save to the OpenDocument format, 
other formats such as .doc and RTF are also well supported.</para>
+                       <para>The default office suite of Xubuntu, 
<application>OpenOffice.org</application>, supports very many office document 
formats right out of the box. These include many of the Microsoft Office, Corel 
and Lotus formats. If you find that you do have files in formats which are 
unsupported, it is likely that your existing office suite or application will 
have the ability to save the files to a better-supported format.</para>
+                       <para>The OpenDocument file formats are gaining 
popularity and are expected to become the de facto supported office formats for 
Xubuntu. While many older applications cannot save to the OpenDocument format, 
other formats such as .doc and RTF are also well supported.</para>
                </section>
                <section id="preparing-converting-specific">
                        <title>Converting from application-specific 
formats</title>
                        <itemizedlist>
-                               <listitem><para><emphasis role='strong'>Some 
file formats are specific to particular Windows-only applications, and so 
cannot be used with Ubuntu software</emphasis></para></listitem>
+                               <listitem><para><emphasis role='strong'>Some 
file formats are specific to particular Windows-only applications, and so 
cannot be used with Xubuntu software</emphasis></para></listitem>
                        </itemizedlist>
-                       <para>Many applications use file formats specific to 
them. A good example is the <application>Adobe Photoshop</application> file 
format. Formats such as these are generally able to store additional data 
compared to widely-used standard formats and so are still useful. You may find 
that applications exist on Ubuntu to convert or use application specific 
formats. The <application>GIMP Image Editor</application> is able to use Adobe 
PSD files, for example.</para>
-                       <para>If you are uncertain whether a format is 
application-specific or has a usable alternative, seek help from an <ulink 
url="http://www.ubuntu.com/support";>Ubuntu support channel</ulink>.</para>
+                       <para>Many applications use file formats specific to 
them. A good example is the <application>Adobe Photoshop</application> file 
format. Formats such as these are generally able to store additional data 
compared to widely-used standard formats and so are still useful. You may find 
that applications exist on Xubuntu to convert or use application specific 
formats. The <application>GIMP Image Editor</application> is able to use Adobe 
PSD files, for example.</para>
+                       <para>If you are uncertain whether a format is 
application-specific or has a usable alternative, seek help from a <ulink 
url="http://www.xubuntu.org/help";>Xubuntu support channel</ulink>.</para>
                </section>
        </section>
        <section id="preparing-backing-up-entire">
                <title>Backing-up your Windows installation</title>
                <para>It is possible to back-up your Windows installation as a 
whole, using a <emphasis>disk imaging utility</emphasis>. Such a utility 
creates an exact copy of your current Windows installation, which can be saved 
to several discs. If you experience a major problem when migrating, having a 
disk image allows you to restore your Windows installation fully without losing 
any data or settings. However, disk imaging utilities can be expensive and also 
require a great deal of storage space.</para>
-               <para>Ubuntu does not currently provide disk-imaging software, 
and so such software can only be obtained from third party suppliers.</para>
+               <para>Xubuntu does not currently provide disk-imaging software, 
and so such software can only be obtained from third party suppliers.</para>
                <para>Below is a list of disk-imaging utilities:</para>
                <itemizedlist>
                        <listitem><para>Acronis True Image*</para></listitem>
@@ -157,7 +157,7 @@
                </section>
                <section id="preparing-settings-internet-proxy">
                        <title>Proxy server settings</title>
-                       <para>If you connect to the Internet through a proxy 
server, you will need to make a note of some details of the proxy server in 
order to allow Ubuntu to connect to the Internet.</para>
+                       <para>If you connect to the Internet through a proxy 
server, you will need to make a note of some details of the proxy server in 
order to allow Xubuntu to connect to the Internet.</para>
                        <orderedlist>
                                <listitem><para>Press 
<menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>Control 
Panel</guimenuitem><guimenuitem>Network and Internet 
Connections</guimenuitem><guimenuitem>Internet 
Options</guimenuitem></menuchoice>.</para></listitem>
                                <listitem><para>On the 
<guilabel>Connections</guilabel> tab, press <guibutton>LAN 
Settings...</guibutton>.</para></listitem>
@@ -168,10 +168,10 @@
        </section>
        <section id="preparing-settings-network">
                <title>Network Settings</title>
-               <para>While Ubuntu is usually able to automatically detect the 
settings for your network, it is wise to make a note of relevant network 
settings in case the network you are trying to connect to cannot be handled 
automatically.</para>
+               <para>While Xubuntu is usually able to automatically detect the 
settings for your network, it is wise to make a note of relevant network 
settings in case the network you are trying to connect to cannot be handled 
automatically.</para>
                <section id="preparing-settings-network-home">
                        <title>Home networks</title>
-                       <para>If you have a home network, perhaps connected 
using a router or switch, there are a few settings which you may need in order 
to connect to the network successfully. While most networks will be able to 
assign correct settings to Ubuntu automatically, some networks cannot.</para>
+                       <para>If you have a home network, perhaps connected 
using a router or switch, there are a few settings which you may need in order 
to connect to the network successfully. While most networks will be able to 
assign correct settings to Xubuntu automatically, some networks cannot.</para>
                        <para>Follow the instructions below to obtain a copy of 
the network settings which you may need:</para>
                        <orderedlist>
                                <listitem><para>Press 
<menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>Run</guimenuitem></menuchoice>.
 Type <emphasis>cmd.exe</emphasis> into the box labelled 
<guilabel>Open:</guilabel> and press 
<guibutton>OK</guibutton>.</para></listitem>
@@ -200,13 +200,13 @@
                </section>
                <section id="preparing-settings-network-vpn">
                        <title>VPNs</title>
-                       <para><emphasis>Virtual Private Networks</emphasis> are 
a type of network which allow you to connect to a remote private network using 
a public network such as the Internet. There are many different types of VPN, 
which have varying degrees of support under Ubuntu. If you must connect to a 
VPN, first identify the type of VPN which you are connecting to. If the VPN is 
supported under Ubuntu, it is possible that a document will be available from 
the VPN vendor&apos;s website which can help you to connect to the 
network.</para>
+                       <para><emphasis>Virtual Private Networks</emphasis> are 
a type of network which allow you to connect to a remote private network using 
a public network such as the Internet. There are many different types of VPN, 
which have varying degrees of support under Xubuntu. If you must connect to a 
VPN, first identify the type of VPN which you are connecting to. If the VPN is 
supported under Xubuntu, it is possible that a document will be available from 
the VPN vendor&apos;s website which can help you to connect to the 
network.</para>
                        <para>Ensure that you have all of the VPN connection 
information that you think you may require.</para>
                </section>
        </section>
        <section id="preparing-settings-im">
                <title>Instant messaging settings</title>
-               <para>If you use instant messaging (chat) software, you will 
have set up a user account on an instant messaging network. Ubuntu has 
excellent support for many instant messaging networks by default, so you should 
still be able to use your existing account after you have switched. Please 
ensure that you make a note of the following information about your instant 
messaging account:</para>
+               <para>If you use instant messaging (chat) software, you will 
have set up a user account on an instant messaging network. Xubuntu has 
excellent support for many instant messaging networks by default, so you should 
still be able to use your existing account after you have switched. Please 
ensure that you make a note of the following information about your instant 
messaging account:</para>
                <itemizedlist>
                        <listitem><para>User name</para></listitem>
                        <listitem><para>Password</para></listitem>
@@ -216,7 +216,7 @@
        </section>
        <section id="preparing-bookmarks">
                <title>Browser favorites</title>
-               <para>It is likely that you will have stored a collection of 
favorite web pages in your web browser, which you would like to continue to use 
in Ubuntu. The following instructions are intended for users of the 
<application>Microsoft Internet Explorer 6</application> web browser:</para>
+               <para>It is likely that you will have stored a collection of 
favorite web pages in your web browser, which you would like to continue to use 
in Xubuntu. The following instructions are intended for users of the 
<application>Microsoft Internet Explorer 6</application> web browser:</para>
                <orderedlist>
                        <listitem><para>Start <application>Internet 
Explorer</application>.</para></listitem>
                        <listitem><para>Press 
<menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Import and 
Export...</guimenuitem></menuchoice>.</para></listitem>
@@ -230,7 +230,7 @@
        </section>
        <section id="preparing-email">
                <title>Emails and mail account settings</title>
-               <para>You can use the same email account in Ubuntu as you have 
done in Windows. If you have a Web-based email account, then you should simply 
be able to access it using a web browser as you would have done in Windows. 
Otherwise, please note down the following information so that you can re-create 
your account settings on Ubuntu:</para>
+               <para>You can use the same email account in Xubuntu as you have 
done in Windows. If you have a Web-based email account, then you should simply 
be able to access it using a web browser as you would have done in Windows. 
Otherwise, please note down the following information so that you can re-create 
your account settings on Xubuntu:</para>
                        <itemizedlist>
                                <listitem><para>Email address</para></listitem>
                                <listitem><para>Password</para></listitem>
@@ -321,19 +321,19 @@
                                <listitem><para>Press 
<menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>Run</guimenuitem></menuchoice>,
 type <emphasis>%AppData%\Thunderbird\Profiles\</emphasis> into the box 
provided, and then press <guibutton>OK</guibutton>. A folder will 
open.</para></listitem>
                                <listitem><para>In the newly-opened folder, you 
should find another folder with a name made up mostly of random characters, for 
example <emphasis>fyhsxlr3.default</emphasis>. Open this 
folder.</para></listitem>
                                <listitem><para>In this folder, locate a folder 
named <filename>Mail</filename> or <filename>ImapMail</filename>. Select this 
folder and copy it to a safe location.</para></listitem>
-                               <listitem><para>When you switch to Ubuntu, make 
a back-up copy of the folder you just made a copy of. This folder contains all 
of your mail folders from Thunderbird, in the <emphasis>mbox</emphasis> 
format.</para></listitem>
+                               <listitem><para>When you switch to Xubuntu, 
make a back-up copy of the folder you just made a copy of. This folder contains 
all of your mail folders from Thunderbird, in the <emphasis>mbox</emphasis> 
format.</para></listitem>
                        </orderedlist>
                </section>
        </section>
        <section id="preparing-storage">
                <title>Transferring your data safely</title>
-               <para>Once you have collected together all of the files and 
settings you might need, you must create a copy of them which can be stored 
safely while you initially install Ubuntu. There are many ways of storing a 
copy of this data, and which method you choose will depend on your particular 
circumstances.</para>
+               <para>Once you have collected together all of the files and 
settings you might need, you must create a copy of them which can be stored 
safely while you initially install Xubuntu. There are many ways of storing a 
copy of this data, and which method you choose will depend on your particular 
circumstances.</para>
                <caution>
                        <para>After you have made a copy of your files, it is 
very important to <emphasis role='strong'>test the files</emphasis> to ensure 
that they have been copied successfully. If you have many files, at least check 
the most important files and randomly check other files where possible. This 
will help to protect you from data loss.</para>
                </caution>
                <section id="preparing-storage-direct">
                        <title>Direct transfer</title>
-                       <para>If you are installing Ubuntu onto a different 
computer than the one on which your data is stored, you can leave the data you 
collected on that computer and can safely transfer the data across once Ubuntu 
has been installed onto the other computer.</para>
+                       <para>If you are installing Xubuntu onto a different 
computer than the one on which your data is stored, you can leave the data you 
collected on that computer and can safely transfer the data across once Xubuntu 
has been installed onto the other computer.</para>
                        <para>When ready, you can transfer the data between the 
computers using a network connection.</para>
                </section>
                <section id="preparing-storage-cddvd">
@@ -357,8 +357,8 @@
                </section>
                <section id="preparing-storage-removable">
                        <title>External hard-disk drive or other removable 
device</title>
-                       <para>If you have access to an external hard-disk drive 
or some other removable storage device of a great enough capacity, then you can 
simply copy the files you have collected onto this device. When ready to 
transfer the files onto your Ubuntu installation, you may simply connect the 
drive and copy the files from it again.</para>
-                       <para>Removable storage devices such as external hard 
disks will have a certain type of <emphasis>file system</emphasis>. For use on 
removable devices, the best supported filesystem for Ubuntu is 
<emphasis>FAT</emphasis> (also called <emphasis>FAT32</emphasis> or 
<emphasis>vfat</emphasis>). While other file systems (such as NTFS and HFS+) 
are usable, they may require additional steps to allow you to use them with 
Ubuntu. If possible, try to use the FAT format for your removable disk.</para>
+                       <para>If you have access to an external hard-disk drive 
or some other removable storage device of a great enough capacity, then you can 
simply copy the files you have collected onto this device. When ready to 
transfer the files onto your Xubuntu installation, you may simply connect the 
drive and copy the files from it again.</para>
+                       <para>Removable storage devices such as external hard 
disks will have a certain type of <emphasis>file system</emphasis>. For use on 
removable devices, the best supported filesystem for Xubuntu is 
<emphasis>FAT</emphasis> (also called <emphasis>FAT32</emphasis> or 
<emphasis>vfat</emphasis>). While other file systems (such as NTFS and HFS+) 
are usable, they may require additional steps to allow you to use them with 
Xubuntu. If possible, try to use the FAT format for your removable disk.</para>
                        <para>You can discover the format of an external disk 
by right-clicking it in <filename>My Computer</filename> and selecting 
<guilabel>Properties</guilabel>. The format of the disk is shown in the 
<guilabel>General</guilabel> tab under <guilabel>File system</guilabel>.</para>
                </section>
                <section id="preparing-storage-network">
@@ -377,7 +377,7 @@
                        <warning>
                                <para>You must be very careful not to 
over-write the partition on which you have stored your data. It is recommended 
to make additional back-up copies of your files onto CDs or DVDs in case of 
this.</para>
                        </warning>
-                       <para>Simply copy the files you have collected onto the 
second drive as it appears in <filename>My Computer</filename>. Ensure that 
this drive (or partition) is <emphasis role='strong'>not</emphasis> the one 
which you intend to install Ubuntu on to.</para>
+                       <para>Simply copy the files you have collected onto the 
second drive as it appears in <filename>My Computer</filename>. Ensure that 
this drive (or partition) is <emphasis role='strong'>not</emphasis> the one 
which you intend to install Xubuntu on to.</para>
                </section>
        </section>
 </section>

=== modified file 'xubuntu/windows/C/windows.xml'
--- a/xubuntu/windows/C/windows.xml     2007-12-04 04:03:53 +0000
+++ b/xubuntu/windows/C/windows.xml     2008-03-09 17:16:45 +0000
@@ -10,16 +10,16 @@
 <!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
 %xinclude;
 <!ENTITY language "en">
-<!ENTITY ubuntu '<phrase>Ubuntu</phrase>'>
+<!ENTITY xubuntu '<phrase>Xubuntu</phrase>'>
 ]>
 <chapter lang="&language;" id="windows">
                <title>If you&rsquo;ve been using Windows</title>
 
 
        <para>
-               Many things work the same way in Ubuntu that they do in Windows.
-               But you may still need help understanding Ubuntu terminology and
-               transferring your files to use in Ubuntu.
+               Many things work the same way in Xubuntu that they do in 
Windows.
+               But you may still need help understanding Xubuntu terminology 
and
+               transferring your files to use in Xubuntu.
        </para>
 
        <xi:include href="preparing.xml"



--
Xubuntu desktop documentation
https://code.launchpad.net/~ubuntu-core-doc/ubuntu-doc/xubuntu-hardy

You are receiving this branch notification because you are subscribed to it.

-- 
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits

Reply via email to