Synchronize from trunk

diff --combined disobedience/manual/index.html
index 1d805b5,a453bdd..8f397eb
--- 1/disobedience/manual/index.html
--- 2/disobedience/manual/index.html
+++ b/disobedience/manual/index.html
@@@ -31,15 -31,15 +31,15 @@@ along with this program.  If not, see <
  
     <p class=chapter><a href="intro.html">1. Introduction</a></p>
     <ul>
 -     <li>What DisOrder and Disobedience are, and how to get them.</li>
 -     <li>How to get a DisOrder login.</li>
 -     <li>How to start Disobedience.</li>
 +     <li>What DisOrder and Disobedience are, and how to get them</li>
 +     <li>How to get a DisOrder login</li>
 +     <li>How to start Disobedience</li>
     </ul>
  
     <p class=chapter><a href="window.html">2. Window Layout</a></p>
  
     <ul>
 -     <li>A tour of the Disobedience window.</li>
 +     <li>A tour of the Disobedience window</li>
     </ul>
  
     <p class=chapter><a href="tabs.html">3. Tabs</a></p>
@@@ -47,27 -47,28 +47,28 @@@
     <ul>
       <li>Detailed descriptions of
         the <b>Queue</b>, <b>Recent</b>, <b>Choose</b> and <b>Added</b>
 -       tabs.</li>
 +       tabs</li>
     </ul>
  
     <p class=chapter><a href="properties.html">4. Track Properties</a></p>
  
     <ul>
 -     <li>How to edit track properties.</li>
 +     <li>How to edit track properties</li>
     </ul>
  
     <p class=chapter><a href="playlists.html">5. Playlists</a></p>
  
     <ul>
 -     <li>What playlists are.</li>
 -     <li>Editing playlists.</li>
 +     <li>What playlists are</li>
 +     <li>Editing playlists</li>
     </ul>
  
     <p class=chapter><a href="misc.html">Appendix</a></p>
  
     <ul>
-      <li>Reporting bugs</li>
-      <li>Copyright notice</li>
+      <li>Network play.</li>
+      <li>Reporting bugs.</li>
+      <li>Copyright notice.</li>
     </ul>
  
   </body>