From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Fri, 27 Nov 2009 16:09:42 +0000 (+0000)
Subject: Merge manual improvements
X-Git-Tag: 5.0~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/b1a617c92817a3d5daab50934c69457942660f5b?hp=fa8d56c8a754e75ea54dd59927367c0aa9950cf1

Merge manual improvements
---

diff --git a/disobedience/manual/index.html b/disobedience/manual/index.html
index a453bdd..7245024 100644
--- a/disobedience/manual/index.html
+++ b/disobedience/manual/index.html
@@ -31,15 +31,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    <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,28 +47,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <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>Network play.</li>
-     <li>Reporting bugs.</li>
-     <li>Copyright notice.</li>
+     <li>Network play</li>
+     <li>Reporting bugs</li>
+     <li>Copyright notice</li>
    </ul>
 
  </body>
diff --git a/disobedience/manual/intro.html b/disobedience/manual/intro.html
index 829ae2f..52d0915 100644
--- a/disobedience/manual/intro.html
+++ b/disobedience/manual/intro.html
@@ -59,6 +59,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    cover a few such topics as they are necessary to getting up and
    running with Disobedience.</p>
 
+   <!--
+
    <p>This diagram shows an overview of one possible setup.</p>
 
    <p class=image><img src="arch-simple.png"></p>
@@ -75,6 +77,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    on the same computer as the server provided it can run X11
    applications.</p>
 
+   -->
+
    <h2><a name=getting>1.2 Getting DisOrder</a></h2>
 
    <p>There are two ways to get DisOrder.</p>
diff --git a/disobedience/manual/playlist-create.png b/disobedience/manual/playlist-create.png
new file mode 100644
index 0000000..f48997d
Binary files /dev/null and b/disobedience/manual/playlist-create.png differ
diff --git a/disobedience/manual/playlist-picker-menu.png b/disobedience/manual/playlist-picker-menu.png
new file mode 100644
index 0000000..be5a65b
Binary files /dev/null and b/disobedience/manual/playlist-picker-menu.png differ
diff --git a/disobedience/manual/playlist-popup-menu.png b/disobedience/manual/playlist-popup-menu.png
new file mode 100644
index 0000000..0bb673d
Binary files /dev/null and b/disobedience/manual/playlist-popup-menu.png differ
diff --git a/disobedience/manual/playlist-window.png b/disobedience/manual/playlist-window.png
new file mode 100644
index 0000000..9ffd991
Binary files /dev/null and b/disobedience/manual/playlist-window.png differ
diff --git a/disobedience/manual/playlists.html b/disobedience/manual/playlists.html
index d83ad6c..bef0c18 100644
--- a/disobedience/manual/playlists.html
+++ b/disobedience/manual/playlists.html
@@ -62,8 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    <h2><a name=creating>5.2 Creating Playlists</a></h2>
 
-   <!-- TODO rewrite with screenshots -->
-
    <p>To create a playlist, click the <b>Add</b> button in the
    playlist editor.  This will create a pop-up window where you can
    enter the name of the new playlist and decide whether it is
@@ -72,10 +70,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <p>Only Roman letters (without any accents) and digits are allowed
    in playlist names.</p>
 
+   <p class=image><img src="playlist-create.png"></p>
+
    <h2><a name=editing>5.3 Editing Playlists</a></h2>
 
-   <!-- TODO rewrite with screenshots - might be worth waiting until
-   picker is a tree -->
+   <p>You can select the playlist to edit from the left side of the
+   window.  Shared playlists are listed first, then the public
+   playlists of each user (plus private playlists that you own).</p>
+
+   <p class=image><img src="playlist-window.png"></p>
 
    <p>When a playlist is selected, you can edit in the right hand half
    of the playlist window.  The editor is very similar in structure
@@ -83,22 +86,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    rearrange tracks within it by drag and drop and you can drag tracks
    from the <b>Choose</b> tab into it.</p>
 
+   <p>Right clicking will create a pop-up menu which you can use to
+   play indivudual tracks or the whole playlist, as well as the
+   usual options as found in the <b>Queue</b> tab.</p>
+
+   <p class=image><img src="playlist-popup-menu.png"></p>
+
    <h2><a name=playing>5.3 Playing Playlists</a></h2>
 
    <p>There are three ways to play a playlist:</p>
 
    <ol>
 
-     <li>Right clicking in the playlist editor will create a pop-up
-     menu.  In addition to the familiar options there is an option to
-     play this playlist.</li>
+     <li>You can use <b>Control > Activate Playlist</b> from the main
+     menu.</li>
+
+     <li>Right clicking in either half of the playlist editor will
+     create a pop-up menu.  There is an option to play this
+     playlist.</li>
 
      <li>You can select all the tracks and drag them to the desired
      point in the <b>Queue</b> tab.</li>
 
-     <li>You can use <b>Control > Activate Playlist</b> from the main
-     menu.</li>
-
    </ol>
 
    <hr>