Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using note formatting #104

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Using note formatting #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0588baf
Can now divide using /<space>
mhwombat Dec 23, 2018
f103d25
Emphasised an exercise for the reader
mhwombat Dec 23, 2018
c509fdc
Emphasised an exercise for the reader
mhwombat Dec 23, 2018
6349bfe
Reference hello-2.10.tar.gz as in pill 08
mhwombat Dec 23, 2018
01e7a60
Using binutils-unwrapped for ar command
mhwombat Dec 23, 2018
0f9e22d
Migrated code from gist
mhwombat Dec 23, 2018
873cfe0
Merge branch 'master' into master
mhwombat Dec 23, 2018
c79175e
Made result consistent.
mhwombat Dec 24, 2018
063c568
Fixed indentation
mhwombat Dec 24, 2018
bfe1acf
Merge branch 'master' into master
mhwombat Dec 25, 2018
5dd6ed9
Merge remote-tracking branch 'upstream/master'
mhwombat Dec 31, 2018
c923db7
Use note formatting
mhwombat Dec 31, 2018
cd55827
Use note formatting
mhwombat Dec 31, 2018
a451a48
Use note formatting
mhwombat Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pills/02-install-on-your-running.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
<para>
Now we'll install Nix on our running system and understand what
changed in our system after the installation.
<emphasis role="bold">If you're using NixOS, Nix is already installed;
you can skip to the <link
linkend="install-on-your-running-system">next</link> pill.</emphasis>
</para>

<note><para>
If you're using NixOS, Nix is already installed;
you can skip to the <link
linkend="install-on-your-running-system">next</link> pill.
</para></note>

<para>
<link xlink:href="https://nixos.org/nix/manual/#chap-installation">Installing
Nix</link> is as easy as installing any other package.
Expand Down
8 changes: 4 additions & 4 deletions pills/03-enter-environment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<section>
<title>Enter the environment</title>

<para>
<emphasis role="bold">If you're using NixOS, you can skip to the <link
linkend="install-something">next</link> step.</emphasis>
</para>
<note><para>
If you're using NixOS, you can skip to the <link
linkend="install-something">next</link> step.
</para></note>

<para>
In the previous article we created a Nix user, so let's start by switching
Expand Down
7 changes: 5 additions & 2 deletions pills/04-basics-of-language.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@
<para>
Launch <literal>nix repl</literal>. First of all, Nix supports basic arithmetic operations:
<literal>+</literal>, <literal>-</literal>, <literal>*</literal> and <literal>/</literal>.
(To exit <literal>nix repl</literal>, use the command <literal>:q</literal>.
Help is available through the <literal>:?</literal> command.)
</para>

<note><para>
To exit <literal>nix repl</literal>, use the command <literal>:q</literal>.
Help is available through the <literal>:?</literal> command.
</para></note>

<screen><xi:include href="./04/basics.txt" parse="text" /></screen>

<para>
Expand Down