Merge branch 'master' into 'master'

Two small language fixes



See merge request !1

1 files changed, 9 insertions, 9 deletions

diff --git a/src/admin/1_intro.xml b/src/admin/1_intro.xml
index 743c04a..3a77db5 100644
--- a/src/admin/1_intro.xml
+++ b/src/admin/1_intro.xml
@@ -30,7 +30,7 @@
                     <entry>&check; / &check;</entry>
                     <entry>&cross;</entry>
                     <entry>&check; / &check;</entry>
-                    <entry>Dev<footnote label="*" id="port_in_dev"><para>This port is in active development.  It is not currently available yet.</para></footnote></entry>
+                    <entry>Dev<footnote label="*" id="port_in_dev"><para>This port is in active development.  It is not available yet.</para></footnote></entry>
                     <entry>Dev<footnoteref linkend="port_in_dev"/></entry>
                     <entry>&check; / &check;</entry>
                     <entry>&cross;</entry>
@@ -234,7 +234,7 @@
                     <entry>Adélie Linux</entry>
                     <entry>GCC, musl</entry>
                     <entry>OpenRC (default) or s6</entry>
-                    <entry>zsh (default) or others</entry>
+                    <entry>Zsh (default) or others</entry>
                     <entry>KDE Plasma 5 and others</entry>
                     <entry>Yes</entry>
                 </row>
@@ -250,7 +250,7 @@
                     <entry>Arch Linux</entry>
                     <entry>GCC, glibc</entry>
                     <entry>systemd</entry>
-                    <entry>bash (default) or others</entry>
+                    <entry>Bash (default) or others</entry>
                     <entry>GNOME 3 and others</entry>
                     <entry>Yes</entry>
                 </row>
@@ -258,7 +258,7 @@
                     <entry>Debian GNU/Linux</entry>
                     <entry>GCC, glibc</entry>
                     <entry>systemd (default) or sysvinit</entry>
-                    <entry>bash (default) or others</entry>
+                    <entry>Bash (default) or others</entry>
                     <entry>GNOME 3 and others</entry>
                     <entry>Some</entry>
                 </row>
@@ -266,7 +266,7 @@
                     <entry>Fedora Linux</entry>
                     <entry>GCC, glibc</entry>
                     <entry>systemd</entry>
-                    <entry>bash (default) or others</entry>
+                    <entry>Bash (default) or others</entry>
                     <entry>GNOME 3 (default) or KDE Plasma 5</entry>
                     <entry>Yes</entry>
                 </row>
@@ -282,7 +282,7 @@
                     <entry>Gentoo Linux</entry>
                     <entry>GCC or clang, glibc or musl or uclibc</entry>
                     <entry>OpenRC (default) or systemd</entry>
-                    <entry>bash (default) or others</entry>
+                    <entry>Bash (default) or others</entry>
                     <entry>GNOME 3 and others</entry>
                     <entry>Yes</entry>
                 </row>
@@ -290,7 +290,7 @@
                     <entry>Mac OS X</entry>
                     <entry>Clang, FreeBSD</entry>
                     <entry>launchd</entry>
-                    <entry>bash (default) or tcsh</entry>
+                    <entry>Bash (default) or tcsh</entry>
                     <entry>Aqua</entry>
                     <entry>Yes</entry>
                 </row>
@@ -298,7 +298,7 @@
                     <entry>Windows</entry>
                     <entry>Clang, Win32</entry>
                     <entry>Custom</entry>
-                    <entry>PowerShell (default) or bash</entry>
+                    <entry>PowerShell (default) or Bash</entry>
                     <entry>Win32</entry>
                     <entry>Yes, with proprietary software</entry>
                 </row>
@@ -313,7 +313,7 @@
             <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>
             <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>
+            <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 prohibit non-libre software from being included in Adélie Linux.</para>
         </section>
         <section>
             <title>Package choice</title>