Merge branch 'master' into ch8.3new

Author: pearcej

source/ch2_firstjavaprogram.ptx

@@ -8,8 +8,8 @@
     <title>Classes and Objects</title>
 
     <p>
-        <idx>Object-Oriented Programming (OOP)</idx>
-        Depending on how deep your knowledge of Python and programming in general is, you may or may not be familiar with classes and objects. These two important <term>Object-Oriented Programming (OOP)</term> concepts will briefly be discussed. If you already have a good understanding of classes and objects in Python, this section may be skipped.
+        <idx>object-oriented programming</idx> <idx>OOP</idx>
+        Depending on how deep your knowledge of Python and programming in general is, you may or may not be familiar with classes and objects. These two important <term>Object-Oriented Programming</term> (<term>OOP</term>) concepts will briefly be discussed. If you already have a good understanding of classes and objects in Python, this section may be skipped.
     </p>
 
     <p>

source/ch3_javadatatypes.ptx

@@ -728,18 +728,28 @@ main()
     This program reads the file <c>alice30.txt</c> (which follows), and it then splits it into a list of words. Next it creates a dictionary called <c>count</c> which maps each word to the number of times that word occurs in the text. Finally, it prints out the words in alphabetical order along with their frequency.
         </p>
 
-        <datafile label="datafile-alice1" filename="alice30.txt" editable="no" cols="30" rows="15"><pre> 
-            Down, down, down.  Would the fall NEVER come to an end! 
-             'I wonder how many miles I've fallen by this time?' she said aloud. 'I must 
-             be getting somewhere near the centre of the earth.  
-             Let me see:  that would be four thousand miles down, I think--' 
-             (for, you see, Alice had learnt several things of this sort in her lessons 
-             in the schoolroom, and though this was not a VERY good opportunity for 
-             showing off her knowledge, as there was no one to listen to her, still it 
-             was good practice to say it over) '--yes, that's about the right distance
-             --but then I wonder what Latitude or Longitude I've got to?'  
-             (Alice had no idea what Latitude was, or Longitude either, 
-             but thought they were nice grand words to say.) </pre></datafile>
+        <datafile label="datafile-alice1" filename="alice30.txt" editable="no" cols="30" rows="15">
+            <pre> 
+            Down, down, down. Would the fall NEVER
+            come to an end! 'I wonder how many
+            miles I've fallen by this time?' she
+            said aloud. 'I must be getting somewhere
+            near the centre of the earth. Let me see:
+            that would be four thousand miles down,
+            I think--' (for, you see, Alice had
+            learnt several things of this sort in
+            her lessons in the schoolroom, and though
+            this was not a VERY good opportunity for
+            showing off her knowledge, as there was no
+            one to listen to her, still it was good
+            practice to say it over) '--yes, that's
+            about the right distance--but then I
+            wonder what Latitude or Longitude I've got
+            to?' (Alice had no idea what Latitude was,
+            or Longitude either, but thought they were
+            nice grand words to say.)
+            </pre>
+        </datafile>
         <p>
  Notice that the structure of the program is very similar to the numeric histogram program. 
         </p>

source/ch4_conditionals.ptx

@@ -389,8 +389,8 @@ The <c>switch</c> statement is not used very often, and we recommend you do not
     <section xml:id="boolean-operators">
         <title>Boolean Operators</title>
 
-        <p><idx>Boolean operators</idx>
-The conditionals used in the if statement can be Boolean variables, simple comparisons, and compound Boolean expressions.
+        <p><idx>Boolean operators</idx> <idx>simple comparisons</idx> <idx>compound Boolean expressions</idx>
+The conditionals used in the if statement can be <term>Boolean variables</term>, <term>simple comparisons</term>, and <term>compound Boolean expressions</term>.
         </p>
 
 <p><idx>ternary operator</idx>
@@ -408,7 +408,7 @@ of an assignment statement. The following table summarizes how this works:
     </row>
     <row>
       <cell><c>condition</c></cell>
-      <cell>The Boolean expression that is evaluated (e.g., <c>a % 2 == 0</c>).</cell>
+      <cell>The <c>boolean</c> expression that is evaluated (e.g., <c>a % 2 == 0</c>).</cell>
     </row>
     <row>
         <cell><c>?</c></cell>

source/ch5_loopsanditeration.ptx

@@ -321,7 +321,6 @@ public class DoWhileExample {
                 </choice>
             </choices>
             </exercise>
-
         </reading-questions>
     </section>
 </chapter>

source/ch8_filehandling.ptx

@@ -85,6 +85,7 @@
     <section xml:id="creating-files">
         <title>Creating Files</title>
 
+
         <p>
             We will now create a <c>File</c> object. It is important to create a meaningful name for the <c>File</c> object. We will call ours <c>myFile</c>.
         </p>
@@ -111,8 +112,9 @@
             </p>
         </note>
 
+
         <p>
-            Now that we have created a new <c>File</c> object, we can create a file using the <c>createNewFile()</c> method from the <c>File</c> class. While the previous line of code creates an object within the program for the file, this method actually does the work of creating a file and saving it in the current working directory. This method returns a boolean value. If the method returns <c>true</c>, the file was successfully created. If the method returns <c>false</c>, there is already a file using the chosen file name. We can use this method's possible return values in tandem with an try/catch structure to determine if the file was created, or catch the error if a file with that file name already exists in the directory.
+            Now let's learn how to make a file in Java. In Python. files can be made using the <c>open()</c> function on a file path that doesn't exist yet. Similarly, in Java you create a file by using the <c>createNewFile()</c> method on a <c>File</c> object. This method actually does the work of creating a file and saving it in the current working directory, and returns a boolean value of either true or false if the file is successfully created. We can use this method's possible return values in tandem with an try/catch structure to determine if the file was created, or catch the error if a file with that file name already exists in the directory.
         </p>
 
         <p>
@@ -408,15 +410,15 @@
         </note>
 
         <p>
-            Speaking of overwriting data, what if we want to append text to the end of any text already in <c>myfile.txt</c>? To accomplish this, we can pass a boolean argument along with the file name when creating a new data argument:
+            Speaking of overwriting data, what if we want to append text to the end of any text already in <c>myfile.txt</c>? To accomplish this, we can pass a <c>boolean</c> argument along with the file name when creating a new data argument:
         </p>
 
         <pre>
             FileWriter myWriter = new FileWriter("myfile.txt", true); // true enables append mode
         </pre>
 
         <p>
-            Now, when we use <c>write()</c> method like before, the text will be appended if there is already text in the document. If we were to update our code to include the boolean argument:
+            Now, when we use <c>write()</c> method like before, the text will be appended if there is already text in the document. If we were to update our code to include the <c>boolean</c> argument:
         </p>
         <datafile label="my-file-8-4-6" filename="myfile.txt" xml:id= "my-file-8-4-6" editable="yes">
                 <pre>