summaryrefslogtreecommitdiff
path: root/src/admin/1_intro.xml
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-03 15:10:05 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-04 10:29:04 -0600
commit047709a641670432974cfe3b8b9110f8c520c299 (patch)
treeee68651ef8114103bc2f28f6fbafcd3abd291706 /src/admin/1_intro.xml
parent9232e34cb98912eb233c545e2d22f3f9a916520f (diff)
downloaddocs-047709a641670432974cfe3b8b9110f8c520c299.tar.gz
docs-047709a641670432974cfe3b8b9110f8c520c299.tar.bz2
docs-047709a641670432974cfe3b8b9110f8c520c299.tar.xz
docs-047709a641670432974cfe3b8b9110f8c520c299.zip
Admin: copyedit from @twilcox
Diffstat (limited to 'src/admin/1_intro.xml')
-rw-r--r--src/admin/1_intro.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/admin/1_intro.xml b/src/admin/1_intro.xml
index bbcf533..0204974 100644
--- a/src/admin/1_intro.xml
+++ b/src/admin/1_intro.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<chapter label="1" id="introduction">
<title>Introduction</title>
- <highlights><para>Welcome to the Adélie Linux 1.0 Administrator's Handbook. You'll learn a lot about how to administer your Adélie Linux computer. We'll get started by looking at how Adélie Linux compares to other popular operating environments, and some of the software used that we will learn more about in the chapters ahead.</para></highlights>
+ <highlights><para>Welcome to the Adélie Linux 1.0 Administrator's Handbook. You'll learn a lot about how to administer your Adélie Linux computer. We'll get started by looking at how Adélie Linux compares to other popular operating environments. We will also review some of the software used that will feature in the chapters ahead.</para></highlights>
<section>
<title>Comparison of Adélie with other environments</title>
<para>Adélie Linux is a Linux distribution focused on security, speed, reliability, and correctness. Since it is based on the Linux kernel, it shares some common traits with other Linux distributions. However, it has many unique facets as well.</para>
- <para>One of the defining differences of Adélie Linux is the commitment to run on many different hardware platforms. The first comparison we will make is the hardware platforms that various environments support.</para>
+ <para>One of the defining differences of Adélie Linux is the commitment to run on many different hardware platforms. The first comparison we will review is the hardware platforms that various environments support.</para>
<table frame="all">
<title>Hardware platforms supported</title>
<tgroup cols="10" align="left" colsep="1" rowsep="1">
@@ -311,7 +311,7 @@
<para>The Adélie Linux operating environment has many features that stand out from other environments.</para>
<section>
<title>Libre software only</title>
- <para>The first, and most important, is dedication to only providing libre software. What is "libre software"? Simply put, libre software is software that gives power to you as a user, instead of giving power to the developer or a corporation. Many proprietary software packages have long contracts (sometimes termed "license agreements" or "EULAs") that restrict what you can do with them. Libre software allows you the right to use it in any manner you wish, and the right to be able to change it yourself if you find an issue with it. For many, this may not seem important, since most people are not computer programmers and can't actually change software themselves. On the contrary, it is very important. This allows those who are computer programmers, security researchers, and other interested parties review the source code for errors. If an error, defect, or security issue is found during a review, it can be rectified nearly instantly.</para>
+ <para>The first, and most important, is dedication to only providing libre software. What is "libre software"? Simply put, libre software is software that gives power to you as a user, instead of giving power to the developer or a corporation. Many proprietary software packages have long contracts (sometimes termed "license agreements" or "EULAs") that restrict what you can do with them. Libre software allows you the right to use it in any manner you wish, and the right to be able to change it yourself if you find an issue with it. For many, this may not seem important, since most people are not computer programmers and cannot actually change software themselves. On the contrary, it is very important. This allows those who are computer programmers, security researchers, and other interested parties to review the source code for errors. If an error, defect, or security issue is found during a review, it can be rectified nearly instantly.</para>
<para>This gives you an additional benefit: If the original developer of a proprietary software package no longer wishes to maintain it, they can discontinue it and take away your right to use it, even if you paid for it. This is not possible with libre software. The software that you use is yours to use for your entire lifetime.</para>
<para>Many other environments, including most other Linux distributions, eventually give in to the pressure to ship non-libre software. The Adélie Linux software packaging guidelines specifically prohibits non-libre software from being included in Adélie Linux.</para>
</section>
@@ -338,7 +338,7 @@
<para><prompt><replaceable>yourname</replaceable> on <replaceable>computer-name</replaceable> ~ %</prompt></para>
<para>The prompt contains your username, the name of the computer you are currently logged in to, and your current directory. The "~" represents your home directory, where your personal files and settings are stored. This "~" will change as you move around the directories on your computer's hard disk. For example, if you type <command>cd Documents</command> to change to the Documents directory in your home directory, your prompt will then show:</para>
<para><prompt><replaceable>yourname</replaceable> on <replaceable>computer-name</replaceable> ~/Documents %</prompt></para>
- <para>Your computer's name is always shown to you in the prompt. This way, if you connect remotely to another computer, you will be able to easily tell where the commands you type are running.</para>
+ <para>Your computer's name is always shown to you in the prompt. This way, if you connect remotely to another computer, you will easily be able to tell where the commands you type are running.</para>
</section>
<section>
<title>Package management</title>