annotate src/computer_literacy/computer_literacy.html @ 27:9134d56639ae default tip

finish computer_literacy
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 09 Oct 2025 19:15:03 -0600
parents fb87f762847e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
1 <!doctype html>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
2 <html lang="en">
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
3 <head>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
4 <script src="/site.js"></script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
5 <script> head() </script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
6 <title>Arkian - Computer Literacy</title>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
7 <script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
8 'use strict';
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
9
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
10 let content = {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
11 intro: {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
12 title: 'Introduction',
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
14 <p>Computer literacy is a generally useful skill, and it helps with maintaining this website. Learning the basic skills taught here will give you a better understanding of your computer and will help you use it more effectively.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
15
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
16 <p>I will often say "Do X" without saying how to do X. A big part of computer literacy is figuring out how to do things. Your two main resources are Google and AI's like ChatGPT and Claude.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
17 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
18 },
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
19 editor: {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
20 title: 'Text Editor and JSON',
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
21 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
22 <p>Many files on your computer are text files. These files contain simple text. You edit these files with a <a href="https://en.wikipedia.org/wiki/Text_editor">text editor</a>.
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
23
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
24 <p>I reviewed the available text editors and I think <a href="https://www.sublimetext.com/">Sublime Text</a> is the best one available. So please download it and learn how it works.</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
25
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
26 <p><a href="https://en.wikipedia.org/wiki/JSON">JSON</a> is the most popular text data format. Do your own research on JSON to understand it. It is fairly simple.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
27
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
28 <p>I paired Sublime Text with JSON because Sublime Text uses JSON files for its <a href="https://www.sublimetext.com/docs/settings.html">settings</a>. (Actually not quite pure JSON because it includes comments which are lines starting with <code>//</code>.) Experiment with Sublime Text settings to learn more about both Sublime Text and JSON.</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
29 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30 },
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
31 bash: {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
32 title: 'Bash - Command Line Shell',
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
33 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
34 <p><a href="https://www.gnu.org/software/bash/">Bash</a> is a <a href="https://en.wikipedia.org/wiki/Unix_shell">Unix shell</a> or <a href="https://en.wikipedia.org/wiki/Command-line_interface">command line</a>. Using the command line is like having a conversation with one's computer. Bash deals with basic concepts like files and directories. Using Bash will give you a much deeper understanding of your computer.</p>
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
35
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
36 <p>There are many shells available but Bash is old and standard. None of the alternatives are better, so stick with Bash. For this lesson, please read <a href="bash.html">my tutorial</a>.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
37 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
38 },
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
39 regex: {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
40 title: 'Regular Expressions',
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
41 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
42 <p><a href="https://en.wikipedia.org/wiki/Regular_expression">Regular expressions</a>, or regex for short, are used for searching or matching text. This is a common need in programming, but is also useful for Bash which uses it in the <a href="https://en.wikipedia.org/wiki/Grep">grep</a> command.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
43
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
44 <p>There are a few decent grep tutorials, so I don't have to write my own. Here they are:</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
45
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
46 <ul>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
47 <li><a href="https://vegastack.com/tutorials/regular-expressions-in-grep/">Regular Expressions in Grep</a></li>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
48 <li><a href="https://cs.nyu.edu/~mohri/unix08/lect4">Regular Expressions</a></li>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
49 <li><a href="https://www.gnu.org/software/grep/manual/grep.html">GNU Grep</a></li>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
50 </ul>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
51
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
52 <p>I suggest that you just read through these tutorials so that you get a sense for how regex and grep work. You don't need to practice anything here. You can come back to these tutorials later when you have a real need for regex or grep.</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
53 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
54 },
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
55 hg: {
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
56 title: 'Mercurial - Source Control',
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
57 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
58 <p><a href="https://en.wikipedia.org/wiki/Version_control">Source control</a> tracks changes to files. It is mostly used by programmers but is useful for anyone who wants to track changes in files. This website is in source control.</p>
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
59
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
60 <p>The most popular source control software is <a href="https://git-scm.com/">Git</a>. Of course it is horrible since modern programmers only like horrible things. We use the less popular software <a href="https://www.mercurial-scm.org/">Mercurial</a>.</p>
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
61
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
62 <p>Thankfully Mercurial is well documented. Read <a href="https://hgbook.red-bean.com/">Mercurial: The Definitive Guide</a> up to (and including) chapter 9.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
63
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
64 <p>To get started with Mercurial, download Mercurial from <a href="https://www.mercurial-scm.org/">their website</a> and install it. Then do:</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
65
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
66 <code block>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
67 ~/learn $ hg version
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
68 Mercurial Distributed SCM (version 5.2.2)
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
69 (see https://mercurial-scm.org for more information)
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
70
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
71 Copyright (C) 2005-2019 Matt Mackall and others
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
72 This is free software; see the source for copying conditions. There is NO
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
73 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
74 ~/learn $
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
75 </code>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
76
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
77 <p>If this works, it is installed properly. Next <a href="https://hgbook.red-bean.com/read/a-tour-of-mercurial-the-basics.html#sec:tour-basic:username">set up your Mercurial configuration file</a> which is <code>~/.hgrc</code> on a Mac or <code>/c/Users/$(whoami)/mercurial.ini</code> on Windows <a href="https://www.msys2.org/">MSYS2</a>. My <a href="https://www.mercurial-scm.org/doc/hgrc.5.html">hgrc</a> file looks like this:
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
78
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
79 <code block>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
80 [ui]
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
81 username = Franklin Schmidt <fschmidt@gmail.com>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
82
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
83 [auth]
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
84 hghosting.prefix = https://hg.reactionary.software/repo/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
85 hghosting.username = fschmidt@gmail.com
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
86 hghosting.password = xxxxxxxxxx
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
87
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
88 [extensions]
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
89 hgext.extdiff =
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
90
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
91 [extdiff]
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
92 cmd.dm = diffmerge
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
93 </code>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
94
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
95 <p>You should register on <a href="https://hg.reactionary.software/">our Mercurial hosting service</a> and use your email as the username and the assigned password in <code>.hgrc</code>. The last two blocks set up <code>hg dm</code> to call <a href="https://sourcegear.com/diffmerge/">DiffMerge</a> by using the <a href="https://wiki.mercurial-scm.org/ExtdiffExtension">Extdiff extension</a>.</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
96
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
97 <p>Now you can play with <a href="https://hg.reactionary.software/repo/test/">https://hg.reactionary.software/repo/test/</a> like this:</p>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
98
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
99 <code block>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
100 ~/learn $ hg clone https://hg.reactionary.software/repo/test/ hgtest1
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
101 no changes found
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
102 updating to branch default
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
103 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
104 ~/learn $ hg clone https://hg.reactionary.software/repo/test/ hgtest2
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
105 no changes found
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
106 updating to branch default
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
108 ~/learn $ ls -Fd h*
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
109 hgtest1/ hgtest2/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
110 ~/learn $ cd hgtest1
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
111 ~/learn/hgtest1 $ touch file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
112 ~/learn/hgtest1 $ e file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
113 ~/learn/hgtest1 $ cat file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
114 some text
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
115 ~/learn/hgtest1 $ hg status
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
116 ? file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
117 ~/learn/hgtest1 $ hg add file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
118 ~/learn/hgtest1 $ hg status
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
119 A file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
120 ~/learn/hgtest1 $ hg pull
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
121 pulling from https://hg.reactionary.software/repo/test/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
122 no changes found
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
123 ~/learn/hgtest1 $ hg commit -m 'add file.txt'
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
124 ~/learn/hgtest1 $ hg push
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
125 pushing to https://hg.reactionary.software/repo/test/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
126 searching for changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
127 remote: adding changesets
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
128 remote: adding manifests
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
129 remote: adding file changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
130 remote: added 1 changesets with 1 changes to 1 files
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
131 ~/learn/hgtest1 $ cd ../hgtest2
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
132 ~/learn/hgtest2 $ hg pull
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
133 pulling from https://hg.reactionary.software/repo/test/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
134 requesting all changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
135 adding changesets
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
136 adding manifests
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
137 adding file changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
138 added 1 changesets with 1 changes to 1 files
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
139 new changesets aab34516d8dc
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
140 (run 'hg update' to get a working copy)
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
141 ~/learn/hgtest2 $ hg update
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
142 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
143 ~/learn/hgtest2 $ hg status
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
144 ~/learn/hgtest2 $ cat file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
145 some text
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
146 ~/learn/hgtest2 $ e file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
147 ~/learn/hgtest2 $ cat file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
148 some text
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
149 and more
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
150 ~/learn/hgtest2 $ hg status
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
151 M file.txt
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
152 ~/learn/hgtest2 $ hg pull
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
153 pulling from https://hg.reactionary.software/repo/test/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
154 searching for changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
155 no changes found
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
156 ~/learn/hgtest2 $ hg dm
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
157 ~/learn/hgtest2 $ hg commit -m 'and more'
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
158 ~/learn/hgtest2 $ hg push
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
159 pushing to https://hg.reactionary.software/repo/test/
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
160 searching for changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
161 remote: adding changesets
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
162 remote: adding manifests
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
163 remote: adding file changes
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
164 remote: added 1 changesets with 1 changes to 1 files
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
165 </code>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
166 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
167 },
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
168 programming: {
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
169 title: 'Programming',
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
170 content: `\
27
9134d56639ae finish computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents: 26
diff changeset
171 <p>If you are interested in learning programming, you can continue with my <a href="https://www.reactionary.software/learn.html">reactionary programming course</a>.</p>
26
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
172 ` ,
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
173 },
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
174 };
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
175 </script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
176 </head>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
177 <body>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
178 <script> header() </script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
179 <div content>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
180 <h1><a href="computer_literacy.html">Computer Literacy</a></h1>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
181 <hr>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
182 <h2>Contents</h2>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
183 <div toc>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
184 <script> showToc(content) </script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
185 </div>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
186 <hr>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
187 <script> showContent(content,2) </script>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
188 </div>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
189 </body>
fb87f762847e start computer_literacy
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
190 </html>