summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-09 14:00:55 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-09 14:00:55 -0600
commit0b907283e7d6c8ec9edbd5e035bebe19904a3820 (patch)
treefa7d4b78bc324067cdb2852a5a2dad0ae9147168
parent07025f8e0741ce7bff0ee09159ebf142f676ef51 (diff)
downloaddocs-0b907283e7d6c8ec9edbd5e035bebe19904a3820.tar.gz
docs-0b907283e7d6c8ec9edbd5e035bebe19904a3820.tar.bz2
docs-0b907283e7d6c8ec9edbd5e035bebe19904a3820.tar.xz
docs-0b907283e7d6c8ec9edbd5e035bebe19904a3820.zip
Admin: ch01: administer -> administrate (thanks @dimitsos)
-rw-r--r--src/admin/1_intro.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/admin/1_intro.xml b/src/admin/1_intro.xml
index 4c6e471..d1c17d6 100644
--- a/src/admin/1_intro.xml
+++ b/src/admin/1_intro.xml
@@ -1,7 +1,7 @@
<?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. We will also review some of the software used that will feature 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 administrate 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>
@@ -333,7 +333,7 @@
<para>Now it's time to go over a brief run-down of the day-to-day administration of an Adélie 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 administering 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 the ability to view and edit nearly every detail about your system.</para>
<para>By default, Adélie Linux uses the Z shell (zsh) as the default shell. 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>