Author: mantha
Date: Sun Sep  2 01:20:25 2007
New Revision: 4312

Modified:
   trunk/edubuntu/handbook/C/introduction.xml

Log:
applied proof-reading patch from Matt Oquist for Handbook intro

Modified: trunk/edubuntu/handbook/C/introduction.xml
==============================================================================
--- trunk/edubuntu/handbook/C/introduction.xml  (original)
+++ trunk/edubuntu/handbook/C/introduction.xml  Sun Sep  2 01:20:25 2007
@@ -19,7 +19,7 @@
 <title>Introduction</title>
 
 <para>
-Welcome to the Edubuntu Handbook. This text has been many release cycles (and 
many titles) in the making. We, the authors, hope to continue building on this 
work for the life of the Edubuntu Linux distribution.
+Welcome to the Edubuntu Handbook. This text has been many release cycles (and 
many titles) in the making. We, the authors, hope to continue building on this 
work for the life of the Edubuntu distribution of Linux.
 </para>
 
 <para>
@@ -27,7 +27,7 @@
 </para>
 
 <para>
-Thank you for allowing us to walk you through installing and using Edubuntu. 
We hope to make it an interesting journey, and look forward to your feedback.
+Thank you for allowing us to walk you through installing and using Edubuntu. 
We hope to make it an interesting journey, and we look forward to your feedback.
 </para>
 
 <para>
@@ -84,13 +84,13 @@
 For these reasons, Edubuntu makes the following public commitment to its 
community of users worldwide: 
 <itemizedlist>
 <listitem>
-       <para>  Edubuntu will always be free of charge, and there is no extra 
fee for the &quot;enterprise edition,&quot; we make our very best work 
available to everyone on the same Free terms.      </para>
+       <para>  Edubuntu will always be free of charge, and there is no extra 
fee for the &quot;enterprise edition;&quot; we make our very best work 
available to everyone on the same Free terms.      </para>
 </listitem>
 <listitem>
        <para>We include the very best in translations and accessibility 
infrastructure that the free software community has to offer, to make Edubuntu 
usable for as many people as possible.</para>
 </listitem>
 <listitem>
-       <para>Releases are regular and predictable; a new one is made every six 
months. You can use the current stable or the development release. Each release 
is supported for at least 18 months and selected ones for up to 3 to 5 years on 
a Long-Term Support (LTS) basis.</para>
+       <para>Releases are regular and predictable; a new one is made every six 
months. You can use the current stable or the development release. Each release 
is supported for at least 18 months and selected ones are supported for up to 3 
to 5 years on a Long-Term Support (LTS) basis.</para>
 </listitem>
 <listitem>
        <para>We are is entirely committed to the principles of open source 
software development; we encourage people to use open source software, improve 
it, and pass it on.</para>
@@ -119,18 +119,18 @@
 <sect2>
 <title>Aim</title>
 <para>
-The ultimate aim of Edubuntu is empowerment: to place state of the art 
Information and Communication Technology (ICT) within the reach of everyone. 
However, computers and networks are complicated concepts and simply knowing how 
to ask the right questions can be very hard if you don't already have a lot of 
experience. Having the technology at your fingertips should go hand-in-hand 
with the resources that enable you to know how to use it effectively. This book 
is intended to provide you with the information necessary to be confident and 
self-sufficient in working with Edubuntu. 
+The ultimate aim of Edubuntu is empowerment: to place state-of-the-art 
Information and Communication Technology (ICT) within the reach of everyone. 
However, computers and networks are complicated concepts and simply knowing how 
to ask the right questions can be very hard if you don't already have a lot of 
experience. Having the technology at your fingertips should go hand-in-hand 
with the resources that enable you to know how to use it effectively. This book 
is intended to provide you with the information necessary to be confident and 
self-sufficient in working with Edubuntu. 
 </para>
 </sect2>
 
 <sect2>
 <title>Intended Audience</title>
 <para>
-This book will cater for different audiences:
+This book will cater to different audiences:
 <itemizedlist>
 <listitem>
 <para>
-It will provide a step-by-step guide to get started with an Edubuntu computer 
lab. Anyone with enough enthusiasm, as well as access to the equipment 
necessary, can use this book as a blueprint for setting up computer labs in 
their community.
+It will provide a step-by-step guide to get started with an Edubuntu computer 
lab. Anyone with enough enthusiasm, as well as access to the equipment 
necessary, can use this book as a blueprint for setting up local community 
computer labs.
 </para>
 </listitem>
 <listitem>
@@ -151,17 +151,17 @@
 
 <!-- THE UBUNTU PHILOSOPHY -->
 <sect1 id="intro-philosophy" status="draft">
-<title>Ubuntu and it's Philosophy</title>
+<title>Ubuntu and its Philosophy</title>
 
 <para>
-Our work on Ubuntu and Edubuntu is driven by a philosophy based on software 
freedom that we hope will spread, and bring the benefits of software technology 
to all parts of the globe.
+Our work on Ubuntu and Edubuntu is driven by a philosophy of software freedom 
that we hope will spread and bring the benefits of software technology to all 
people, everywhere.
 </para>
 
 <sect2>
-<title>Free and Open Source software</title>
+<title>Free and Open Source Software</title>
 
 <para>
-Ubuntu is a community driven project to create an operating system and a full 
set of applications using free and open source software. At the core of the 
Ubuntu Philosophy of Software Freedom are these core philosophical ideals:
+Ubuntu is a community-driven project to create an operating system and a full 
set of applications using free and open source software. At the core of the 
Ubuntu Philosophy of Software Freedom are these core philosophical ideals:
 </para>
 <orderedlist>
 <listitem>
@@ -245,11 +245,13 @@
 <title>Compatible</title>
 
 <para>
-Most educational computer networks are a heterogeneous network consisting of 
various operating systems. In this setting, you need an operating system that 
plays well with the others. Edubuntu does that. 
+Most educational computer networks are heterogeneous, consisting of various 
operating systems, and it is sometimes difficult to configure them to work 
together. Edubuntu plays well with others.
 </para>
 <para>
-Edubuntu servers can happily coexist on the same network as other operating 
systems. OpenOffice.org can open and save many commercial office suite formats. 
You can even install Edubuntu and another operating system on the same machine. 
Need to share
-files between Edubuntu and other operating system or connect to a remote 
server? Edubuntu does that too.
+Edubuntu servers can happily coexist on the same network as other operating 
systems. OpenOffice.org can open and save many commercial office suite formats. 
You can even install Edubuntu and another operating system on the same machine. 
Need to share files between Edubuntu and other operating system or connect to a 
remote server? Edubuntu does that too.
+</para>
+<para>
+The Edubuntu developers work hard to make sure that Edubuntu is the most 
compatible operating system you can find in schools today.
 </para>
 </sect2>
 
@@ -264,12 +266,12 @@
 <para>
 Edubuntu, being a Linux-based operating system, enjoys the
 security advantages of its Unix-like and open source heritages. This translates
-into higher quality code and less spyware and viruses that plague other
+into higher quality code and less spyware and viruses than plague other
 operating systems. In addition, it has a strict, proactive security
-policy which means that many common problems such as open ports or 
misconfigured
-software, are much less of an issue. Finally, it is a true multi-user
+policy which means that many common problems, such as open ports or 
misconfigured
+software, never make it into the released product. Finally, it is a true 
multi-user
 operating system, making it easy to allow users to complete their tasks without
-compromising the system.
+having a level of access that could compromise the system.
 </para>
 </sect2>
 
@@ -277,15 +279,7 @@
 <title>Manageable</title>
 
 <para>
-With teachers and school IT departments deploying and administering an
-increasingly large number of computers, time spent managing individual 
computers
-is scarce to non-existant. Edubuntu, with the option of using LTSP thin client 
technology, makes
-deployment and management simple and easy. A single server is all that is 
needed
-to setup, manage and administrate an entire class of computers. The Edubuntu
-team also recognizes that not every school's setup is the same. As such,
-Edubuntu is easy to customize for your unique needs, whether it is a simple
-re-branding, or the addition or removal of programs. Edubuntu can reduce
-the amount of time you spend administrating your computers.
+With teachers and school IT departments deploying and administering an 
increasing number of computers, it is difficult to find time to manage 
individual machines. Edubuntu, with the option of using LTSP thin client 
technology, makes deployment and management simple and easy. A single server is 
all that is needed to set up, manage and administrate an entire network. The 
Edubuntu team also recognizes that not every school's setup is the same, so 
they've made Edubuntu easy to customize for your unique needs.
 </para>
 </sect2>
 
@@ -293,16 +287,17 @@
 <title>Cost Effective</title>
 
 <para>
-With ever increasing demands on budgets, it seems expensive technology is often
+With ever-increasing demands on school budgets, expensive technology is often
 last on the list. Edubuntu can help you offer what your students increasingly
 require from computer technology, without breaking the bank. Edubuntu is and
-always will be free to acquire, use and modify. 
+always will be free to acquire, use and modify.
 </para>
 <para>
-Need to setup another machine? Or another 100? Just install them! No more 
expensive OS upgrades and licenses,
-or only having specific programs on some computers. By being built on Open
-Source software, schools are welcome to seek whomever they wish to help them
-support their computers and are not locked into getting help from any specific 
vendor.
+Need to set up another machine? Or another 100? Just install them! With 
Edubuntu
+you'll have no more expensive OS upgrades and licenses, and having specialized
+programs on only some computers will become a thing of the past. When you build
+your network on Open Source software, you are freed to seek support for
+your computers from whomever you wish.
 </para>
 <para>
 Edubuntu can also help you save hardware costs, by allowing you to redeploy
@@ -315,11 +310,10 @@
 <title>Well Supported</title>
 
 <para>
-Edubuntu support is available from both the Edubuntu, and larger Ubuntu, 
communities. Many of the authors of the software included in Edubuntu can be 
contacted directly via mailing lists and IRC channels, including the Edubuntu 
developers themselves.
+Edubuntu support is available from both the Edubuntu community and the larger 
Ubuntu community. Many of the authors of the software included in Edubuntu, 
including the Edubuntu developers themselves, can be contacted directly via 
mailing lists and IRC channels.
 </para>
 <para>
-There are many forms of support available: on mailing lists; Wiki websites; 
IRC channels and bug trackers. There is also a special support group for using 
Edubuntu in schools. Should you want paid support, Canonical, who funds 
Edubuntu and Ubuntu development, can offer assistance or
-you could find a local company who offer similar services. With Edubuntu, the 
choice is yours.
+There are many forms of support available, including mailing lists, Wiki 
websites, IRC channels, and bug trackers. There is also a special support group 
for using Edubuntu in schools. Should you want paid support, Canonical, the 
company which funds Edubuntu and Ubuntu development, can offer assistance, or 
you can find a local company who offer similar services.  In fact, some of the 
money that would have gone to purchasing software can instead be spent to hire 
local experts to help train you, and to help you support your network. Edubuntu 
can help you take more control over your network while also benefitting your 
local economy. With Edubuntu, these choices are yours.
 </para>
 
 </sect2>
@@ -328,13 +322,10 @@
 <title>Built for Education</title>
 
 <para>
-Above all, what sets Edubuntu apart from other operating systems is its
-unwavering focus on the educational needs of learners all over the world.
-Edubuntu's motto is "Linux for Young Human Beings" and every development
-decision and application has that goal in mind.
+Above all, Edubuntu is set apart from other operating systems by its 
unwavering focus on the educational needs of learners all over the world.  
Edubuntu's motto is "Linux for Young Human Beings" and every development 
decision and application has that goal in mind.
 </para>
 <para>
-Edubuntu comes with translations for many languages and localization features 
that allows people from all over the world to enjoy their computing experience 
as well as accessibility features to help disabled users. Using the live CD 
means that pupils are able to boot their home computer into Edubuntu and use 
exactly the same applications that they are using at school. The LTSP server 
software allows teachers and administrators to create a low cost computer lab 
so that students can have access to the educational opportunities that Edubuntu 
and the Internet can provide.
+Edubuntu comes with translations for many languages and localization features 
that allow people from all over the world to enjoy their computing experience. 
Edubuntu's accessibility features strive to provide a pleasant, high-quality 
computing experience to disabled users. The Edubuntu LiveCD makes it easy for 
pupils to boot their home computers temporarily into Edubuntu and use exactly 
the same applications that they are using at school. The LTSP server software 
allows teachers and administrators to create a low cost computer lab so that 
students can have access to the educational opportunities that Edubuntu and the 
Internet can provide.
 </para>
 
 </sect2>
@@ -344,7 +335,7 @@
 <sect1 id="intro-installtype" status="draft">
 <title>Choosing The Correct Installation Type</title>
 <para>
-Edubuntu essentially can be installed or configured in two forms:
+Edubuntu can be installed or configured in two primary forms:
 </para>
 <itemizedlist>
 <listitem>
@@ -368,7 +359,7 @@
        <sect2>
                <title>Hardware</title>
                <para>
-                       Networking works by breaking files into little packets 
of information. These packets are transfered over a network. The difference 
between various types of networks is how they transfer packets.
+                       Networking works by breaking files and other data into 
little packets of information. These packets are transfered over a network. The 
difference between various types of networks is how they transfer packets.
                </para>
                <para>
                        There are two types of networking hardware: wired and 
wireless.
@@ -393,7 +384,7 @@
                        <sect4>
                                <title>Switch</title>
                                <para>
-                                       A switch looks a lot like a hub, it has 
a lot of ports in the front and usually has several small lights corresponding 
to each port. However, a switch is unlike a hub because it only makes a 
connection between the ports it needs to. A switch can have multiple 
connections at the same time. This allows a switch to be faster than a hub.
+                                       A switch looks a lot like a hub; it has 
a lot of ports in the front and usually has several small lights corresponding 
to each port. However, a switch is unlike a hub because it only makes a 
connection between the ports it needs to. A switch can have multiple 
connections at the same time. This allows a switch to be faster than a hub.
                                </para>
                        </sect4>
                        <sect4>
@@ -409,7 +400,7 @@
                                There are four types of wireless networking.
                        </para>
                        <para>
-                               Three types use the 2.4Ghz band: 
+                               Three types use the 2.4Ghz band of the radio 
frequency spectrum:
                                <itemizedlist>
                                        <listitem>
                                                <para>802.11b - 11 
Mbit/sec</para>
@@ -438,40 +429,40 @@
                <sect3>
                        <title>DHCP (Dynamic Host Configuration 
Protocol)</title>
                        <para>
-                               Each computer on a network needs a unique 
identifier called an IP address. The IP address allows packets to be directed 
to the computer, much like a street address allows mail to be delivered to the 
correct house. An IP address follows a specific form, four groups of digits 
forming a number from 0 to 255. For example, a local IP address might be 
192.168.2.50.
+                               Each computer on a network needs a unique 
identifier called an IP address. The IP address allows packets to be directed 
to the computer, much like a street address allows mail to be delivered to the 
correct house. An IP address follows a specific form: four groups of digits 
forming a number from 0 to 255. For example, a local IP address might be 
192.168.2.50.
                        </para>
                        <para>
-                               For convenience, a computer's IP address can be 
given by the server and its Dynamic Host Configuration Protocol (DHCP) service. 
DHCP automatically provides network settings to the computers on the network. 
With DHCP, there is no need to keep track of each computer's IP addresses.
+                               For convenience, a computer's IP address can be 
given by a server running the Dynamic Host Configuration Protocol (DHCP) 
service. DHCP automatically provides network settings to the computers on the 
network. With DHCP, there is no need to keep track of each computer's IP 
addresses.
                        </para>
                </sect3>
                <sect3>
                        <title>DNS (Domain Name System)</title>
                        <para>
-                               A service that runs on the server that allows 
one computer to figure out the address of another computer. The directory keeps 
track of each computer and its IP address.
+                           DNS is a service that runs on a server, and it is 
like a phone book for computers, except that it stores IP addresses instead of 
phone numbers. Your computer talks to a DNS server every time you refer to 
another computer system with a name instead of an IP address. For example: 
www.edubuntu.org, wikipedia.org, and google.com are all DNS hostnames.
                        </para>
                </sect3>
                <sect3>
                        <title>NTP (Network Time Protocol)</title>
                        <para>
-                               A service that runs on the server that keeps 
track of the time. The server synchronizes with an extremely accurate atomic 
clock. The clients then synchronize with the server.
+                               NTP is a service that runs on a server and 
allows other computers to synchronize their clocks. The server synchronizes 
with an extremely accurate atomic clock, and then the clients synchronize with 
the server.
                        </para>
                </sect3>
                <sect3>
                        <title>Web Server</title>
                        <para>
-                               The web server can provide information to the 
clients.
+                               A Web server answers queries using protocols 
such as HTTP, and sends content such as web pages back to clients. Your Web 
browser almost exclusively talks to Web servers.
                        </para>
                </sect3>
                <sect3>
                        <title>Web Proxy</title>
                        <para>
-                               A proxy is another service that runs on the 
server that accesses Web sites on behalf of the clients. The proxy can cache 
commonly used files to allow fast access to some pages. The proxy can also 
restrict access to unwanted materials.
+                               A Web proxy is a service that runs on a server 
and accesses Web sites on behalf of the clients. A proxy can cache some data to 
allow faster repeated access to commonly accessed pages. A proxy can also 
restrict access to content that you deem inappropriate.
                        </para>
                </sect3>
                <sect3>
                        <title>Firewall</title>
                        <para>
-                               A firewall can be a service on the server or a 
separate piece of hardware that runs a similar service. The firewall protects 
the server (and its clients) by restricting access to the server by computers 
on the internet.
+                               A firewall can be a service on the server or a 
separate piece of hardware that runs a similar service. A firewall can protect 
your server (and clients) by restricting computers on the Internet from 
initiating connections into your server or network.
                        </para>
                </sect3>
        </sect2>

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

Reply via email to