Skip to content

Commit f53e61a

Browse files
committed
Updates from Eliza.
1 parent 5a41db4 commit f53e61a

11 files changed

+19
-18
lines changed

book/chap01.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The next program prints the following table of Fahrenheit temperatures
160160
and their centigrade or Celsius equivalents, using the formula
161161
`C=(5/9)(F-32)`.
162162

163-
| Farenheight | Celsius |
163+
| Fahrenheit | Celsius |
164164
| ----------- | ------- |
165165
| 0 | -17.8 |
166166
| 20 | -6.7 |

history/lessons.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
]
458458
},
459459
{
460-
"title" : "Exercise 1-3: Farenheight / Celsius with Header",
460+
"title" : "Exercise 1-3: Fahrenheit / Celsius with Header",
461461
"launch" : "tools/ccauto/",
462462
"resource_link_id": "cc4e_1_03",
463463
"custom" : [
@@ -468,7 +468,7 @@
468468
]
469469
},
470470
{
471-
"title" : "Exercise 1-4: Celsius / Farenheight Table",
471+
"title" : "Exercise 1-4: Celsius / Fahrenheit Table",
472472
"launch" : "tools/ccauto/",
473473
"resource_link_id": "cc4e_1_04",
474474
"custom" : [

lessons.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
]
323323
},
324324
{
325-
"title" : "Exercise 1-3: Farenheight / Celsius with Header",
325+
"title" : "Exercise 1-3: Fahrenheit / Celsius with Header",
326326
"launch" : "tools/ccauto/",
327327
"resource_link_id": "cc4e_1_03",
328328
"custom" : [
@@ -333,7 +333,7 @@
333333
]
334334
},
335335
{
336-
"title" : "Exercise 1-4: Celsius / Farenheight Table",
336+
"title" : "Exercise 1-4: Celsius / Fahrenheit Table",
337337
"launch" : "tools/ccauto/",
338338
"resource_link_id": "cc4e_1_04",
339339
"custom" : [

old/lessons.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
]
320320
},
321321
{
322-
"title" : "Exercise 1-3: Farenheight / Celsius with Header",
322+
"title" : "Exercise 1-3: Fahrenheit / Celsius with Header",
323323
"launch" : "tools/ccauto/",
324324
"resource_link_id": "cc4e_1_03",
325325
"custom" : [
@@ -330,7 +330,7 @@
330330
]
331331
},
332332
{
333-
"title" : "Exercise 1-4: Celsius / Farenheight Table",
333+
"title" : "Exercise 1-4: Celsius / Fahrenheit Table",
334334
"launch" : "tools/ccauto/",
335335
"resource_link_id": "cc4e_1_04",
336336
"custom" : [

tools/ccauto/1-10-words.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
function ccauto_instructions($LAUNCH) {
1111
return <<< EOF
1212
<b>K&R Exercise 1-10.</b> Write a program which prints the words in its input, one per line. A word
13-
is any string separated by a space or newline,
13+
is any string separated by a space or newline.
1414
EOF
1515
;
1616
}

tools/ccauto/4-A-faren.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
// Called first
1010
function ccauto_instructions($LAUNCH) {
1111
return <<< EOF
12-
<b>Celsius to Farenheight Conversion</b>
12+
<b>Celsius to Fahrenheit Conversion</b>
1313
<p>
1414
You should write a function called faren(cel)
15-
that takes as input a double Celsuis temperature and converts it and returns
16-
the equivalent Farenheight value.
15+
that takes as input a double Celsius temperature and converts it and returns
16+
the equivalent Fahrenheit value.
1717
</p>
1818
EOF
1919
;

tools/ccauto/4-C-static.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function ccauto_instructions($LAUNCH) {
1414
You should write a function called bump() that uses an static variable
1515
so that the first time it is called, it returns int 0, the next time it returns
1616
1 and so on. Also write a function called start() which takes an int as its parameter
17-
and restarts the sequence from the specivied number.
17+
and restarts the sequence from the specified number.
1818
</p>
1919
EOF
2020
;

tools/ccauto/index.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
'lb-18-machine.php' => 'LBS280-18 Machine Language I',
5353
'lb-98-touring.php' => 'LBS280-98 A Touring Machine',
5454
'1-03-heading.php' => '1-3 Add a header',
55-
'1-04-celsius.php' => '1-4 Celsius / Farenheight Table',
56-
'1-05-reverse.php' => '1-5 Reversed Farenheight / Celsius Table',
55+
'1-04-celsius.php' => '1-4 Celsius / Fahrenheit Table',
56+
'1-05-reverse.php' => '1-5 Reversed Fahrenheit / Celsius Table',
5757
'1-06-count.php' => '1-6 Count blanks, and newlines',
5858
'1-07-single.php' => '1-7 Multiple spaces to a single space',
5959
'1-10-words.php' => '1-10 Print the words in a file',
@@ -63,7 +63,7 @@
6363
'3-01-expand.php' => '3-1 Write a function to expand non-printing characters',
6464
'3-04-itob.php' => '3-4 Write itob() and itoh()',
6565
'3-06-uniq.php' => '3-6 Write simple version of UNIX uniq',
66-
'4-A-faren.php' => '4-A Write a function to convert from Celsius to Farenheight',
66+
'4-A-faren.php' => '4-A Write a function to convert from Celsius to Fahrenheit',
6767
'4-B-extern.php' => '4-B Write a function that uses external data scope',
6868
'4-C-static.php' => '4-C Write a function that uses static data scope',
6969
'6-A-list.php' => '6-A ArrayList of Integers',

tools/ccauto/lb-18-machine.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ function ccauto_instructions($LAUNCH) {
1212
return <<< EOF
1313
<p>
1414
<b>LBS290 Exercise 18 - A Simple Machine.</b>
15-
You are to implement an interpretor for a simple programming language. Your computer has 256 characters of memory. You are to
15+
You are to implement an interpreter for a simple programming language. Your computer has 256 characters
16+
of memory. You are to
1617
read a sequence of instructions from input and perform those instructions. At the end of the program you print the
1718
memory out as a zero-terminated C character array. Here are the instructions you need to support:
1819
<pre>

tools/ccauto/rs-07-minmax.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Called first
1010
function ccauto_instructions($LAUNCH) { return <<< EOF
11-
<b>Exercise RS-7:</b> Write a C program to determine the minmum and maximum
11+
<b>Exercise RS-7:</b> Write a C program to determine the minimum and maximum
1212
of a sequence of integer numbers on input, terminated by the string "done".
1313
The patterns for input and output should match the following Python application.
1414
Make sure that the input lines can be at least 1000 characters.

tools/ccauto/rs-10-concat.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Called first
1010
function ccauto_instructions($LAUNCH) { return <<< EOF
1111
<b>Exercise RS-10:</b> Write a C program to prompt for two strings and
12-
concatencate them as shown in in the Python code below.
12+
concatenate them as shown in in the Python code below.
1313
<pre>
1414
print('Enter two strings');
1515
first = input()

0 commit comments

Comments
 (0)