Author: trappist
Date: Wed Sep 20 16:16:28 2006
New Revision: 3304
Modified:
trunk/generic/serverguide/C/network-applications.xml
trunk/generic/styleguide/grammar.xml
trunk/kubuntu/desktopguide/C/introduction.xml
trunk/kubuntu/desktopguide/C/linux-basics.xml
trunk/kubuntu/releasenotes/C/releasenotes.xml
trunk/teamstuff/audience-analysis.xml
trunk/ubuntu/aboutubuntu/C/about-ubuntu.xml
trunk/ubuntu/index-test/C/ubuntu-introduction.xml
Log:
Remove GNU/Linux references, except in xubuntu and edubuntu documentation, and
make some other small corrections
Modified: trunk/generic/serverguide/C/network-applications.xml
==============================================================================
--- trunk/generic/serverguide/C/network-applications.xml (original)
+++ trunk/generic/serverguide/C/network-applications.xml Wed Sep 20
16:16:28 2006
@@ -1000,7 +1000,7 @@
<emphasis>name
servers</emphasis>. Ubuntu ships with
<application>BIND</application> (Berkley
Internet Naming Daemon), the most common program used for
maintaining a name
- server on GNU/Linux.</para>
+ server on Linux.</para>
<!-- things to do: IPv6-->
<sect2 id="dns-installation" status="complete">
<title>Installation</title>
@@ -1118,7 +1118,7 @@
The primary mechanism for Ubuntu printing and print services is
the
<emphasis role="bold">Common UNIX Printing
System</emphasis> (CUPS).
This printing system is a freely available, portable
printing layer
- which has become the new standard for printing in most
GNU/Linux
+ which has become the new standard for printing in most
Linux
distributions.
</para>
<para>
@@ -1273,7 +1273,7 @@
</sect1>
<sect1 id="httpd" status="complete">
<title>HTTPD - Apache2 Web Server</title>
- <para>Apache is the most commonly used Web Server on GNU/Linux systems.
Web Servers are used
+ <para>Apache is the most commonly used Web Server on Linux systems. Web
Servers are used
to serve Web Pages requested by client computers. Clients typically
request and view
Web Pages using Web Browser applications such as
<application>Firefox</application>,
<application>Opera</application>, or
<application>Mozilla</application>.</para>
Modified: trunk/generic/styleguide/grammar.xml
==============================================================================
--- trunk/generic/styleguide/grammar.xml (original)
+++ trunk/generic/styleguide/grammar.xml Wed Sep 20 16:16:28 2006
@@ -236,7 +236,7 @@
<title>Parentheses</title>
<orderedlist>
<listitem>
- <para>Use parentheses around abbreviations and acronyms that you
will use later. Example: "The Ubuntu Documentation Project (UDP) is an
important piece of the Ubuntu GNU/Linux distribution." </para>
+ <para>Use parentheses around abbreviations and acronyms that you
will use later. Example: "The Ubuntu Documentation Project (UDP) is an
important piece of the Ubuntu Linux distribution." </para>
</listitem>
<listitem>
<para>Do not use parentheses to set off an explanation or an aside.
For example, do not write a sentence (like this one) that uses parentheses in
this manner.</para>
Modified: trunk/kubuntu/desktopguide/C/introduction.xml
==============================================================================
--- trunk/kubuntu/desktopguide/C/introduction.xml (original)
+++ trunk/kubuntu/desktopguide/C/introduction.xml Wed Sep 20 16:16:28 2006
@@ -106,7 +106,7 @@
oppressed.</para>
</blockquote>
<para>
- As a platform based on GNU/Linux, the Kubuntu
+ As a platform based on Linux, the Kubuntu
operating system brings the spirit of ubuntu to the software
world.
</para>
@@ -143,7 +143,7 @@
<sect2 id="kubuntu-difference" status="complete">
<title>The Difference</title>
<para>
- There are many different operating systems based on GNU/Linux:
+ There are many different operating systems based on Linux:
Debian, SUSE, Gentoo, RedHat, and Mandriva for example.
Kubuntu is yet another contender in what
is already a highly competitive world. So what makes
@@ -256,9 +256,7 @@
launched in 1984 to develop a complete
UNIX-style operating system which is comprised of Free
Software: the GNU
system. Variants of the GNU operating system,
- which use the Linux kernel, are now widely used; though these
- systems are often referred to as "Linux", they are
more
- accurately called GNU/Linux systems.</para>
+ which use the Linux kernel, are now widely used.</para>
<para>The GNU project is closely linked to the philosophy of free
software, which is central to the projects that derive from
it,
such as Ubuntu. The concept of Free Software is explained
Modified: trunk/kubuntu/desktopguide/C/linux-basics.xml
==============================================================================
--- trunk/kubuntu/desktopguide/C/linux-basics.xml (original)
+++ trunk/kubuntu/desktopguide/C/linux-basics.xml Wed Sep 20 16:16:28 2006
@@ -16,7 +16,7 @@
<chapter id="linux-basics" status="complete">
<title>Linux Basics</title>
<para>
- This chapter introduces you to basic concepts which are useful to when
+ This chapter introduces you to basic concepts which are useful when
getting started with a Kubuntu system.
</para>
<sect1 id="directories-file-systems" status="complete">
@@ -26,7 +26,7 @@
<para>Underneath the root (<filename>/</filename>) directory is a
set of important directories common to most Linux distributions. The following
is a listing of common directories that are directly under the root
(<filename>/</filename>) directory:</para>
<itemizedlist>
<listitem>
- <para><filename>/bin</filename> - important
<emphasis>bin</emphasis>ary applications</para>
+ <para><filename>/bin</filename> - important commands,
which historically have been <emphasis>bin</emphasis>ary, but may also be shell
scripts</para>
</listitem>
<listitem>
<para><filename>/boot</filename> -
<emphasis>boot</emphasis> configuration files, kernels, and other files needed
at <emphasis>boot</emphasis> time</para>
@@ -39,11 +39,10 @@
</listitem>
<listitem>
<para><filename>/home</filename> -
- <emphasis>home</emphasis> directories for different
- users</para>
+ <emphasis>home</emphasis> directories for different
users</para>
</listitem>
<listitem>
- <para><filename>/initrd</filename> - used when creating a
customized <emphasis>initrd</emphasis> boot process</para>
+ <para><filename>/initrd</filename> - used when creating a
customized <emphasis>init</emphasis>ial <emphasis>R</emphasis>AM
<emphasis>D</emphasis>isk</para>
</listitem>
<listitem>
<para><filename>/lib</filename> - system
<emphasis>lib</emphasis>raries</para>
@@ -52,13 +51,13 @@
<para><filename>/lost+found</filename> - provides a
<emphasis>lost+found</emphasis> system for files that exist under the root
(<filename>/</filename>) directory</para>
</listitem>
<listitem>
- <para><filename>/media</filename> - automatically mounted
(loaded) partitions on your hard drive and removable <emphasis>media</emphasis>
such as CDs, digital cameras, etc.</para>
+ <para><filename>/media</filename> - automatically mounted
(loaded) removable <emphasis>media</emphasis> such as CDs, digital cameras,
etc.</para>
</listitem>
<listitem>
<para><filename>/mnt</filename> - manually
<emphasis>m</emphasis>ou<emphasis>nt</emphasis>ed filesystems on your hard
drive</para>
</listitem>
<listitem>
- <para><filename>/opt</filename> - provides a location for
<emphasis>opt</emphasis>ional (3rd party) applications to be installed</para>
+ <para><filename>/opt</filename> - provides a location for
<emphasis>opt</emphasis>ional (3rd party) applications to be installed; these
are usually statically compiled and can be used in other versions or Linux
distributions</para>
</listitem>
<listitem>
<para><filename>/proc</filename> - special dynamic
directory that maintains information about the state of the system, including
currently running <emphasis>proc</emphasis>esses</para>
@@ -67,19 +66,19 @@
<para><filename>/root</filename> -
<emphasis>root</emphasis> user's home directory, pronounced
"slash-root"</para>
</listitem>
<listitem>
- <para><filename>/sbin</filename> - important
<emphasis>s</emphasis>ystem <emphasis>bin</emphasis>aries</para>
+ <para><filename>/sbin</filename> - important
<emphasis>s</emphasis>ystem <emphasis>bin</emphasis>aries and scripts, usually
intended to be run as the root user</para>
</listitem>
<listitem>
<para><filename>/srv</filename> - can contain files that
are <emphasis>s</emphasis>e<emphasis>rv</emphasis>ed to other systems</para>
</listitem>
<listitem>
- <para><filename>/sys</filename> -
<emphasis>sys</emphasis>tem files</para>
+ <para><filename>/sys</filename> - similar to the /proc
filesystem, but contains <emphasis>sys</emphasis>tem information not related to
running processes</para>
</listitem>
<listitem>
<para><filename>/tmp</filename> -
<emphasis>t</emphasis>e<emphasis>mp</emphasis>orary files</para>
</listitem>
<listitem>
- <para><filename>/usr</filename> - applications and files
that are mostly available for all
<emphasis>us</emphasis>e<emphasis>r</emphasis>s to access</para>
+ <para><filename>/usr</filename> - applications and
read-only files that are mostly available for all
<emphasis>us</emphasis>e<emphasis>r</emphasis>s to access</para>
</listitem>
<listitem>
<para><filename>/var</filename> -
<emphasis>var</emphasis>iable files such as logs and databases</para>
@@ -142,10 +141,10 @@
<title>Root And Sudo</title>
<para>
- The root user in GNU/Linux is the user which has
+ The root user in Linux is the user which has
administrative access to your system. Normal users do not have
this access for security reasons. However, Kubuntu does not
- include the root user. Instead, administrative access is given
+ enable the root user. Instead, administrative access is given
to individual users, who may use the "sudo" application to
perform administrative tasks. The first user account you
created on your system during installation will, by default,
Modified: trunk/kubuntu/releasenotes/C/releasenotes.xml
==============================================================================
--- trunk/kubuntu/releasenotes/C/releasenotes.xml (original)
+++ trunk/kubuntu/releasenotes/C/releasenotes.xml Wed Sep 20 16:16:28 2006
@@ -77,7 +77,7 @@
<sect1 id="document" status="review">
<title>Introduction</title>
<para>
- Kubuntu - the GNU/Linux distribution for
everyone.
+ Kubuntu - the Linux distribution for everyone.
</para>
<para>
(koo-BOON-too) - /kùbúntú/ - towards humanity.
Modified: trunk/teamstuff/audience-analysis.xml
==============================================================================
--- trunk/teamstuff/audience-analysis.xml (original)
+++ trunk/teamstuff/audience-analysis.xml Wed Sep 20 16:16:28 2006
@@ -71,7 +71,7 @@
</qandaentry>
<qandaentry>
<question>
- <para>How long have you been using GNU/Linux?</para>
+ <para>How long have you been using Linux?</para>
</question>
<answer>
<para>...</para>
@@ -87,7 +87,7 @@
</qandaentry>
<qandaentry>
<question>
- <para>What made you choose GNU/Linux?</para>
+ <para>What made you choose Linux?</para>
</question>
<answer>
<para>...</para>
@@ -375,7 +375,7 @@
</qandaentry>
<qandaentry>
<question>
- <para>How do you think documentation on GNU/Linux can be
improved?</para>
+ <para>How do you think documentation on Linux can be
improved?</para>
</question>
<answer>
<para>...</para>
Modified: trunk/ubuntu/aboutubuntu/C/about-ubuntu.xml
==============================================================================
--- trunk/ubuntu/aboutubuntu/C/about-ubuntu.xml (original)
+++ trunk/ubuntu/aboutubuntu/C/about-ubuntu.xml Wed Sep 20 16:16:28 2006
@@ -140,7 +140,7 @@
<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 platform based on GNU/Linux, the Ubuntu
+ <para>As a platform based on Linux, the Ubuntu
operating system brings the spirit of ubuntu to the
software
world.
</para>
@@ -160,7 +160,7 @@
</sect1>
<sect1 id="ubuntu-difference" status="complete">
<title>The Difference</title>
- <para>There are many different operating systems based
on GNU/Linux:
+ <para>There are many different operating systems based
on Linux:
Debian, SuSE, Gentoo, RedHat, and Mandriva are
examples.
Ubuntu is yet another contender in what
is already a highly competitive world. So what makes
@@ -275,9 +275,7 @@
launched in 1984 to develop a complete
UNIX style operating system which is comprised of free
software: the GNU
system. Variants of the GNU operating system,
- which use the Linux kernel, are now widely used; though these
- systems are often referred to as “Linux,” they are more
- accurately called GNU/Linux systems.
+ which use the Linux kernel, are now widely used.
</para>
<para>The GNU project is closely linked to the philosophy of free
software, which is central to the projects that derive from
it,
Modified: trunk/ubuntu/index-test/C/ubuntu-introduction.xml
==============================================================================
--- trunk/ubuntu/index-test/C/ubuntu-introduction.xml (original)
+++ trunk/ubuntu/index-test/C/ubuntu-introduction.xml Wed Sep 20 16:16:28 2006
@@ -143,7 +143,7 @@
<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 platform based on GNU/Linux, the Ubuntu
+ <para>As a platform based on Linux, the Ubuntu
operating system brings the spirit of ubuntu to the
software
world.
</para>
@@ -163,7 +163,7 @@
</sect2>
<sect2 id="ubuntu-difference" status="complete">
<title>The Difference</title>
- <para>There are many different operating systems based
on GNU/Linux:
+ <para>There are many different operating systems based
on Linux:
Debian, SuSE, Gentoo, RedHat, and Mandriva are
examples.
Ubuntu is yet another contender in what
is already a highly competitive world. So what makes
@@ -278,9 +278,7 @@
launched in 1984 to develop a complete
UNIX style operating system which is comprised of free
software: the GNU
system. Variants of the GNU operating system,
- which use the Linux kernel, are now widely used; though these
- systems are often referred to as “Linux,” they are more
- accurately called GNU/Linux systems.
+ which use the Linux kernel, are now widely used.
</para>
<para>The GNU project is closely linked to the philosophy of free
software, which is central to the projects that derive from
it,
--
ubuntu-doc-commits mailing list
ubuntu-doc-commits@xxxxxxxxxxxxxxxx
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
|
