[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/kids answers-for-quiz.html free-software-in...
|
From: |
Therese Godefroy |
|
Subject: |
www/kids answers-for-quiz.html free-software-in... |
|
Date: |
Wed, 6 Jun 2018 06:27:59 -0400 (EDT) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 18/06/06 06:27:59
Modified files:
kids : answers-for-quiz.html
free-software-in-your-school.html
interview-with-crazy-pete.html kids.html
quiz.html talk-to-your-parent-or-guardian.html
what-is-an-operating-system.html
what-is-free-software.html what-is-gnu.html
what-is-linux.html
what-is-the-difference-between-free-and-gratis.html
Log message:
- Fix spelling, punctuation, etc.
- Itemize the 4 freedoms in what-is-free-software;
replace 'improvements' with 'changes'.
- Wrap long lines.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/answers-for-quiz.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/free-software-in-your-school.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/interview-with-crazy-pete.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/kids.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/quiz.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/talk-to-your-parent-or-guardian.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/what-is-an-operating-system.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/what-is-free-software.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/what-is-gnu.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/what-is-linux.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/kids/what-is-the-difference-between-free-and-gratis.html?cvsroot=www&r1=1.16&r2=1.17
Patches:
Index: answers-for-quiz.html
===================================================================
RCS file: /webcvs/www/www/kids/answers-for-quiz.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- answers-for-quiz.html 18 Nov 2016 06:31:37 -0000 1.14
+++ answers-for-quiz.html 6 Jun 2018 10:27:58 -0000 1.15
@@ -13,8 +13,8 @@
<h2>Answers to the quiz for Kids</h2>
<p>
-These are the correct answers for <a href="/kids/quiz.html">the quiz for kids
-</a>. The correct answers are marked as bold.
+These are the correct answers to <a href="/kids/quiz.html">the quiz for
+kids</a>. They are marked as bold.
</p>
<ol>
<li>What is free software?
@@ -22,11 +22,11 @@
<li>Software which is given away to users without them
having to pay anything for it.</li>
- <li>Software which gives the users access to the source
+ <li>Software which gives its users access to the source
code.</li>
- <li><b>Software which gives the users' freedom to run, copy,
- distribute, study, change and improve the software.</b></li>
+ <li><b>Software which gives its users the freedom to run, copy,
+ distribute, study, and change the software.</b></li>
</ol>
</li>
<li>What is Linux?
@@ -53,8 +53,8 @@
<li>Copyright infringement.</li>
- <li>To download music and films and share them with your
- neighbour.</li>
+ <li>Downloading music and films, and sharing them with your
+ neighbor.</li>
</ol>
</li>
@@ -100,7 +100,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: free-software-in-your-school.html
===================================================================
RCS file: /webcvs/www/www/kids/free-software-in-your-school.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- free-software-in-your-school.html 18 Nov 2016 06:31:37 -0000 1.14
+++ free-software-in-your-school.html 6 Jun 2018 10:27:58 -0000 1.15
@@ -18,12 +18,12 @@
good arguments you can use:
</p>
<ul>
-<li>You always have access to the source code to free software. That means
that
+<li>You always have access to the source code to free software. This means
that
you can study how the program works and learn more about it.</li>
<li>You may redistribute copies of free software so you can help your
-neighbor. That means that it is much cheaper to share the software with many
+neighbor. This means that it is much cheaper to share the software with many
students.</li>
-<li>With free software comes freedom and cooperation which is good for
+<li>With free software comes freedom and cooperation, which is good for
schools in general.</li>
</ul>
<img src="/graphics/school.png" alt="school" />
@@ -40,22 +40,22 @@
and distribute, either verbatim or with modifications, either gratis or for a
fee. In particular, this means that source code must be available.
-With free software comes freedom and cooperation which is good for schools in
+With free software comes freedom and cooperation, which is good for schools in
general.
-Our school can save money with free software which we are free to copy and
+Our school can save money with free software, which we are free to copy and
redistribute so that we can make copies for all the computers we have.
-We can learn about and study how the software works if we use free software
with
+We can learn about and study how the software works if we use free software,
with
which you always have access to the source code.
Free software is not only good in schools. It is always good. If we learn how
to
-use it in our school, we will maybe use it in a more effective way after we
+use it in our school, we will be able to use it in a more effective way after
we
graduate.
There is much information about free software at gnu.org and at fsf.org.
-We demand a removal of all the proprietary software in our schools computers
and
+We demand removal of all the proprietary software in our schools computers and
a free software replacement.
Sincerely,
@@ -108,7 +108,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: interview-with-crazy-pete.html
===================================================================
RCS file: /webcvs/www/www/kids/interview-with-crazy-pete.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- interview-with-crazy-pete.html 18 Nov 2016 06:31:37 -0000 1.12
+++ interview-with-crazy-pete.html 6 Jun 2018 10:27:58 -0000 1.13
@@ -14,47 +14,71 @@
<h2>Interview with Crazy Pete</h2>
<p>
-<strong>Interviewer</strong>: Tell us a little about yourself. Who are you? In
what way are you associated
-with GNU or free software?
+<strong>Interviewer</strong>: Tell us a little about yourself. Who are you? In
+what way are you associated with GNU or free software?
</p>
<p>
-<strong>Crazy Pete</strong>: Well, I developed a GPL conversion tool that
[was] avalible at http://www.honeyrigs.com/cgi-bin/convert_units.rb. It is
written in <a href="http://www.ruby-lang.org/en/";>Ruby</a> although I have
developed commercially in <a href="http://www.stroustrup.com/C++.html";>C++</a>
most of my life.
+<strong>Crazy Pete</strong>: Well, I developed a GPL conversion tool that [was]
+available at http://www.honeyrigs.com/cgi-bin/convert_units.rb. It is written
+in <a href="http://www.ruby-lang.org/en/";>Ruby</a>, although I have developed
+commercially in <a href="http://www.stroustrup.com/C++.html";>C++</a> most of my
+life.
</p>
<p>
<strong>Interviewer</strong>: How old were you when you started to program?
</p>
<p>
-<strong>Crazy Pete</strong>: When I started to actually program computers, I
was about 25 I think. I were somewhere in my mid 20s. Although I had started
studying binary, hexadecimal and octal numeric systems when I was about 16
because I knew that in 10 years, computers would be common.
+<strong>Crazy Pete</strong>: When I started to actually program computers, I
+was about 25, I think. I was somewhere in my mid 20s, although I had started
+studying binary, hexadecimal and octal numeric systems when I was about 16
+because I knew that, in 10 years, computers would be common.
</p>
<p>
<strong>Interviewer</strong>: Tell us about your working environment.
</p>
<p>
-<strong>Crazy Pete</strong>: I work on free software at home and upload the
work to a server.
+<strong>Crazy Pete</strong>: I work on free software at home, and upload the
+work to a server.
</p>
<p>
-<strong>Interviewer</strong>: Do you think that free software can be useful
commercially?
+<strong>Interviewer</strong>: Do you think that free software can be useful
+commercially?
</p>
<p>
-<strong>Crazy Pete</strong>: Yes! I think it allready have been. Free
Unix-like operating systems have the dominant share of the server market for
example.
+<strong>Crazy Pete</strong>: Yes! I think it already is. Free Unix-like
+operating systems have the dominant share of the server market for example.
</p>
<p>
<strong>Interviewer</strong>: What do you think is good about free software?
</p>
<p>
-<strong>Crazy Pete</strong>: I think it is good because it promotes free
exchange of ideas in the same way as scientific journals do. Just as scientists
working at universities (as opposed to working at drug companies) we allow each
other to freely build on each others work and just as published scientific
works allow students (at least at universities that have access to the
journals) to learn from them, free software allows budding programmers to see
"how things are done, and of course, access to the source code assists in
debugging and software quality because the entire world can inspect the code if
they wish.
+<strong>Crazy Pete</strong>: I think it is good because it promotes free
+exchange of ideas in the same way as scientific journals do. Just as scientists
+working at universities (as opposed to working at drug companies) allow each
+other to freely build on each other's work, and just as published scientific
+works allow students (at least at universities that have access to the
+journals) to learn from them, free software allows budding programmers to see
+how things are done. And of course, access to the source code assists in
+debugging and software quality because the entire world can inspect the code if
+they wish.
</p>
<p>
-<strong>Interviewer</strong>: If a kid asked you how to learn program in the
most efficient way, how would you answer?
+<strong>Interviewer</strong>: If a kid asked you how to learn programming in
+the most efficient way, how would you answer?
</p>
<p>
-<strong>Crazy Pete</strong>: I would say the best way is to find something
that interests you and develope an application to support it. Then i would
recommend that they read books to learn how to develope in the language of
their choice and to look at source code that is available to see how
experienced people do it.
+<strong>Crazy Pete</strong>: I would say the best way is to find something that
+interests you and develop an application to support it. Then I would recommend
+that they read books to learn how to develop in the language of their choice,
+and to look at source code that is available to see how experienced people do
+it.
</p>
<p>
-<strong>Interviewer</strong>: Thank you for your time and good luck with
developing free software in the future!
+<strong>Interviewer</strong>: Thank you for your time, and good luck with
+developing free software in the future!
</p>
<p>
-<strong>Crazy Pete</strong>: You are welcome and good luck to you too!
+<strong>Crazy Pete</strong>: You are welcome, and good luck to you too!
</p>
</div><!-- for id="content", starts in the include above -->
@@ -97,7 +121,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: kids.html
===================================================================
RCS file: /webcvs/www/www/kids/kids.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- kids.html 18 Nov 2016 06:31:37 -0000 1.24
+++ kids.html 6 Jun 2018 10:27:58 -0000 1.25
@@ -27,7 +27,7 @@
<li><a href="/kids/free-software-in-your-school.html">Free Software in Your
School</a></li>
<li><a
href="http://directory.fsf.org/wiki/Category/Education/elementary";>Free
Software for
- Elemantary Education</a></li>
+ Elementary Education</a></li>
<li><a href="/kids/quiz.html">A Quiz for Kids</a></li>
<li><a href="/kids/funny-pics.html">Funny Pictures</a></li>
<li><a href="/kids/talk-to-your-parent-or-guardian.html">Talk to Your Parent
@@ -89,7 +89,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: quiz.html
===================================================================
RCS file: /webcvs/www/www/kids/quiz.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- quiz.html 18 Nov 2016 06:31:36 -0000 1.14
+++ quiz.html 6 Jun 2018 10:27:58 -0000 1.15
@@ -21,11 +21,11 @@
<li>Software which is given away to users without them
having to pay anything for it.</li>
- <li>Software which gives the users access to the source
+ <li>Software which gives its users access to the source
code.</li>
- <li>Software which gives the users' freedom to run, copy,
- distribute, study, change and improve the software.</li>
+ <li>Software which gives its users the freedom to run, copy,
+ distribute, study, and change the software.</li>
</ol>
</li>
<li>What is Linux?
@@ -52,15 +52,15 @@
<li>Copyright infringement.</li>
- <li>To download music and films and share them with your
- neighbour.</li>
+ <li>Downloading music and films, and sharing them with your
+ neighbor.</li>
</ol>
</li>
</ol>
<p><a href="/kids/answers-for-quiz.html">The correct answers</a>
- are avalible.</p>
+ are available.</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -102,7 +102,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:36 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: talk-to-your-parent-or-guardian.html
===================================================================
RCS file: /webcvs/www/www/kids/talk-to-your-parent-or-guardian.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- talk-to-your-parent-or-guardian.html 18 Nov 2016 06:31:37 -0000
1.12
+++ talk-to-your-parent-or-guardian.html 6 Jun 2018 10:27:58 -0000
1.13
@@ -14,23 +14,22 @@
<h2>Talk to Your Parent or Guardian</h2>
<p>
Do you have a personal computer that belongs to your family at home? Does it
use
-proprietary or non-free software? If so, consider talking to your parent or
-guardian about it. You could say to hir (her or him) about it. There is a list
-on this page about things you can say to hir.
+proprietary (non-free) software? If so, consider talking to your parent or
+guardian about it. Here is a list of things you can say.
</p>
<ul>
<li>We should use free software on our computer because then we're not
requested to agree to a contract before running it. We may use free software
for
- any purpose.</li>
+any purpose.</li>
<li>We can study how the program works if it is free software. Access to
the source code is fun and it lets us learn more about how the
software works. This freedom lets us change the program so it fits our
needs.</li>
-<li>We are allowed to share free software with our neighbours and friends.
+<li>We are allowed to share free software with our neighbors and friends.
They may also share it to us. We can earn money on doing that. We will not
be put in prison if we share it.</li>
<li>We are allowed to improve free software and make it better. We can then
- distribute it to others. THen we help others and the community. I think
+distribute it to others. Thus we help others and the community. I think
that cooperation should be encouraged.</li>
</ul>
</div><!-- for id="content", starts in the include above -->
@@ -73,7 +72,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: what-is-an-operating-system.html
===================================================================
RCS file: /webcvs/www/www/kids/what-is-an-operating-system.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- what-is-an-operating-system.html 18 Nov 2016 06:31:37 -0000 1.20
+++ what-is-an-operating-system.html 6 Jun 2018 10:27:58 -0000 1.21
@@ -13,12 +13,12 @@
<h2>What is an Operating System?</h2>
<p>
-Think about a computer. What do you see? You maybe see a monitor, a mouse, a
+Think about a computer. What do you see? Maybe you see a monitor, a mouse, a
keyboard and a computer case. All these things are physical. You can touch
them
-with your hand. That means that they are material. All these things are called
-hardware. Other hardware components of a computer is the processor (the brain
of
- the computer), different kind of chips and the motherboard for example. You
-will not be able to do many things only using the hardware. You need software.
+with your hand. This means that they are material. All these things are called
+hardware. Other hardware components of a computer are the processor (the brain
of
+the computer), different kinds of chips, and the motherboard for example. You
+will not be able to do many things by only using the hardware. You need
software.
You need an operating system with different programs that you can use.
</p>
<img src="/graphics/hardware.png" alt="hardware" />
@@ -26,23 +26,23 @@
<small>Monitors, mice, keyboards and computer cases are all examples of
hardware.</small>
<p>
-An operating system, as we use the term, means a collection of programs that
are
- sufficient to use the computer to do a wide variety of jobs. A general
purpose
+An operating system—this is the term we use—means a collection of
programs that are
+sufficient to use the computer for a wide variety of jobs. A general purpose
operating system, to be complete, ought to handle all the jobs that many users
may want to do. For example, if you want to download a file from the Internet,
you need to have an operating system which contains a program that can dowload
files from the Internet. Software, programs and operating systems are not
-physical. They are just data. They are codes. You could compare it to feelings,
+physical. They are just data. They are codes. You could compare them to
feelings,
musical compositions or literary works.
</p>
<p>
-There are many different operating systems. You have maybe heard about
Windows,
+There are many different operating systems. You may have heard of Windows,
DOS or Mac OS. These are all proprietary (non-free) operating systems. You are
not allowed to use, change, share or study them freely. You do not have the
-freedom you deserve when you are using them. There are free operating systems
+freedom you deserve when you are using them. There are free operating systems,
though. One of them is the GNU operating system. You may use GNU for whatever
purpose you want to. You may change it, share it with others (including
changed
-versions) and study how it works. These are all basic freedoms that every
+versions), and study how it works. These are all basic freedoms that every
computer user in the world should have.
</p>
<p>
@@ -94,7 +94,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: what-is-free-software.html
===================================================================
RCS file: /webcvs/www/www/kids/what-is-free-software.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- what-is-free-software.html 18 Nov 2016 06:31:37 -0000 1.14
+++ what-is-free-software.html 6 Jun 2018 10:27:58 -0000 1.15
@@ -14,19 +14,22 @@
<h2>What is free software?</h2>
<p>
When we talk about free software, we mean free as in freedom, not as in zero
-price. Free software is software that you can run for any purpose, study and
-adapt for your needs, copy and redistribute so you can help friends and other
-people and improve and share your improvements to the public so people can use
-it.
-</p>
+price. With free software, you can</p>
+<ul>
+ <li>run the software for any purpose,</li>
+ <li>study it and adapt it to your needs,</li>
+ <li>copy it and redistribute it so you can help friends and other
people,</li>
+ <li>share your changes with the public so people can use them.</li>
+</ul>
<p>
-A programmer that are developing software is coding the software. The code is
-called "source code". This code is later converted to "binary" code which can
be
- read by the computer but not by humans. If software is free, the source code
-must be avalible for you to study, change and redistribute.
+A programmer who is developing software is “coding” the
+software. The code is called “source code.” This code is
+later converted to “binary” code, which can be
+read by the computer but not by humans. If software is free, the source code
+must be available for you to study, change and redistribute.
</p>
<p>
-Example of a programs source code:
+Example of a program's source code:
</p>
<pre>
float
@@ -87,7 +90,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: what-is-gnu.html
===================================================================
RCS file: /webcvs/www/www/kids/what-is-gnu.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- what-is-gnu.html 18 Nov 2016 06:31:37 -0000 1.15
+++ what-is-gnu.html 6 Jun 2018 10:27:58 -0000 1.16
@@ -23,7 +23,7 @@
gnu head.</small>
<p>
One important part of an operating system is the kernel. The kernel of GNU
-(called HURD) isn't done yet so most people use GNU with Linux. That system is
+(called HURD) isn't done yet so most people use GNU with Linux. This system is
called GNU/Linux.
</p>
<img src="/graphics/tux.png" alt="Tux" />
@@ -76,7 +76,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: what-is-linux.html
===================================================================
RCS file: /webcvs/www/www/kids/what-is-linux.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- what-is-linux.html 18 Nov 2016 06:31:37 -0000 1.11
+++ what-is-linux.html 6 Jun 2018 10:27:58 -0000 1.12
@@ -14,7 +14,7 @@
<h2>What is Linux?</h2>
<p>
One important part of an operating system is the kernel. The kernel of GNU
-(called HURD) isn't done yet so most people use GNU with Linux. That system is
+(called HURD) isn't done yet so most people use GNU with Linux. This system is
called GNU/Linux.
</p>
<img src="/graphics/tux.png" alt="Tux" />
@@ -65,7 +65,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: what-is-the-difference-between-free-and-gratis.html
===================================================================
RCS file:
/webcvs/www/www/kids/what-is-the-difference-between-free-and-gratis.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- what-is-the-difference-between-free-and-gratis.html 18 Nov 2016 06:31:37
-0000 1.16
+++ what-is-the-difference-between-free-and-gratis.html 6 Jun 2018 10:27:58
-0000 1.17
@@ -18,7 +18,7 @@
many rides such as roller coasters and carousels without having to pay
anything
for it. There is nothing wrong with that. That is fun! However, if you aren't
allowed to ride the carousels or the roller coasters while you are in there,
how
- fun is it and how free are you?
+ fun is it, and how free are you?
</p>
<img src="/graphics/amusement-park.png" alt="Amusement park" />
<br />
@@ -83,7 +83,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 06:31:37 $
+$Date: 2018/06/06 10:27:58 $
<!-- timestamp end -->
</p>
</div>
- www/kids answers-for-quiz.html free-software-in...,
Therese Godefroy <=