summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-03-25 14:05:18 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-03-25 14:05:18 +0000
commitd0d6c0aca8e9b1313bde4b6b4cc935b0c187353c (patch)
tree07bb8a277f9bcd2194b968e25247179d890ef9b0
parent251e827ca1822a16b3167bdd933557603c34f827 (diff)
parent501da4dd2df800237f113589f58af7786d401446 (diff)
downloaddocs-d0d6c0aca8e9b1313bde4b6b4cc935b0c187353c.tar.gz
docs-d0d6c0aca8e9b1313bde4b6b4cc935b0c187353c.tar.bz2
docs-d0d6c0aca8e9b1313bde4b6b4cc935b0c187353c.tar.xz
docs-d0d6c0aca8e9b1313bde4b6b4cc935b0c187353c.zip
Merge branch 'master' into 'master'
Small fixes for Admin Handbook See merge request adelie/docs!4
-rw-r--r--src/admin/6_security.xml4
-rw-r--r--src/admin/7_config.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/admin/6_security.xml b/src/admin/6_security.xml
index f0226ee..3c17b96 100644
--- a/src/admin/6_security.xml
+++ b/src/admin/6_security.xml
@@ -4,7 +4,7 @@
<highlights><para>In this chapter, we will review best practices for keeping your Adélie Linux systems secure.</para></highlights>
<section id="introduction6">
<title>Introduction to computer security</title>
- <para>No one book can teach you everything about computer security. Computer security is not simply an item on a list that must be done once and then it is "completed". Computers are very powerful tools, and just as they can be used to teach, create, and produce, they can also be used for more nefarious purposes. By taking a proactive approach to computer security, and treating it as a process, you will be much more successful in keeping the security, confidentiality, and integrity of your data intact. You first need to identify your <firstterm>threat model</firstterm>; that is, what advisaries are you attempting to keep out? A sophisticated nation-state requires a much different security plan than a random hacker.</para>
+ <para>No one book can teach you everything about computer security. Computer security is not simply an item on a list that must be done once and then it is "completed". Computers are very powerful tools, and just as they can be used to teach, create, and produce, they can also be used for more nefarious purposes. By taking a proactive approach to computer security, and treating it as a process, you will be much more successful in keeping the security, confidentiality, and integrity of your data intact. You first need to identify your <firstterm>threat model</firstterm>; that is, what adversaries are you attempting to keep out? A sophisticated nation-state requires a much different security plan than a random hacker.</para>
<para>The suggestions in this handbook are a starting point to help you develop an actionable plan to keep your computer secure. They are by no means exhaustive. Remember to always keep learning; knowledge is power.</para>
</section>
<section id="apk_sec">
@@ -22,4 +22,4 @@
<listitem><para>Keep track of best practices for the services you run. The service's documentation is likely to contain good advice for security.</para></listitem>
</itemizedlist>
</section>
-</chapter>
+</chapter> \ No newline at end of file
diff --git a/src/admin/7_config.xml b/src/admin/7_config.xml
index deaaad1..894b4c9 100644
--- a/src/admin/7_config.xml
+++ b/src/admin/7_config.xml
@@ -47,7 +47,7 @@
<title><filename>/etc/asound.conf</filename>: System audio configuration</title>
<section role="NotInToc">
<title>Purpose</title>
- <para>The <filename>/etc/asound.conf</filename> file determines the behaviour audio hardware present on the system. It can be used to select default bitrates, configure hardware options, and determine which sound card is the default/primary in a system with multiple sound cards present. This file is only significant on systems that have audio options installed.</para>
+ <para>The <filename>/etc/asound.conf</filename> file determines the behaviour of audio hardware present on the system. It can be used to select default bitrates, configure hardware options, and determine which sound card is the default/primary in a system with multiple sound cards present. This file is only significant on systems that have audio options installed.</para>
</section>
<section role="NotInToc">
<title>Syntax</title>
@@ -612,4 +612,4 @@
<para>For more information about configuring name resolution, refer to <xref linkend="how2dns" />.</para>
</section>
</section>
-</chapter>
+</chapter> \ No newline at end of file