Merge pull request #226 from dsanders12/potential-issue-fix

Resolves #219

Author: bnmnetp

pretext/GeneralIntro/FormalandNaturalLanguages.ptx

@@ -55,11 +55,11 @@
       <p>Formal languages mean exactly what they say.  On the other hand,
                             natural languages are full of idiom and metaphor. If someone says, <q>The
                             other shoe fell</q>, there is probably no shoe and nothing falling.</p>
-      <tip>
+      <note>
         <p>You'll need to find the original joke to understand the idiomatic
                                 meaning of the other shoe falling.  <em>Yahoo! Answers</em> thinks it
                                 knows!</p>
-      </tip>
+      </note>
     </gi>
   </glossary>
   <p>People who grow up speaking a natural language&#x2014;everyone&#x2014;often have a hard

pretext/SimplePythonData/VariableNamesandKeywords.ptx

@@ -5,9 +5,9 @@
             digits, but they have to begin with a letter or an underscore. Although it is
             legal to use uppercase letters, by convention we don't. If you do, remember
             that case matters. <c>Bruce</c> and <c>bruce</c> are different variables.</p>
-  <caution>
+  <warning>
     <p>Variable names can never contain spaces.</p>
-  </caution>
+  </warning>
   <p>The underscore character ( <c>_</c>) can also appear in a name. It is often used in
             names with multiple words, such as <c>my_name</c> or <c>price_of_tea_in_china</c>.
             There are some situations in which names beginning with an underscore have
@@ -153,7 +153,7 @@ class = "Computer Science 101"</pre>
   <p>Programmers generally choose names for their variables that are meaningful to
             the human readers of the program &#x2014; they help the programmer document, or
             remember, what the variable is used for.</p>
-  <caution>
+  <warning>
     <p>Beginners sometimes confuse <q>meaningful to the human readers</q> with
                 <q>meaningful to the computer</q>.  So they'll wrongly think that because
                 they've called some variable <c>average</c> or <c>pi</c>, it will somehow
@@ -166,7 +166,7 @@ class = "Computer Science 101"</pre>
                 the programmer, have to write some program code to calculate the average,
                 or you must write an assignment statement to give a variable the value you
                 want it to have.</p>
-  </caution>
+  </warning>
   <p>
     <term>Check your understanding</term>
   </p>

pretext/SimplePythonData/Variables.ptx

@@ -25,10 +25,10 @@ pi = 3.14159
 17 = n
 </input>
   </program>
-  <tip>
+  <note>
     <p>When reading or writing code, say to yourself <q>n is assigned 17</q> or <q>n gets
                 the value 17</q> or <q>n is a reference to the object 17</q> or <q>n refers to the object 17</q>.  Don't say <q>n equals 17</q>.</p>
-  </tip>
+  </note>
   <p>A common way to represent variables on paper is to write the name with an arrow
             pointing to the variable's value. This kind of figure, known as a <term>reference diagram</term>, is often called a <term>state
                 snapshot</term> because it shows what state each of the variables is in at a