summaryrefslogtreecommitdiff
path: root/src/devel
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-09 14:12:18 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-12-09 14:12:18 -0600
commit580766ce1abcef6638e72d2a837fec0cfe638fa7 (patch)
tree6dc8d450d98981e885c0fe27615dda688d0b5442 /src/devel
parent0b907283e7d6c8ec9edbd5e035bebe19904a3820 (diff)
downloaddocs-580766ce1abcef6638e72d2a837fec0cfe638fa7.tar.gz
docs-580766ce1abcef6638e72d2a837fec0cfe638fa7.tar.bz2
docs-580766ce1abcef6638e72d2a837fec0cfe638fa7.tar.xz
docs-580766ce1abcef6638e72d2a837fec0cfe638fa7.zip
Devel, Install: fix up typos (thanks @dimitsos) and structure (thanks me)
Diffstat (limited to 'src/devel')
-rw-r--r--src/devel/2_nonpkg.xml4
-rw-r--r--src/devel/3_git.xml2
-rw-r--r--src/devel/develbook.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/devel/2_nonpkg.xml b/src/devel/2_nonpkg.xml
index c844be9..778d8b0 100644
--- a/src/devel/2_nonpkg.xml
+++ b/src/devel/2_nonpkg.xml
@@ -17,13 +17,13 @@
</section>
<section>
<title>Configuring Your Environment</title>
- <para>You will need to install the <package>xmlto</package> package to ensure your changes leave the documentation syntatically valid. After making your changes, run the <command>xmlto</command> command on the primary file (for this guide, <filename>develguide.xml</filename>) and ensure there are no errors.</para>
+ <para>You will need to install the <package>xmlto</package> package to ensure your changes leave the documentation syntactically valid. After making your changes, run the <command>xmlto</command> command on the primary file (for this guide, <filename>develguide.xml</filename>) and ensure there are no errors.</para>
</section>
</section>
<section>
<title>Spread the Word</title>
<para>There are many ways to spread the word about Adélie Linux.
- Talk to your friends about Adélie Linux and the benefits of libre software, including security, speed, and less need to purchase new computers every year.
+ Talk to your friends about Adélie Linux and the benefits of libre software, including security, speed, control, and ability to use the latest features without purchasing new computers every year.
Have civil discussions on forums, newsgroups, and social media.
If you're a student, talk to your school's Computer Science department and see if they are interested in a lab with Adélie Linux.
By spreading the word, you're helping more people learn and spreading our ideas and goals worldwide. Thank you!</para>
diff --git a/src/devel/3_git.xml b/src/devel/3_git.xml
index 73e3522..6124a78 100644
--- a/src/devel/3_git.xml
+++ b/src/devel/3_git.xml
@@ -48,7 +48,7 @@
</itemizedlist>
<section>
<title>Using Branches</title>
- <para>A <firstterm>branch</firstterm> is a self-contained copy of a project's files. Using branches allow your changes to be reviewed quickly and, if approved, merged in to the Adélie Linux source quickly.
+ <para>A <firstterm>branch</firstterm> is a self-contained copy of a project's files. Using branches allows your changes to be reviewed quickly and, if approved, merged in to the Adélie Linux source quickly.
A branch should be a single "unit of work". That is, a branch should have a single goal in mind. Sometimes a branch can contain many commits; for instance, your goal may be "update the Gnome Office packages". In that case, you would have at least one commit for each Gnome Office package.
However, sometimes a branch only needs one commit. This can be useful for simple bug fixes, or bumping a single package's version.</para>
<para>Branches should have a name that reflects their goal. A branch name such as <literal>bugfix</literal> or <literal>version</literal> is unclear and doesn't communicate the goal of the branch. A branch name such as <literal>gnumeric-1.12.35-update</literal> or <literal>fix-boot-on-g3</literal> is clear and concisely states the branch goal.</para>
diff --git a/src/devel/develbook.xml b/src/devel/develbook.xml
index 26b4435..b5eefdb 100644
--- a/src/devel/develbook.xml
+++ b/src/devel/develbook.xml
@@ -21,7 +21,7 @@
<preface>
<title>Preface</title>
<para>This Developer's Handbook is the official documentation for developing the Adélie Linux 1.0 system. It is designed for developers interested in working on the distribution itself; for general information on programming your computer running the Adélie Linux system, see the User's Handbook chapter "Getting started with programming".</para>
- <para>Many contributed to the final version of the Handbook. This includes <personname><firstname>Natanael</firstname><surname>Copa</surname></personname> and <personname><firstname>Timo</firstname><surname>Teras</surname></personname> from Alpine Linux.</para>
+ <para>Many contributed to the final version of the Handbook. This includes <personname><firstname>Natanael</firstname><surname>Copa</surname></personname> and <personname><firstname>Timo</firstname><surname>Teräs</surname></personname> from Alpine Linux.</para>
<para>It is assumed that you, the reader, are familiar with using a terminal or command line interface, the use of Unix commands, and the compilation of software. If you are not yet familiar with these concepts, start with our User's Handbook, which will assist you in learning them.</para>
<para>Please also ensure that you are comfortable and properly rested before reading this handbook. This will allow you to learn quicker, and be able to recall the information you have learned easier.</para>
<para>It is hoped by the author that you find this handbook easy to understand and read. Please feel free to contact me or the Adélie Linux community if you have any suggestions on how to make this handbook better. We'd love to hear from you, and we hope you enjoy using our distribution.</para>