summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-02-19 16:03:08 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-02-19 16:03:08 +0000
commit8aba1ee4885e27fc6cf56745df209ee4441c18a0 (patch)
treead6cfd67c3f2a26b6926fd3de6dd079fa978e8e3
parent6e0f3af463e9ebef053c13c3135f6ce962ca4fc8 (diff)
parent5e1f2407ef7cb1aa29af02dbb94d2dcb13f7fc66 (diff)
downloaddocs-8aba1ee4885e27fc6cf56745df209ee4441c18a0.tar.gz
docs-8aba1ee4885e27fc6cf56745df209ee4441c18a0.tar.bz2
docs-8aba1ee4885e27fc6cf56745df209ee4441c18a0.tar.xz
docs-8aba1ee4885e27fc6cf56745df209ee4441c18a0.zip
Merge branch 'master' into 'master'
Suggest wording improvements in Admin Handbook, Chapter 1 See merge request !2
-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 3a77db5..f9b8b6c 100644
--- a/src/admin/1_intro.xml
+++ b/src/admin/1_intro.xml
@@ -308,7 +308,7 @@
</section>
<section id="differences">
<title>What sets Adélie apart</title>
- <para>The Adélie Linux operating environment has many features that stand out from other environments.</para>
+ <para>The Adélie Linux operating environment has many features that make it 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 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>
@@ -325,15 +325,15 @@
</section>
<section>
<title>Support for many platforms</title>
- <para>Adélie Linux supports many different hardware platforms, allowing you to truly use your hardware your way. All Adélie Linux packages are tested on all tier 1 architectures before being released. From your PowerPC/POWER workstation, to your dusty old Intel x86 notebook, to your ARM 64 tablet, you can ensure you are getting the most from your computers by using Adélie Linux on them.</para>
+ <para>Adélie Linux supports many different hardware platforms, allowing you to truly use your hardware your way. All Adélie Linux packages are tested on all tier 1 architectures before being released. From your PowerPC/POWER workstation, to your dusty old Intel x86 notebook, to your ARM 64 tablet, you can ensure you are getting the most out of your computers by using Adélie Linux on them.</para>
</section>
</section>
<section id="familiarising">
<title>Familiarising yourself with Adélie</title>
- <para>Now let's brief go over some of the essentials of day-to-day administration of an Adélie Linux system. These will be covered with more depth in later chapters.</para>
+ <para>Now let's briefly go over some of the essentials of day-to-day administration of an Adélie Linux system. These will be covered with more depth in later chapters.</para>
<section>
<title>The shell environment</title>
- <para>The <firstterm>shell environment</firstterm>, also called a terminal or console, is an interface where you type commands in to a command processor (the <firstterm>shell</firstterm>), and view the results of the command on your screen. Windows users may know this environment as a "Command Prompt". The shell environment is an essential part of administrating any Linux system. Adélie Linux is designed to make the shell environment easy to use while still providing you the ability to view and edit nearly every detail about your system.</para>
+ <para>The <firstterm>shell environment</firstterm>, also called a terminal or console, is an interface where you type commands in to a command processor (the <firstterm>shell</firstterm>), and view the results of the command on your screen. Windows users may know this environment as a "Command Prompt". The shell environment is an essential part of administrating any Linux system. Adélie Linux is designed to make the shell environment easy to use while still providing you with the ability to view and edit nearly every detail about your system.</para>
<para>The default interactive shell in the Adélie Linux system is the Z shell (zsh). This shell has many unique and powerful features, but by default, it works very similar to the widely-used Bash shell. When you start your shell, you will be greeted with a prompt similar to:</para>
<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>