[Yulup-commits] rev 21765 - in public/yulup: src/trunk/yulup/doc/user-manual src/trunk/yulup/doc/user-manual/figures website/documentation/user-manual website/documentation/user-manual/figures

[andi at wyona.com]

Author: andi
Date: 2007-01-15 21:41:40 +0100 (Mon, 15 Jan 2007)
New Revision: 21765

Added:
   public/yulup/src/trunk/yulup/doc/user-manual/figures/find_dialog.png
   public/yulup/src/trunk/yulup/doc/user-manual/figures/findreplace_dialog.png
   public/yulup/website/documentation/user-manual/figures/find_dialog.png
   public/yulup/website/documentation/user-manual/figures/findreplace_dialog.png
Modified:
   public/yulup/src/trunk/yulup/doc/user-manual/figures/edit_toolbar.png
   public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xhtml
   public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xml
   public/yulup/website/documentation/user-manual/figures/edit_toolbar.png
   public/yulup/website/documentation/user-manual/user_manual.xhtml
Log:
Updated the user manual.


Modified: public/yulup/src/trunk/yulup/doc/user-manual/figures/edit_toolbar.png
===================================================================
(Binary files differ)

Added: public/yulup/src/trunk/yulup/doc/user-manual/figures/find_dialog.png
===================================================================
(Binary files differ)


Property changes on: public/yulup/src/trunk/yulup/doc/user-manual/figures/find_dialog.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: public/yulup/src/trunk/yulup/doc/user-manual/figures/findreplace_dialog.png
===================================================================
(Binary files differ)


Property changes on: public/yulup/src/trunk/yulup/doc/user-manual/figures/findreplace_dialog.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xhtml
===================================================================
--- public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xhtml	2007-01-15 20:24:40 UTC (rev 21764)
+++ public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xhtml	2007-01-15 20:41:40 UTC (rev 21765)
@@ -12,7 +12,7 @@
       <div class="titlepage">
         <div>
           <div>
-            <h1 class="title"><a id="id52600"/>Yulup User Manual</h1>
+            <h1 class="title"><a id="id52610"/>Yulup User Manual</h1>
           </div>
           <div>
             <div class="authorgroup">
@@ -37,36 +37,9 @@
             </div>
           </div>
           <div>
-            <p class="pubdate">2006-12-13</p>
+            <p class="pubdate">2007-01-15</p>
           </div>
           <div>
-            <div class="revhistory">
-              <table border="1" width="100%" summary="Revision history">
-                <tr>
-                  <th align="left" valign="top" colspan="3">
-                    <b>Revision History</b>
-                  </th>
-                </tr>
-                <tr>
-                  <td align="left">Revision 0.1.1</td>
-                  <td align="left">2006-12-13</td>
-                  <td align="left">AW</td>
-                </tr>
-                <tr>
-                  <td align="left" colspan="3">Updated and more content added.</td>
-                </tr>
-                <tr>
-                  <td align="left">Revision 0.1.0</td>
-                  <td align="left">2006-08-08</td>
-                  <td align="left">AW</td>
-                </tr>
-                <tr>
-                  <td align="left" colspan="3">First initial draft.</td>
-                </tr>
-              </table>
-            </div>
-          </div>
-          <div>
             <div class="abstract">
               <p class="title">
                 <b>Abstract</b>
@@ -84,22 +57,22 @@
         <dl>
           <dt>
             <span class="section">
-              <a href="#id52739">1. Introduction</a>
+              <a href="#id52705">1. Introduction</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52876">2. Notational Conventions</a>
+              <a href="#id52840">2. Notational Conventions</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52921">3. System Requirements</a>
+              <a href="#id52885">3. System Requirements</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52941">4. Installation</a>
+              <a href="#id52905">4. Installation</a>
             </span>
           </dt>
           <dd>
@@ -118,71 +91,71 @@
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53129">5. Concepts</a>
+              <a href="#id53093">5. Concepts</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53135">5.1. Webbrowser View and Editor View</a>
+                  <a href="#id53098">5.1. Webbrowser View and Editor View</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53229">5.2. Webpages, Documents and Document Fragments</a>
+                  <a href="#id53196">5.2. Webpages, Documents and Document Fragments</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53290">6. Opening and Creating new Documents</a>
+              <a href="#id53252">6. Opening and Creating new Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53302">6.1. Opening Documents</a>
+                  <a href="#id53260">6.1. Opening Documents</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id53308">6.1.1. From the Webbrowser View</a>
+                      <a href="#id53266">6.1.1. From the Webbrowser View</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id53314">6.1.1.1. Open Document from CMS</a>
+                          <a href="#id53272">6.1.1.1. Open Document from CMS</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id53435">6.1.1.2. Open Document As-Is</a>
+                          <a href="#id53393">6.1.1.2. Open Document As-Is</a>
                         </span>
                       </dt>
                     </dl>
                   </dd>
                   <dt>
                     <span class="section">
-                      <a href="#id53482">6.1.2. Inside the Editor</a>
+                      <a href="#id53440">6.1.2. Inside the Editor</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id53488">6.1.2.1. Open Document from CMS</a>
+                          <a href="#id53446">6.1.2.1. Open Document from CMS</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id53495">6.1.2.2. Open Document from Local Filesystem</a>
+                          <a href="#id53453">6.1.2.2. Open Document from Local Filesystem</a>
                         </span>
                       </dt>
                     </dl>
@@ -191,19 +164,19 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id53504">6.2. Creating Documents</a>
+                  <a href="#id53462">6.2. Creating Documents</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id53510">6.2.1. From the Webbrowser View</a>
+                      <a href="#id53468">6.2.1. From the Webbrowser View</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id53517">6.2.2. Inside the Editor</a>
+                      <a href="#id53475">6.2.2. Inside the Editor</a>
                     </span>
                   </dt>
                 </dl>
@@ -212,52 +185,52 @@
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53526">7. Saving Documents</a>
+              <a href="#id53484">7. Saving Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53537">7.1. Save Document</a>
+                  <a href="#id53495">7.1. Save Document</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53657">7.2. Save Document As...</a>
+                  <a href="#id53616">7.2. Save Document As...</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53730">8. Uploading Documents/Assets</a>
+              <a href="#id53689">8. Uploading Documents/Assets</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53793">8.1. From the Webbrowser View</a>
+                  <a href="#id53751">8.1. From the Webbrowser View</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53800">8.2. Inside the Editor</a>
+                  <a href="#id53758">8.2. Inside the Editor</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53808">9. Editing Documents</a>
+              <a href="#id53766">9. Editing Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53873">9.1. Source Mode</a>
+                  <a href="#id53831">9.1. Source Mode</a>
                 </span>
               </dt>
               <dd>
@@ -271,26 +244,26 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54047">9.2. WYSIWYG Mode</a>
+                  <a href="#id54005">9.2. WYSIWYG Mode</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54053">9.2.1. XHTML Mode</a>
+                      <a href="#id54011">9.2.1. XHTML Mode</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54059">9.2.2. XML Mode</a>
+                      <a href="#id54018">9.2.2. XML Mode</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id54065">9.2.2.1. XPath Toolbar</a>
+                          <a href="#id54023">9.2.2.1. XPath Toolbar</a>
                         </span>
                       </dt>
                     </dl>
@@ -299,7 +272,7 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54124">9.3. Key Bindings</a>
+                  <a href="#id54082">9.3. Key Bindings</a>
                 </span>
               </dt>
               <dd>
@@ -311,104 +284,128 @@
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54197">9.3.2. Readline (Emacs) Key Bindings</a>
+                      <a href="#id54156">9.3.2. Readline (Emacs) Key Bindings</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
+              <dt>
+                <span class="section">
+                  <a href="#id54392">9.4. Find &amp; Replace</a>
+                </span>
+              </dt>
+              <dd>
+                <dl>
+                  <dt>
+                    <span class="section">
+                      <a href="#id54398">9.4.1. Find</a>
+                    </span>
+                  </dt>
+                  <dt>
+                    <span class="section">
+                      <a href="#id54545">9.4.2. Find &amp; Replace</a>
+                    </span>
+                  </dt>
+                </dl>
+              </dd>
+              <dt>
+                <span class="section">
+                  <a href="#id54736">9.5. Exiting the Editor</a>
+                </span>
+              </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id54435">10. Sidebars</a>
+              <a href="#id54826">10. Sidebars</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id54460">10.1. Atom Sidebar</a>
+                  <a href="#id54854">10.1. Atom Sidebar</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54553">10.1.1. Selecting Workspaces and Collections</a>
+                      <a href="#id54944">10.1.1. Selecting Workspaces and Collections</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54577">10.1.2. Feed Information</a>
+                      <a href="#id54968">10.1.2. Feed Information</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54593">10.1.3. Feed Entries</a>
+                      <a href="#id54984">10.1.3. Feed Entries</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id54633">10.1.3.1. Editing Feed Entries</a>
+                          <a href="#id55024">10.1.3.1. Editing Feed Entries</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id54658">10.1.3.2. Deleting Feed Entries</a>
+                          <a href="#id55049">10.1.3.2. Deleting Feed Entries</a>
                         </span>
                       </dt>
                     </dl>
                   </dd>
                   <dt>
                     <span class="section">
-                      <a href="#id54685">10.1.4. Searching a Feed</a>
+                      <a href="#id55076">10.1.4. Searching a Feed</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54701">10.2. Neutron Sidebar</a>
+                  <a href="#id55092">10.2. Neutron Sidebar</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id54712">11. Preferences</a>
+              <a href="#id55103">11. Preferences</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id54742">11.1. General</a>
+                  <a href="#id55135">11.1. General</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54785">11.1.1. Workspace</a>
+                      <a href="#id55176">11.1.1. Workspace</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54827">11.1.2. Default CMS</a>
+                      <a href="#id55222">11.1.2. Default CMS</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54840">11.1.3. Sidebars</a>
+                      <a href="#id55235">11.1.3. Sidebars</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54868">11.2. Editor</a>
+                  <a href="#id55259">11.2. Editor</a>
                 </span>
               </dt>
               <dd>
@@ -420,12 +417,12 @@
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54977">11.2.2. Layout</a>
+                      <a href="#id55368">11.2.2. Layout</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id55004">11.2.3. Appearance</a>
+                      <a href="#id55395">11.2.3. Appearance</a>
                     </span>
                   </dt>
                 </dl>
@@ -438,7 +435,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52739"/>1. Introduction</h2>
+              <h2 class="title"><a id="id52705"/>1. Introduction</h2>
             </div>
           </div>
         </div>
@@ -488,7 +485,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52876"/>2. Notational Conventions</h2>
+              <h2 class="title"><a id="id52840"/>2. Notational Conventions</h2>
             </div>
           </div>
         </div>
@@ -513,7 +510,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52921"/>3. System Requirements</h2>
+              <h2 class="title"><a id="id52885"/>3. System Requirements</h2>
             </div>
           </div>
         </div>
@@ -525,7 +522,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52941"/>4. Installation</h2>
+              <h2 class="title"><a id="id52905"/>4. Installation</h2>
             </div>
           </div>
         </div>
@@ -618,7 +615,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53129"/>5. Concepts</h2>
+              <h2 class="title"><a id="id53093"/>5. Concepts</h2>
             </div>
           </div>
         </div>
@@ -626,7 +623,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53135"/>5.1. Webbrowser View and Editor View</h3>
+                <h3 class="title"><a id="id53098"/>5.1. Webbrowser View and Editor View</h3>
               </div>
             </div>
           </div>
@@ -634,7 +631,7 @@
         The <span class="emphasis"><em>Webbrowser View</em></span> is your normal web browser.
         </p>
           <div class="figure">
-            <a id="id53147"/>
+            <a id="id53111"/>
             <p class="title">
               <b>Figure 1. Webbrowser View</b>
             </p>
@@ -652,7 +649,7 @@
         If you choose to edit an existing document or to create a new document, you are then transferred to the <span class="emphasis"><em>Editor View</em></span>.
         </p>
           <div class="figure">
-            <a id="id53199"/>
+            <a id="id53165"/>
             <p class="title">
               <b>Figure 2. Editor View</b>
             </p>
@@ -667,7 +664,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53229"/>5.2. Webpages, Documents and Document Fragments</h3>
+                <h3 class="title"><a id="id53196"/>5.2. Webpages, Documents and Document Fragments</h3>
               </div>
             </div>
           </div>
@@ -689,7 +686,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53290"/>6. Opening and Creating new Documents</h2>
+              <h2 class="title"><a id="id53252"/>6. Opening and Creating new Documents</h2>
             </div>
           </div>
         </div>
@@ -700,7 +697,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53302"/>6.1. Opening Documents</h3>
+                <h3 class="title"><a id="id53260"/>6.1. Opening Documents</h3>
               </div>
             </div>
           </div>
@@ -708,7 +705,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53308"/>6.1.1. From the Webbrowser View</h4>
+                  <h4 class="title"><a id="id53266"/>6.1.1. From the Webbrowser View</h4>
                 </div>
               </div>
             </div>
@@ -716,7 +713,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53314"/>6.1.1.1. Open Document from CMS</h5>
+                    <h5 class="title"><a id="id53272"/>6.1.1.1. Open Document from CMS</h5>
                   </div>
                 </div>
               </div>
@@ -732,7 +729,7 @@
                   If the server offers you the option of opening the document without locking, then a menu item labelled <span class="guimenuitem">Open and Edit</span> is enabled in the Yulup Browser Menu.
                   </p>
                     <div class="figure">
-                      <a id="id53343"/>
+                      <a id="id53301"/>
                       <p class="title">
                         <b>Figure 3. <span class="emphasis"><em>Open and Edit</em></span> from the Yulup Menu</b>
                       </p>
@@ -746,7 +743,7 @@
                   If the server offers you the option of opening the document with locking, then a menu item labelled <span class="guimenuitem">Checkout and Edit</span> is enabled in the Yulup Browser Menu. By checking out a document from the CMS like this, you are acquiring a lock on this document. This means that only you can currently edit this document, and no one else can edit this document in the meantime.
                   </p>
                     <div class="figure">
-                      <a id="id53342"/>
+                      <a id="id53325"/>
                       <p class="title">
                         <b>Figure 4. <span class="emphasis"><em>Checkout and Edit</em></span> from the Yulup Menu</b>
                       </p>
@@ -767,7 +764,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53435"/>6.1.1.2. Open Document As-Is</h5>
+                    <h5 class="title"><a id="id53393"/>6.1.1.2. Open Document As-Is</h5>
                   </div>
                 </div>
               </div>
@@ -775,7 +772,7 @@
             You can also open a document as-is, using the <span class="guimenuitem">Edit Locally</span> menu item. This simply reloads the document you are currently viewing into the editor. This enables you to edit arbitrary web pages. Of course, you cannot store such a document back to the web server, but you can still save it to your local filesystem.
             </p>
               <div class="figure">
-                <a id="id53452"/>
+                <a id="id53410"/>
                 <p class="title">
                   <b>Figure 5. <span class="emphasis"><em>Edit Locally</em></span></b>
                 </p>
@@ -791,7 +788,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53482"/>6.1.2. Inside the Editor</h4>
+                  <h4 class="title"><a id="id53440"/>6.1.2. Inside the Editor</h4>
                 </div>
               </div>
             </div>
@@ -799,7 +796,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53488"/>6.1.2.1. Open Document from CMS</h5>
+                    <h5 class="title"><a id="id53446"/>6.1.2.1. Open Document from CMS</h5>
                   </div>
                 </div>
               </div>
@@ -808,7 +805,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53495"/>6.1.2.2. Open Document from Local Filesystem</h5>
+                    <h5 class="title"><a id="id53453"/>6.1.2.2. Open Document from Local Filesystem</h5>
                   </div>
                 </div>
               </div>
@@ -819,7 +816,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53504"/>6.2. Creating Documents</h3>
+                <h3 class="title"><a id="id53462"/>6.2. Creating Documents</h3>
               </div>
             </div>
           </div>
@@ -827,7 +824,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53510"/>6.2.1. From the Webbrowser View</h4>
+                  <h4 class="title"><a id="id53468"/>6.2.1. From the Webbrowser View</h4>
                 </div>
               </div>
             </div>
@@ -836,7 +833,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53517"/>6.2.2. Inside the Editor</h4>
+                  <h4 class="title"><a id="id53475"/>6.2.2. Inside the Editor</h4>
                 </div>
               </div>
             </div>
@@ -847,7 +844,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53526"/>7. Saving Documents</h2>
+              <h2 class="title"><a id="id53484"/>7. Saving Documents</h2>
             </div>
           </div>
         </div>
@@ -858,7 +855,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53537"/>7.1. Save Document</h3>
+                <h3 class="title"><a id="id53495"/>7.1. Save Document</h3>
               </div>
             </div>
           </div>
@@ -907,7 +904,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53657"/>7.2. Save Document As...</h3>
+                <h3 class="title"><a id="id53616"/>7.2. Save Document As...</h3>
               </div>
             </div>
           </div>
@@ -931,7 +928,7 @@
               Saves the document to the CMS. You are asked to supply a path to the place where you want the document to be stored.
               </p>
                 <div class="figure">
-                  <a id="id53694"/>
+                  <a id="id53653"/>
                   <p class="title">
                     <b>Figure 6. <span class="emphasis"><em>Save to CMS as...</em></span> inside the Editor</b>
                   </p>
@@ -950,14 +947,14 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53730"/>8. Uploading Documents/Assets</h2>
+              <h2 class="title"><a id="id53689"/>8. Uploading Documents/Assets</h2>
             </div>
           </div>
         </div>
         <p>
       </p>
         <div class="figure">
-          <a id="id53738"/>
+          <a id="id53697"/>
           <p class="title">
             <b>Figure 7. Specify the CMS URI</b>
           </p>
@@ -968,7 +965,7 @@
         <p>
       </p>
         <div class="figure">
-          <a id="id53765"/>
+          <a id="id53723"/>
           <p class="title">
             <b>Figure 8. Upload a Document or Asset</b>
           </p>
@@ -982,7 +979,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53793"/>8.1. From the Webbrowser View</h3>
+                <h3 class="title"><a id="id53751"/>8.1. From the Webbrowser View</h3>
               </div>
             </div>
           </div>
@@ -991,7 +988,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53800"/>8.2. Inside the Editor</h3>
+                <h3 class="title"><a id="id53758"/>8.2. Inside the Editor</h3>
               </div>
             </div>
           </div>
@@ -1001,7 +998,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53808"/>9. Editing Documents</h2>
+              <h2 class="title"><a id="id53766"/>9. Editing Documents</h2>
             </div>
           </div>
         </div>
@@ -1012,7 +1009,7 @@
       Despite these two different modes, they share a common toolbar.
       </p>
         <div class="figure">
-          <a id="id53841"/>
+          <a id="id53800"/>
           <p class="title">
             <b>Figure 9. Editor Toolbar</b>
           </p>
@@ -1027,7 +1024,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53873"/>9.1. Source Mode</h3>
+                <h3 class="title"><a id="id53831"/>9.1. Source Mode</h3>
               </div>
             </div>
           </div>
@@ -1049,7 +1046,7 @@
           The guided tag inserter first asks for the tag name.
           </p>
             <div class="figure">
-              <a id="id53908"/>
+              <a id="id53867"/>
               <p class="title">
                 <b>Figure 10. Guided Tag Inserter (Element Name)</b>
               </p>
@@ -1061,7 +1058,7 @@
           If you hit return without entering any text into the tag name field, the guided tag inserter aborts without inserting any text into the editor. Otherwise, if you have indeed entered a tag name, it goes into a loop and asks for attribute names and their values.
           </p>
             <div class="figure">
-              <a id="id53941"/>
+              <a id="id53899"/>
               <p class="title">
                 <b>Figure 11. Guided Tag Inserter (Attribute Name)</b>
               </p>
@@ -1072,7 +1069,7 @@
             <p>
           </p>
             <div class="figure">
-              <a id="id53968"/>
+              <a id="id53927"/>
               <p class="title">
                 <b>Figure 12. Guided Tag Inserter (Attribute Value)</b>
               </p>
@@ -1084,7 +1081,7 @@
           If you hit return without entering any text into the attribute name field, the guided tag inserter proceeds to ask you if you want to create an empty (e.g. <span class="markup">&lt;section/&gt;</span>) or a non-empty tag (e.g. <span class="markup">&lt;section&gt;&lt;/section&gt;</span>).
           </p>
             <div class="figure">
-              <a id="id54008"/>
+              <a id="id53967"/>
               <p class="title">
                 <b>Figure 13. Guided Tag Inserter (Tag Mode)</b>
               </p>
@@ -1104,7 +1101,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54047"/>9.2. WYSIWYG Mode</h3>
+                <h3 class="title"><a id="id54005"/>9.2. WYSIWYG Mode</h3>
               </div>
             </div>
           </div>
@@ -1112,7 +1109,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54053"/>9.2.1. XHTML Mode</h4>
+                  <h4 class="title"><a id="id54011"/>9.2.1. XHTML Mode</h4>
                 </div>
               </div>
             </div>
@@ -1121,7 +1118,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54059"/>9.2.2. XML Mode</h4>
+                  <h4 class="title"><a id="id54018"/>9.2.2. XML Mode</h4>
                 </div>
               </div>
             </div>
@@ -1129,7 +1126,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54065"/>9.2.2.1. XPath Toolbar</h5>
+                    <h5 class="title"><a id="id54023"/>9.2.2.1. XPath Toolbar</h5>
                   </div>
                 </div>
               </div>
@@ -1137,7 +1134,7 @@
             The XPath toolbar shows you the path from the document root to the current selection. This means that whatever you insert at the current position is going to end up at the shown path in the XML source document.
             </p>
               <div class="figure">
-                <a id="id54077"/>
+                <a id="id54035"/>
                 <p class="title">
                   <b>Figure 14. XPath Toolbar</b>
                 </p>
@@ -1155,7 +1152,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54124"/>9.3. Key Bindings</h3>
+                <h3 class="title"><a id="id54082"/>9.3. Key Bindings</h3>
               </div>
             </div>
           </div>
@@ -1175,7 +1172,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54172"/>Inserting</h5>
+            <h5><a id="id54130"/>Inserting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1194,14 +1191,14 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54197"/>9.3.2. Readline (Emacs) Key Bindings</h4>
+                  <h4 class="title"><a id="id54156"/>9.3.2. Readline (Emacs) Key Bindings</h4>
                 </div>
               </div>
             </div>
             <p>
             The following key bindings are activated by default.
             </p>
-            <h5><a id="id54206"/>Moving and Selecting</h5>
+            <h5><a id="id54165"/>Moving and Selecting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1270,7 +1267,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54342"/>Deleting</h5>
+            <h5><a id="id54300"/>Deleting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1309,7 +1306,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54413"/>Undo/Redo</h5>
+            <h5><a id="id54372"/>Undo/Redo</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1325,12 +1322,197 @@
           </p>
           </div>
         </div>
+        <div class="section" lang="en">
+          <div class="titlepage">
+            <div>
+              <div>
+                <h3 class="title"><a id="id54392"/>9.4. Find &amp; Replace</h3>
+              </div>
+            </div>
+          </div>
+          <div class="section" lang="en">
+            <div class="titlepage">
+              <div>
+                <div>
+                  <h4 class="title"><a id="id54398"/>9.4.1. Find</h4>
+                </div>
+              </div>
+            </div>
+            <p>
+          The <span class="emphasis"><em>Find</em></span> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">F</strong></span>.
+          </p>
+            <div class="figure">
+              <a id="id54423"/>
+              <p class="title">
+                <b>Figure 15. Find Dialog</b>
+              </p>
+              <div class="mediaobject">
+                <img src="figures/find_dialog.png" alt="Find dialog"/>
+              </div>
+            </div>
+            <p>
+          </p>
+            <div class="itemizedlist">
+              <ul>
+                <li>
+                  <p><b>Search for. </b>
+                Enter the phrase you want to search for.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match case. </b>
+                Select if you want the search to be case-sensitive.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match entire word only. </b>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </p>
+                </li>
+                <li>
+                  <p><b>Search backwards. </b>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </p>
+                </li>
+                <li>
+                  <p><b>Wrap around. </b>
+                Select if the search should wrap around the end (or the beginning, if <span class="emphasis"><em>Search backwards</em></span> is selected) of the document.
+              </p>
+                </li>
+                <li>
+                  <p><b>Find. </b>
+                Perform the search. If the search term was not found, <span class="emphasis"><em>Phrase not found</em></span> is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Cancel. </b>
+                Close the dialog.
+              </p>
+                </li>
+              </ul>
+            </div>
+            <p>
+        </p>
+          </div>
+          <div class="section" lang="en">
+            <div class="titlepage">
+              <div>
+                <div>
+                  <h4 class="title"><a id="id54545"/>9.4.2. Find &amp; Replace</h4>
+                </div>
+              </div>
+            </div>
+            <p>
+          The <span class="emphasis"><em>Find &amp; Replace</em></span> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">R</strong></span>.
+          </p>
+            <div class="figure">
+              <a id="id54570"/>
+              <p class="title">
+                <b>Figure 16. Find &amp; Replace Dialog</b>
+              </p>
+              <div class="mediaobject">
+                <img src="figures/findreplace_dialog.png" alt="Find &amp; replace dialog"/>
+              </div>
+            </div>
+            <p>
+          </p>
+            <div class="itemizedlist">
+              <ul>
+                <li>
+                  <p><b>Search for. </b>
+                Enter the phrase you want to search for.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace with. </b>
+                Enter the phrase with which you want to replace the search term. If left empty, occurrences of the search term are removed.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match case. </b>
+                Select if you want the search to be case-sensitive.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match entire word only. </b>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </p>
+                </li>
+                <li>
+                  <p><b>Search backwards. </b>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </p>
+                </li>
+                <li>
+                  <p><b>Wrap around. </b>
+                Select if the search should wrap around the end (or the beginning, if <span class="emphasis"><em>Search backwards</em></span> is selected) of the document.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace All. </b>
+                Replace all occurrences of the search term in the document. At the end of the process, the number of replaced occurrences is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace and Find. </b>
+                Replace the currently selected text in the document (if the selection matches the search term), and find the next occurrence. If the currently selected text in the document does not match the currently entered search term, then this function is disabled.
+              </p>
+                </li>
+                <li>
+                  <p><b>Find. </b>
+                Perform the search. If the search term was not found, <span class="emphasis"><em>Phrase not found</em></span> is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Cancel. </b>
+                Close the dialog.
+              </p>
+                </li>
+              </ul>
+            </div>
+            <p>
+        </p>
+          </div>
+        </div>
+        <div class="section" lang="en">
+          <div class="titlepage">
+            <div>
+              <div>
+                <h3 class="title"><a id="id54736"/>9.5. Exiting the Editor</h3>
+              </div>
+            </div>
+          </div>
+          <p>
+        There are multiple ways to close the editor.
+        </p>
+          <div class="itemizedlist">
+            <ul>
+              <li>
+                <p><b>Exit Button (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">E</strong></span>). </b>
+              When leaving the editor via the <span class="emphasis"><em>Exit</em></span> button on the editor toolbar, you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </p>
+              </li>
+              <li>
+                <p><b>Check back in to CMS and exit (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">C</strong></span>). </b>
+              After the document is checked back in to the CMS, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </p>
+              </li>
+              <li>
+                <p><b>Tab close (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">W</strong></span>). </b>
+              When closing the editor tab (via the tab close button, the menu, the context menu, or the key combination), you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is closed.
+            </p>
+              </li>
+            </ul>
+          </div>
+          <p>
+      </p>
+        </div>
       </div>
       <div class="section" lang="en">
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id54435"/>10. Sidebars</h2>
+              <h2 class="title"><a id="id54826"/>10. Sidebars</h2>
             </div>
           </div>
         </div>
@@ -1344,7 +1526,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54460"/>10.1. Atom Sidebar</h3>
+                <h3 class="title"><a id="id54854"/>10.1. Atom Sidebar</h3>
               </div>
             </div>
           </div>
@@ -1358,9 +1540,9 @@
         Note that the Atom sidebar cannot be opened if the currently shown document does not contain a link to an APP Service Document.
         </p>
           <div class="figure">
-            <a id="id54524"/>
+            <a id="id54915"/>
             <p class="title">
-              <b>Figure 15. Atom Sidebar</b>
+              <b>Figure 17. Atom Sidebar</b>
             </p>
             <div class="mediaobject">
               <img src="figures/atom_sidebar.png" alt="Atom sidebar showing a news feed and the context menu for one of the feed items"/>
@@ -1372,7 +1554,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54553"/>10.1.1. Selecting Workspaces and Collections</h4>
+                  <h4 class="title"><a id="id54944"/>10.1.1. Selecting Workspaces and Collections</h4>
                 </div>
               </div>
             </div>
@@ -1387,7 +1569,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54577"/>10.1.2. Feed Information</h4>
+                  <h4 class="title"><a id="id54968"/>10.1.2. Feed Information</h4>
                 </div>
               </div>
             </div>
@@ -1399,7 +1581,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54593"/>10.1.3. Feed Entries</h4>
+                  <h4 class="title"><a id="id54984"/>10.1.3. Feed Entries</h4>
                 </div>
               </div>
             </div>
@@ -1419,7 +1601,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54633"/>10.1.3.1. Editing Feed Entries</h5>
+                    <h5 class="title"><a id="id55024"/>10.1.3.1. Editing Feed Entries</h5>
                   </div>
                 </div>
               </div>
@@ -1434,7 +1616,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54658"/>10.1.3.2. Deleting Feed Entries</h5>
+                    <h5 class="title"><a id="id55049"/>10.1.3.2. Deleting Feed Entries</h5>
                   </div>
                 </div>
               </div>
@@ -1450,7 +1632,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54685"/>10.1.4. Searching a Feed</h4>
+                  <h4 class="title"><a id="id55076"/>10.1.4. Searching a Feed</h4>
                 </div>
               </div>
             </div>
@@ -1463,7 +1645,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54701"/>10.2. Neutron Sidebar</h3>
+                <h3 class="title"><a id="id55092"/>10.2. Neutron Sidebar</h3>
               </div>
             </div>
           </div>
@@ -1476,7 +1658,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id54712"/>11. Preferences</h2>
+              <h2 class="title"><a id="id55103"/>11. Preferences</h2>
             </div>
           </div>
         </div>
@@ -1490,7 +1672,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54742"/>11.1. General</h3>
+                <h3 class="title"><a id="id55135"/>11.1. General</h3>
               </div>
             </div>
           </div>
@@ -1498,9 +1680,9 @@
         In the <span class="emphasis"><em>General</em></span> section, you can edit settings related to the overall usage of Yulup.
       </p>
           <div class="figure">
-            <a id="id54757"/>
+            <a id="id55148"/>
             <p class="title">
-              <b>Figure 16. Preferences <span class="emphasis"><em>General</em></span></b>
+              <b>Figure 18. Preferences <span class="emphasis"><em>General</em></span></b>
             </p>
             <div class="mediaobject">
               <img src="figures/preferences_general.png" alt="General settings"/>
@@ -1510,7 +1692,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54785"/>11.1.1. Workspace</h4>
+                  <h4 class="title"><a id="id55176"/>11.1.1. Workspace</h4>
                 </div>
               </div>
             </div>
@@ -1537,7 +1719,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54827"/>11.1.2. Default CMS</h4>
+                  <h4 class="title"><a id="id55222"/>11.1.2. Default CMS</h4>
                 </div>
               </div>
             </div>
@@ -1549,7 +1731,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54840"/>11.1.3. Sidebars</h4>
+                  <h4 class="title"><a id="id55235"/>11.1.3. Sidebars</h4>
                 </div>
               </div>
             </div>
@@ -1572,7 +1754,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54868"/>11.2. Editor</h3>
+                <h3 class="title"><a id="id55259"/>11.2. Editor</h3>
               </div>
             </div>
           </div>
@@ -1580,9 +1762,9 @@
         In the <span class="emphasis"><em>Editor</em></span> section, you can edit settings related to the Yulup editor.
       </p>
           <div class="figure">
-            <a id="id54882"/>
+            <a id="id55253"/>
             <p class="title">
-              <b>Figure 17. Preferences <span class="emphasis"><em>Editor</em></span></b>
+              <b>Figure 19. Preferences <span class="emphasis"><em>Editor</em></span></b>
             </p>
             <div class="mediaobject">
               <img src="figures/preferences_editor.png" alt="Editor settings"/>
@@ -1624,7 +1806,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54977"/>11.2.2. Layout</h4>
+                  <h4 class="title"><a id="id55368"/>11.2.2. Layout</h4>
                 </div>
               </div>
             </div>
@@ -1646,7 +1828,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id55004"/>11.2.3. Appearance</h4>
+                  <h4 class="title"><a id="id55395"/>11.2.3. Appearance</h4>
                 </div>
               </div>
             </div>

Modified: public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xml
===================================================================
--- public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xml	2007-01-15 20:24:40 UTC (rev 21764)
+++ public/yulup/src/trunk/yulup/doc/user-manual/user_manual.xml	2007-01-15 20:41:40 UTC (rev 21765)
@@ -34,10 +34,17 @@
       </author>
     </authorgroup>
     <!-- All dates specified in ISO "YYYY-MM-DD" format -->
-    <pubdate>2006-12-13</pubdate>
+    <pubdate>2007-01-15</pubdate>
     <!-- Most recent revision goes at the top; list in descending order -->
+    <!--
     <revhistory>
       <revision>
+        <revnumber>0.1.2</revnumber>
+        <date>2007-01-15</date>
+        <authorinitials>AW</authorinitials>
+        <revremark>Updated to reflect Yulup 0.2.0.</revremark>
+      </revision>
+      <revision>
         <revnumber>0.1.1</revnumber>
         <date>2006-12-13</date>
         <authorinitials>AW</authorinitials>
@@ -50,6 +57,7 @@
         <revremark>First initial draft.</revremark>
       </revision>
     </revhistory>
+    -->
     <abstract>
       <para>The user manual for <emphasis>&project;</emphasis>.</para>
     </abstract>
@@ -209,7 +217,7 @@
             </textobject>
           </mediaobject>
         </figure>
-        The only difference you experience is the Yulup menu icon placed in the upper right corner of the window. This is the main entry point to Yulup, and allows you to open documents, edit, create, upload and delete documents, and access the preferences dialog.
+        The only difference you experience is the &project; menu icon placed in the upper right corner of the window. This is the main entry point to &project;, and allows you to open documents, edit, create, upload and delete documents, and access the preferences dialog.
       </para>
       <para>
         Normally, most of these items are disabled though. But if you visit a web page which allows introspection e.g. via Neutron or the Atom Publishing Protocol, these items are enabled, and allow you to directly interact with the CMS/web server which contains the current document.
@@ -267,13 +275,13 @@
                   <title>Open and Edit</title>
                   If the server offers you the option of opening the document without locking, then a menu item labelled <guimenuitem>Open and Edit</guimenuitem> is enabled in the &project; Browser Menu.
                   <figure>
-                    <title><emphasis>Open and Edit</emphasis> from the Yulup Menu</title>
+                    <title><emphasis>Open and Edit</emphasis> from the &project; Menu</title>
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/open_yulupmenu.png" format="PNG"/>
                       </imageobject>
                       <textobject>
-                        <phrase>Open and Edit from the Yulup Menu</phrase>
+                        <phrase>Open and Edit from the &project; Menu</phrase>
                       </textobject>
                     </mediaobject>
                   </figure>
@@ -284,13 +292,13 @@
                   <title>Checkout and Edit</title>
                   If the server offers you the option of opening the document with locking, then a menu item labelled <guimenuitem>Checkout and Edit</guimenuitem> is enabled in the &project; Browser Menu. By checking out a document from the CMS like this, you are acquiring a lock on this document. This means that only you can currently edit this document, and no one else can edit this document in the meantime.
                   <figure>
-                    <title><emphasis>Checkout and Edit</emphasis> from the Yulup Menu</title>
+                    <title><emphasis>Checkout and Edit</emphasis> from the &project; Menu</title>
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/checkout_yulupmenu.png" format="PNG"/>
                       </imageobject>
                       <textobject>
-                        <phrase>Checkout and Edit from the Yulup Menu</phrase>
+                        <phrase>Checkout and Edit from the &project; Menu</phrase>
                       </textobject>
                     </mediaobject>
                   </figure>
@@ -460,7 +468,7 @@
   <section>
     <title>Editing Documents</title>
     <para>
-      There are two fundamentally different editing modes in Yulup: the <emphasis>Source</emphasis> and <emphasis>WYSIWYG</emphasis> mode. In the <emphasis>Source</emphasis> mode you can edit documents on the source level, i.e. you can directly modify the document markup. In the <emphasis>WYSIWYG</emphasis> mode view, you modify the graphical representation of a document. With other words: whatever you do, the document looks exactly like it is served by your web server and later rendered by the browser.
+      There are two fundamentally different editing modes in &project;: the <emphasis>Source</emphasis> and <emphasis>WYSIWYG</emphasis> mode. In the <emphasis>Source</emphasis> mode you can edit documents on the source level, i.e. you can directly modify the document markup. In the <emphasis>WYSIWYG</emphasis> mode view, you modify the graphical representation of a document. With other words: whatever you do, the document looks exactly like it is served by your web server and later rendered by the browser.
     </para>
     <para>
       Despite these two different modes, they share a common toolbar.
@@ -724,12 +732,183 @@
           </para>
         </section>
     </section>
+
+    <section>
+      <title>Find &amp; Replace</title>
+      <section>
+        <title>Find</title>
+        <para>
+          The <emphasis>Find</emphasis> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>F</keycap></keycombo>.
+          <figure>
+            <title>Find Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/find_dialog.png" format="PNG"/>
+              </imageobject>
+              <textobject>
+                <phrase>Find dialog</phrase>
+              </textobject>
+            </mediaobject>
+          </figure>
+          <itemizedlist>
+            <listitem>
+              <formalpara>
+                <title>Search for</title>
+                Enter the phrase you want to search for.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Match case</title>
+                Select if you want the search to be case-sensitive.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Match entire word only</title>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Search backwards</title>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Wrap around</title>
+                Select if the search should wrap around the end (or the beginning, if <emphasis>Search backwards</emphasis> is selected) of the document.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Find</title>
+                Perform the search. If the search term was not found, <emphasis>Phrase not found</emphasis> is displayed at the bottom of the dialog.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Cancel</title>
+                Close the dialog.
+              </formalpara>
+            </listitem>
+          </itemizedlist>
+        </para>
+      </section>
+      <section>
+        <title>Find &amp; Replace</title>
+        <para>
+          The <emphasis>Find &amp; Replace</emphasis> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>R</keycap></keycombo>.
+          <figure>
+            <title>Find &amp; Replace Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/findreplace_dialog.png" format="PNG"/>
+              </imageobject>
+              <textobject>
+                <phrase>Find &amp; replace dialog</phrase>
+              </textobject>
+            </mediaobject>
+          </figure>
+          <itemizedlist>
+            <listitem>
+              <formalpara>
+                <title>Search for</title>
+                Enter the phrase you want to search for.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Replace with</title>
+                Enter the phrase with which you want to replace the search term. If left empty, occurrences of the search term are removed.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Match case</title>
+                Select if you want the search to be case-sensitive.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Match entire word only</title>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Search backwards</title>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Wrap around</title>
+                Select if the search should wrap around the end (or the beginning, if <emphasis>Search backwards</emphasis> is selected) of the document.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Replace All</title>
+                Replace all occurrences of the search term in the document. At the end of the process, the number of replaced occurrences is displayed at the bottom of the dialog.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Replace and Find</title>
+                Replace the currently selected text in the document (if the selection matches the search term), and find the next occurrence. If the currently selected text in the document does not match the currently entered search term, then this function is disabled.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Find</title>
+                Perform the search. If the search term was not found, <emphasis>Phrase not found</emphasis> is displayed at the bottom of the dialog.
+              </formalpara>
+            </listitem>
+            <listitem>
+              <formalpara>
+                <title>Cancel</title>
+                Close the dialog.
+              </formalpara>
+            </listitem>
+          </itemizedlist>
+        </para>
+      </section>
+    </section>
+
+    <section>
+      <title>Exiting the Editor</title>
+      <para>
+        There are multiple ways to close the editor.
+        <itemizedlist>
+          <listitem>
+            <formalpara>
+              <title>Exit Button (<keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>E</keycap></keycombo>)</title>
+              When leaving the editor via the <emphasis>Exit</emphasis> button on the editor toolbar, you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </formalpara>
+          </listitem>
+          <listitem>
+            <formalpara>
+              <title>Check back in to CMS and exit (<keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>C</keycap></keycombo>)</title>
+              After the document is checked back in to the CMS, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </formalpara>
+          </listitem>
+          <listitem>
+            <formalpara>
+              <title>Tab close (<keycombo action="simul"><keycap>Accel</keycap><keycap>W</keycap></keycombo>)</title>
+              When closing the editor tab (via the tab close button, the menu, the context menu, or the key combination), you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is closed.
+            </formalpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </section>
   </section>
 
   <section>
     <title>Sidebars</title>
     <para>
-      Sidebars are UI elements which are usually opened on the left hand side of the web browser. There are several standard sidebars delivered with Firefox, and Yulup adds two new ones, an Atom sidebar and a Neutron sidebar.
+      Sidebars are UI elements which are usually opened on the left hand side of the web browser. There are several standard sidebars delivered with Firefox, and &project; adds two new ones, an Atom sidebar and a Neutron sidebar.
     </para>
     <para>
       Sidebars can generally be accessed either via the <guimenu>View</guimenu> &gt;&gt; <guisubmenu>Sidebar</guisubmenu> menu, or via a keyboard shortcut specific to each sidebar.
@@ -737,7 +916,7 @@
     <section>
       <title>Atom Sidebar</title>
       <para>
-        The Atom sidebar can be accessed either via the <guimenu>View</guimenu> &gt;&gt; <guisubmenu>Sidebar</guisubmenu> &gt;&gt; <guimenuitem>Atom Sidebar</guimenuitem> menu item, via the <guimenuitem>Atom Sidebar</guimenuitem> menu item in the Yulup menu, or via the <keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>A</keycap></keycombo> keyboard shortcut.
+        The Atom sidebar can be accessed either via the <guimenu>View</guimenu> &gt;&gt; <guisubmenu>Sidebar</guisubmenu> &gt;&gt; <guimenuitem>Atom Sidebar</guimenuitem> menu item, via the <guimenuitem>Atom Sidebar</guimenuitem> menu item in the &project; menu, or via the <keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>A</keycap></keycombo> keyboard shortcut.
       </para>
       <para>
         Once the Atom sidebar is open, you can close it by unchecking it in one of the above mentioned menus, by hitting the <keycombo action="simul"><keycap>Accel</keycap><keycap>Shift</keycap><keycap>A</keycap></keycombo> keyboard shortcut again, or by clicking the <guibutton>close</guibutton> button in the upper right corner of the sidebar.
@@ -822,7 +1001,7 @@
   <section>
     <title>Preferences</title>
     <para>
-      You can open the preferences dialog by either choosing <guimenuitem>Preferences</guimenuitem> in the Yulup menu, or by opening the extension manager, selecting the Yulup entry, and then clicking on the <guibutton>Preferences</guibutton> button.
+      You can open the preferences dialog by either choosing <guimenuitem>Preferences</guimenuitem> in the &project; menu, or by opening the extension manager, selecting the &project; entry, and then clicking on the <guibutton>Preferences</guibutton> button.
     </para>
     <para>
       The preferences dialog is divided into two sections: <emphasis>General</emphasis>, and <emphasis>Editor</emphasis>.
@@ -830,7 +1009,7 @@
     <section>
       <title>General</title>
       <para>
-        In the <emphasis>General</emphasis> section, you can edit settings related to the overall usage of Yulup.
+        In the <emphasis>General</emphasis> section, you can edit settings related to the overall usage of &project;.
       </para>
       <figure>
         <title>Preferences <emphasis>General</emphasis></title>
@@ -850,13 +1029,13 @@
             <listitem>
               <formalpara>
                 <title>Workspace Location</title>
-                Select a directory on your local file system for the Yulup workspace. The workspace is used to store local temporary copies of the document you are editing to enable offline processing.
+                Select a directory on your local file system for the &project; workspace. The workspace is used to store local temporary copies of the document you are editing to enable offline processing.
               </formalpara>
             </listitem>
             <listitem>
               <formalpara>
                 <title>Always Save Local Copy</title>
-                Check this option if you would like Yulup to automatically store a version of the documents you are editing in your local workspace. If this option is not set, you have to tell Yulup explicitely to save a document in your workspace.
+                Check this option if you would like &project; to automatically store a version of the documents you are editing in your local workspace. If this option is not set, you have to tell &project; explicitely to save a document in your workspace.
               </formalpara>
             </listitem>
           </itemizedlist>
@@ -875,7 +1054,7 @@
             <listitem>
               <formalpara>
                 <title>Open Atom Sidebar Automatically</title>
-                Check this option if you would like Yulup to automatically open the Atom sidebar everytime a page containing a link to an APP Service Document is accessed.
+                Check this option if you would like &project; to automatically open the Atom sidebar everytime a page containing a link to an APP Service Document is accessed.
               </formalpara>
             </listitem>
           </itemizedlist>
@@ -885,7 +1064,7 @@
     <section>
       <title>Editor</title>
       <para>
-        In the <emphasis>Editor</emphasis> section, you can edit settings related to the Yulup editor.
+        In the <emphasis>Editor</emphasis> section, you can edit settings related to the &project; editor.
       </para>
       <figure>
         <title>Preferences <emphasis>Editor</emphasis></title>

Modified: public/yulup/website/documentation/user-manual/figures/edit_toolbar.png
===================================================================
(Binary files differ)

Added: public/yulup/website/documentation/user-manual/figures/find_dialog.png
===================================================================
(Binary files differ)


Property changes on: public/yulup/website/documentation/user-manual/figures/find_dialog.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: public/yulup/website/documentation/user-manual/figures/findreplace_dialog.png
===================================================================
(Binary files differ)


Property changes on: public/yulup/website/documentation/user-manual/figures/findreplace_dialog.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: public/yulup/website/documentation/user-manual/user_manual.xhtml
===================================================================
--- public/yulup/website/documentation/user-manual/user_manual.xhtml	2007-01-15 20:24:40 UTC (rev 21764)
+++ public/yulup/website/documentation/user-manual/user_manual.xhtml	2007-01-15 20:41:40 UTC (rev 21765)
@@ -12,7 +12,7 @@
       <div class="titlepage">
         <div>
           <div>
-            <h1 class="title"><a id="id52600"/>Yulup User Manual</h1>
+            <h1 class="title"><a id="id52610"/>Yulup User Manual</h1>
           </div>
           <div>
             <div class="authorgroup">
@@ -37,36 +37,9 @@
             </div>
           </div>
           <div>
-            <p class="pubdate">2006-12-13</p>
+            <p class="pubdate">2007-01-15</p>
           </div>
           <div>
-            <div class="revhistory">
-              <table border="1" width="100%" summary="Revision history">
-                <tr>
-                  <th align="left" valign="top" colspan="3">
-                    <b>Revision History</b>
-                  </th>
-                </tr>
-                <tr>
-                  <td align="left">Revision 0.1.1</td>
-                  <td align="left">2006-12-13</td>
-                  <td align="left">AW</td>
-                </tr>
-                <tr>
-                  <td align="left" colspan="3">Updated and more content added.</td>
-                </tr>
-                <tr>
-                  <td align="left">Revision 0.1.0</td>
-                  <td align="left">2006-08-08</td>
-                  <td align="left">AW</td>
-                </tr>
-                <tr>
-                  <td align="left" colspan="3">First initial draft.</td>
-                </tr>
-              </table>
-            </div>
-          </div>
-          <div>
             <div class="abstract">
               <p class="title">
                 <b>Abstract</b>
@@ -84,22 +57,22 @@
         <dl>
           <dt>
             <span class="section">
-              <a href="#id52739">1. Introduction</a>
+              <a href="#id52705">1. Introduction</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52876">2. Notational Conventions</a>
+              <a href="#id52840">2. Notational Conventions</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52921">3. System Requirements</a>
+              <a href="#id52885">3. System Requirements</a>
             </span>
           </dt>
           <dt>
             <span class="section">
-              <a href="#id52941">4. Installation</a>
+              <a href="#id52905">4. Installation</a>
             </span>
           </dt>
           <dd>
@@ -118,71 +91,71 @@
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53129">5. Concepts</a>
+              <a href="#id53093">5. Concepts</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53135">5.1. Webbrowser View and Editor View</a>
+                  <a href="#id53098">5.1. Webbrowser View and Editor View</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53229">5.2. Webpages, Documents and Document Fragments</a>
+                  <a href="#id53196">5.2. Webpages, Documents and Document Fragments</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53290">6. Opening and Creating new Documents</a>
+              <a href="#id53252">6. Opening and Creating new Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53302">6.1. Opening Documents</a>
+                  <a href="#id53260">6.1. Opening Documents</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id53308">6.1.1. From the Webbrowser View</a>
+                      <a href="#id53266">6.1.1. From the Webbrowser View</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id53314">6.1.1.1. Open Document from CMS</a>
+                          <a href="#id53272">6.1.1.1. Open Document from CMS</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id53435">6.1.1.2. Open Document As-Is</a>
+                          <a href="#id53393">6.1.1.2. Open Document As-Is</a>
                         </span>
                       </dt>
                     </dl>
                   </dd>
                   <dt>
                     <span class="section">
-                      <a href="#id53482">6.1.2. Inside the Editor</a>
+                      <a href="#id53440">6.1.2. Inside the Editor</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id53488">6.1.2.1. Open Document from CMS</a>
+                          <a href="#id53446">6.1.2.1. Open Document from CMS</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id53495">6.1.2.2. Open Document from Local Filesystem</a>
+                          <a href="#id53453">6.1.2.2. Open Document from Local Filesystem</a>
                         </span>
                       </dt>
                     </dl>
@@ -191,19 +164,19 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id53504">6.2. Creating Documents</a>
+                  <a href="#id53462">6.2. Creating Documents</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id53510">6.2.1. From the Webbrowser View</a>
+                      <a href="#id53468">6.2.1. From the Webbrowser View</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id53517">6.2.2. Inside the Editor</a>
+                      <a href="#id53475">6.2.2. Inside the Editor</a>
                     </span>
                   </dt>
                 </dl>
@@ -212,52 +185,52 @@
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53526">7. Saving Documents</a>
+              <a href="#id53484">7. Saving Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53537">7.1. Save Document</a>
+                  <a href="#id53495">7.1. Save Document</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53657">7.2. Save Document As...</a>
+                  <a href="#id53616">7.2. Save Document As...</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53730">8. Uploading Documents/Assets</a>
+              <a href="#id53689">8. Uploading Documents/Assets</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53793">8.1. From the Webbrowser View</a>
+                  <a href="#id53751">8.1. From the Webbrowser View</a>
                 </span>
               </dt>
               <dt>
                 <span class="section">
-                  <a href="#id53800">8.2. Inside the Editor</a>
+                  <a href="#id53758">8.2. Inside the Editor</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id53808">9. Editing Documents</a>
+              <a href="#id53766">9. Editing Documents</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id53873">9.1. Source Mode</a>
+                  <a href="#id53831">9.1. Source Mode</a>
                 </span>
               </dt>
               <dd>
@@ -271,26 +244,26 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54047">9.2. WYSIWYG Mode</a>
+                  <a href="#id54005">9.2. WYSIWYG Mode</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54053">9.2.1. XHTML Mode</a>
+                      <a href="#id54011">9.2.1. XHTML Mode</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54059">9.2.2. XML Mode</a>
+                      <a href="#id54018">9.2.2. XML Mode</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id54065">9.2.2.1. XPath Toolbar</a>
+                          <a href="#id54023">9.2.2.1. XPath Toolbar</a>
                         </span>
                       </dt>
                     </dl>
@@ -299,7 +272,7 @@
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54124">9.3. Key Bindings</a>
+                  <a href="#id54082">9.3. Key Bindings</a>
                 </span>
               </dt>
               <dd>
@@ -311,104 +284,128 @@
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54197">9.3.2. Readline (Emacs) Key Bindings</a>
+                      <a href="#id54156">9.3.2. Readline (Emacs) Key Bindings</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
+              <dt>
+                <span class="section">
+                  <a href="#id54392">9.4. Find &amp; Replace</a>
+                </span>
+              </dt>
+              <dd>
+                <dl>
+                  <dt>
+                    <span class="section">
+                      <a href="#id54398">9.4.1. Find</a>
+                    </span>
+                  </dt>
+                  <dt>
+                    <span class="section">
+                      <a href="#id54545">9.4.2. Find &amp; Replace</a>
+                    </span>
+                  </dt>
+                </dl>
+              </dd>
+              <dt>
+                <span class="section">
+                  <a href="#id54736">9.5. Exiting the Editor</a>
+                </span>
+              </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id54435">10. Sidebars</a>
+              <a href="#id54826">10. Sidebars</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id54460">10.1. Atom Sidebar</a>
+                  <a href="#id54854">10.1. Atom Sidebar</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54553">10.1.1. Selecting Workspaces and Collections</a>
+                      <a href="#id54944">10.1.1. Selecting Workspaces and Collections</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54577">10.1.2. Feed Information</a>
+                      <a href="#id54968">10.1.2. Feed Information</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54593">10.1.3. Feed Entries</a>
+                      <a href="#id54984">10.1.3. Feed Entries</a>
                     </span>
                   </dt>
                   <dd>
                     <dl>
                       <dt>
                         <span class="section">
-                          <a href="#id54633">10.1.3.1. Editing Feed Entries</a>
+                          <a href="#id55024">10.1.3.1. Editing Feed Entries</a>
                         </span>
                       </dt>
                       <dt>
                         <span class="section">
-                          <a href="#id54658">10.1.3.2. Deleting Feed Entries</a>
+                          <a href="#id55049">10.1.3.2. Deleting Feed Entries</a>
                         </span>
                       </dt>
                     </dl>
                   </dd>
                   <dt>
                     <span class="section">
-                      <a href="#id54685">10.1.4. Searching a Feed</a>
+                      <a href="#id55076">10.1.4. Searching a Feed</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54701">10.2. Neutron Sidebar</a>
+                  <a href="#id55092">10.2. Neutron Sidebar</a>
                 </span>
               </dt>
             </dl>
           </dd>
           <dt>
             <span class="section">
-              <a href="#id54712">11. Preferences</a>
+              <a href="#id55103">11. Preferences</a>
             </span>
           </dt>
           <dd>
             <dl>
               <dt>
                 <span class="section">
-                  <a href="#id54742">11.1. General</a>
+                  <a href="#id55135">11.1. General</a>
                 </span>
               </dt>
               <dd>
                 <dl>
                   <dt>
                     <span class="section">
-                      <a href="#id54785">11.1.1. Workspace</a>
+                      <a href="#id55176">11.1.1. Workspace</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54827">11.1.2. Default CMS</a>
+                      <a href="#id55222">11.1.2. Default CMS</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54840">11.1.3. Sidebars</a>
+                      <a href="#id55235">11.1.3. Sidebars</a>
                     </span>
                   </dt>
                 </dl>
               </dd>
               <dt>
                 <span class="section">
-                  <a href="#id54868">11.2. Editor</a>
+                  <a href="#id55259">11.2. Editor</a>
                 </span>
               </dt>
               <dd>
@@ -420,12 +417,12 @@
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id54977">11.2.2. Layout</a>
+                      <a href="#id55368">11.2.2. Layout</a>
                     </span>
                   </dt>
                   <dt>
                     <span class="section">
-                      <a href="#id55004">11.2.3. Appearance</a>
+                      <a href="#id55395">11.2.3. Appearance</a>
                     </span>
                   </dt>
                 </dl>
@@ -438,7 +435,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52739"/>1. Introduction</h2>
+              <h2 class="title"><a id="id52705"/>1. Introduction</h2>
             </div>
           </div>
         </div>
@@ -488,7 +485,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52876"/>2. Notational Conventions</h2>
+              <h2 class="title"><a id="id52840"/>2. Notational Conventions</h2>
             </div>
           </div>
         </div>
@@ -513,7 +510,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52921"/>3. System Requirements</h2>
+              <h2 class="title"><a id="id52885"/>3. System Requirements</h2>
             </div>
           </div>
         </div>
@@ -525,7 +522,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id52941"/>4. Installation</h2>
+              <h2 class="title"><a id="id52905"/>4. Installation</h2>
             </div>
           </div>
         </div>
@@ -618,7 +615,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53129"/>5. Concepts</h2>
+              <h2 class="title"><a id="id53093"/>5. Concepts</h2>
             </div>
           </div>
         </div>
@@ -626,7 +623,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53135"/>5.1. Webbrowser View and Editor View</h3>
+                <h3 class="title"><a id="id53098"/>5.1. Webbrowser View and Editor View</h3>
               </div>
             </div>
           </div>
@@ -634,7 +631,7 @@
         The <span class="emphasis"><em>Webbrowser View</em></span> is your normal web browser.
         </p>
           <div class="figure">
-            <a id="id53147"/>
+            <a id="id53111"/>
             <p class="title">
               <b>Figure 1. Webbrowser View</b>
             </p>
@@ -652,7 +649,7 @@
         If you choose to edit an existing document or to create a new document, you are then transferred to the <span class="emphasis"><em>Editor View</em></span>.
         </p>
           <div class="figure">
-            <a id="id53199"/>
+            <a id="id53165"/>
             <p class="title">
               <b>Figure 2. Editor View</b>
             </p>
@@ -667,7 +664,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53229"/>5.2. Webpages, Documents and Document Fragments</h3>
+                <h3 class="title"><a id="id53196"/>5.2. Webpages, Documents and Document Fragments</h3>
               </div>
             </div>
           </div>
@@ -689,7 +686,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53290"/>6. Opening and Creating new Documents</h2>
+              <h2 class="title"><a id="id53252"/>6. Opening and Creating new Documents</h2>
             </div>
           </div>
         </div>
@@ -700,7 +697,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53302"/>6.1. Opening Documents</h3>
+                <h3 class="title"><a id="id53260"/>6.1. Opening Documents</h3>
               </div>
             </div>
           </div>
@@ -708,7 +705,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53308"/>6.1.1. From the Webbrowser View</h4>
+                  <h4 class="title"><a id="id53266"/>6.1.1. From the Webbrowser View</h4>
                 </div>
               </div>
             </div>
@@ -716,7 +713,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53314"/>6.1.1.1. Open Document from CMS</h5>
+                    <h5 class="title"><a id="id53272"/>6.1.1.1. Open Document from CMS</h5>
                   </div>
                 </div>
               </div>
@@ -732,7 +729,7 @@
                   If the server offers you the option of opening the document without locking, then a menu item labelled <span class="guimenuitem">Open and Edit</span> is enabled in the Yulup Browser Menu.
                   </p>
                     <div class="figure">
-                      <a id="id53343"/>
+                      <a id="id53301"/>
                       <p class="title">
                         <b>Figure 3. <span class="emphasis"><em>Open and Edit</em></span> from the Yulup Menu</b>
                       </p>
@@ -746,7 +743,7 @@
                   If the server offers you the option of opening the document with locking, then a menu item labelled <span class="guimenuitem">Checkout and Edit</span> is enabled in the Yulup Browser Menu. By checking out a document from the CMS like this, you are acquiring a lock on this document. This means that only you can currently edit this document, and no one else can edit this document in the meantime.
                   </p>
                     <div class="figure">
-                      <a id="id53342"/>
+                      <a id="id53325"/>
                       <p class="title">
                         <b>Figure 4. <span class="emphasis"><em>Checkout and Edit</em></span> from the Yulup Menu</b>
                       </p>
@@ -767,7 +764,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53435"/>6.1.1.2. Open Document As-Is</h5>
+                    <h5 class="title"><a id="id53393"/>6.1.1.2. Open Document As-Is</h5>
                   </div>
                 </div>
               </div>
@@ -775,7 +772,7 @@
             You can also open a document as-is, using the <span class="guimenuitem">Edit Locally</span> menu item. This simply reloads the document you are currently viewing into the editor. This enables you to edit arbitrary web pages. Of course, you cannot store such a document back to the web server, but you can still save it to your local filesystem.
             </p>
               <div class="figure">
-                <a id="id53452"/>
+                <a id="id53410"/>
                 <p class="title">
                   <b>Figure 5. <span class="emphasis"><em>Edit Locally</em></span></b>
                 </p>
@@ -791,7 +788,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53482"/>6.1.2. Inside the Editor</h4>
+                  <h4 class="title"><a id="id53440"/>6.1.2. Inside the Editor</h4>
                 </div>
               </div>
             </div>
@@ -799,7 +796,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53488"/>6.1.2.1. Open Document from CMS</h5>
+                    <h5 class="title"><a id="id53446"/>6.1.2.1. Open Document from CMS</h5>
                   </div>
                 </div>
               </div>
@@ -808,7 +805,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id53495"/>6.1.2.2. Open Document from Local Filesystem</h5>
+                    <h5 class="title"><a id="id53453"/>6.1.2.2. Open Document from Local Filesystem</h5>
                   </div>
                 </div>
               </div>
@@ -819,7 +816,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53504"/>6.2. Creating Documents</h3>
+                <h3 class="title"><a id="id53462"/>6.2. Creating Documents</h3>
               </div>
             </div>
           </div>
@@ -827,7 +824,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53510"/>6.2.1. From the Webbrowser View</h4>
+                  <h4 class="title"><a id="id53468"/>6.2.1. From the Webbrowser View</h4>
                 </div>
               </div>
             </div>
@@ -836,7 +833,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id53517"/>6.2.2. Inside the Editor</h4>
+                  <h4 class="title"><a id="id53475"/>6.2.2. Inside the Editor</h4>
                 </div>
               </div>
             </div>
@@ -847,7 +844,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53526"/>7. Saving Documents</h2>
+              <h2 class="title"><a id="id53484"/>7. Saving Documents</h2>
             </div>
           </div>
         </div>
@@ -858,7 +855,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53537"/>7.1. Save Document</h3>
+                <h3 class="title"><a id="id53495"/>7.1. Save Document</h3>
               </div>
             </div>
           </div>
@@ -907,7 +904,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53657"/>7.2. Save Document As...</h3>
+                <h3 class="title"><a id="id53616"/>7.2. Save Document As...</h3>
               </div>
             </div>
           </div>
@@ -931,7 +928,7 @@
               Saves the document to the CMS. You are asked to supply a path to the place where you want the document to be stored.
               </p>
                 <div class="figure">
-                  <a id="id53694"/>
+                  <a id="id53653"/>
                   <p class="title">
                     <b>Figure 6. <span class="emphasis"><em>Save to CMS as...</em></span> inside the Editor</b>
                   </p>
@@ -950,14 +947,14 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53730"/>8. Uploading Documents/Assets</h2>
+              <h2 class="title"><a id="id53689"/>8. Uploading Documents/Assets</h2>
             </div>
           </div>
         </div>
         <p>
       </p>
         <div class="figure">
-          <a id="id53738"/>
+          <a id="id53697"/>
           <p class="title">
             <b>Figure 7. Specify the CMS URI</b>
           </p>
@@ -968,7 +965,7 @@
         <p>
       </p>
         <div class="figure">
-          <a id="id53765"/>
+          <a id="id53723"/>
           <p class="title">
             <b>Figure 8. Upload a Document or Asset</b>
           </p>
@@ -982,7 +979,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53793"/>8.1. From the Webbrowser View</h3>
+                <h3 class="title"><a id="id53751"/>8.1. From the Webbrowser View</h3>
               </div>
             </div>
           </div>
@@ -991,7 +988,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53800"/>8.2. Inside the Editor</h3>
+                <h3 class="title"><a id="id53758"/>8.2. Inside the Editor</h3>
               </div>
             </div>
           </div>
@@ -1001,7 +998,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id53808"/>9. Editing Documents</h2>
+              <h2 class="title"><a id="id53766"/>9. Editing Documents</h2>
             </div>
           </div>
         </div>
@@ -1012,7 +1009,7 @@
       Despite these two different modes, they share a common toolbar.
       </p>
         <div class="figure">
-          <a id="id53841"/>
+          <a id="id53800"/>
           <p class="title">
             <b>Figure 9. Editor Toolbar</b>
           </p>
@@ -1027,7 +1024,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id53873"/>9.1. Source Mode</h3>
+                <h3 class="title"><a id="id53831"/>9.1. Source Mode</h3>
               </div>
             </div>
           </div>
@@ -1049,7 +1046,7 @@
           The guided tag inserter first asks for the tag name.
           </p>
             <div class="figure">
-              <a id="id53908"/>
+              <a id="id53867"/>
               <p class="title">
                 <b>Figure 10. Guided Tag Inserter (Element Name)</b>
               </p>
@@ -1061,7 +1058,7 @@
           If you hit return without entering any text into the tag name field, the guided tag inserter aborts without inserting any text into the editor. Otherwise, if you have indeed entered a tag name, it goes into a loop and asks for attribute names and their values.
           </p>
             <div class="figure">
-              <a id="id53941"/>
+              <a id="id53899"/>
               <p class="title">
                 <b>Figure 11. Guided Tag Inserter (Attribute Name)</b>
               </p>
@@ -1072,7 +1069,7 @@
             <p>
           </p>
             <div class="figure">
-              <a id="id53968"/>
+              <a id="id53927"/>
               <p class="title">
                 <b>Figure 12. Guided Tag Inserter (Attribute Value)</b>
               </p>
@@ -1084,7 +1081,7 @@
           If you hit return without entering any text into the attribute name field, the guided tag inserter proceeds to ask you if you want to create an empty (e.g. <span class="markup">&lt;section/&gt;</span>) or a non-empty tag (e.g. <span class="markup">&lt;section&gt;&lt;/section&gt;</span>).
           </p>
             <div class="figure">
-              <a id="id54008"/>
+              <a id="id53967"/>
               <p class="title">
                 <b>Figure 13. Guided Tag Inserter (Tag Mode)</b>
               </p>
@@ -1104,7 +1101,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54047"/>9.2. WYSIWYG Mode</h3>
+                <h3 class="title"><a id="id54005"/>9.2. WYSIWYG Mode</h3>
               </div>
             </div>
           </div>
@@ -1112,7 +1109,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54053"/>9.2.1. XHTML Mode</h4>
+                  <h4 class="title"><a id="id54011"/>9.2.1. XHTML Mode</h4>
                 </div>
               </div>
             </div>
@@ -1121,7 +1118,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54059"/>9.2.2. XML Mode</h4>
+                  <h4 class="title"><a id="id54018"/>9.2.2. XML Mode</h4>
                 </div>
               </div>
             </div>
@@ -1129,7 +1126,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54065"/>9.2.2.1. XPath Toolbar</h5>
+                    <h5 class="title"><a id="id54023"/>9.2.2.1. XPath Toolbar</h5>
                   </div>
                 </div>
               </div>
@@ -1137,7 +1134,7 @@
             The XPath toolbar shows you the path from the document root to the current selection. This means that whatever you insert at the current position is going to end up at the shown path in the XML source document.
             </p>
               <div class="figure">
-                <a id="id54077"/>
+                <a id="id54035"/>
                 <p class="title">
                   <b>Figure 14. XPath Toolbar</b>
                 </p>
@@ -1155,7 +1152,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54124"/>9.3. Key Bindings</h3>
+                <h3 class="title"><a id="id54082"/>9.3. Key Bindings</h3>
               </div>
             </div>
           </div>
@@ -1175,7 +1172,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54172"/>Inserting</h5>
+            <h5><a id="id54130"/>Inserting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1194,14 +1191,14 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54197"/>9.3.2. Readline (Emacs) Key Bindings</h4>
+                  <h4 class="title"><a id="id54156"/>9.3.2. Readline (Emacs) Key Bindings</h4>
                 </div>
               </div>
             </div>
             <p>
             The following key bindings are activated by default.
             </p>
-            <h5><a id="id54206"/>Moving and Selecting</h5>
+            <h5><a id="id54165"/>Moving and Selecting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1270,7 +1267,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54342"/>Deleting</h5>
+            <h5><a id="id54300"/>Deleting</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1309,7 +1306,7 @@
             </div>
             <p>
             </p>
-            <h5><a id="id54413"/>Undo/Redo</h5>
+            <h5><a id="id54372"/>Undo/Redo</h5>
             <p>
             </p>
             <div class="itemizedlist">
@@ -1325,12 +1322,197 @@
           </p>
           </div>
         </div>
+        <div class="section" lang="en">
+          <div class="titlepage">
+            <div>
+              <div>
+                <h3 class="title"><a id="id54392"/>9.4. Find &amp; Replace</h3>
+              </div>
+            </div>
+          </div>
+          <div class="section" lang="en">
+            <div class="titlepage">
+              <div>
+                <div>
+                  <h4 class="title"><a id="id54398"/>9.4.1. Find</h4>
+                </div>
+              </div>
+            </div>
+            <p>
+          The <span class="emphasis"><em>Find</em></span> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">F</strong></span>.
+          </p>
+            <div class="figure">
+              <a id="id54423"/>
+              <p class="title">
+                <b>Figure 15. Find Dialog</b>
+              </p>
+              <div class="mediaobject">
+                <img src="figures/find_dialog.png" alt="Find dialog"/>
+              </div>
+            </div>
+            <p>
+          </p>
+            <div class="itemizedlist">
+              <ul>
+                <li>
+                  <p><b>Search for. </b>
+                Enter the phrase you want to search for.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match case. </b>
+                Select if you want the search to be case-sensitive.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match entire word only. </b>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </p>
+                </li>
+                <li>
+                  <p><b>Search backwards. </b>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </p>
+                </li>
+                <li>
+                  <p><b>Wrap around. </b>
+                Select if the search should wrap around the end (or the beginning, if <span class="emphasis"><em>Search backwards</em></span> is selected) of the document.
+              </p>
+                </li>
+                <li>
+                  <p><b>Find. </b>
+                Perform the search. If the search term was not found, <span class="emphasis"><em>Phrase not found</em></span> is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Cancel. </b>
+                Close the dialog.
+              </p>
+                </li>
+              </ul>
+            </div>
+            <p>
+        </p>
+          </div>
+          <div class="section" lang="en">
+            <div class="titlepage">
+              <div>
+                <div>
+                  <h4 class="title"><a id="id54545"/>9.4.2. Find &amp; Replace</h4>
+                </div>
+              </div>
+            </div>
+            <p>
+          The <span class="emphasis"><em>Find &amp; Replace</em></span> dialog can be opened using either the corresponding button on the editor toolbar, or by pressing <span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">R</strong></span>.
+          </p>
+            <div class="figure">
+              <a id="id54570"/>
+              <p class="title">
+                <b>Figure 16. Find &amp; Replace Dialog</b>
+              </p>
+              <div class="mediaobject">
+                <img src="figures/findreplace_dialog.png" alt="Find &amp; replace dialog"/>
+              </div>
+            </div>
+            <p>
+          </p>
+            <div class="itemizedlist">
+              <ul>
+                <li>
+                  <p><b>Search for. </b>
+                Enter the phrase you want to search for.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace with. </b>
+                Enter the phrase with which you want to replace the search term. If left empty, occurrences of the search term are removed.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match case. </b>
+                Select if you want the search to be case-sensitive.
+              </p>
+                </li>
+                <li>
+                  <p><b>Match entire word only. </b>
+                Select if the search term should only be matched if the occurrence is an individual word.
+              </p>
+                </li>
+                <li>
+                  <p><b>Search backwards. </b>
+                Select if the search should be performed backwards with regard to the current cursor position.
+              </p>
+                </li>
+                <li>
+                  <p><b>Wrap around. </b>
+                Select if the search should wrap around the end (or the beginning, if <span class="emphasis"><em>Search backwards</em></span> is selected) of the document.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace All. </b>
+                Replace all occurrences of the search term in the document. At the end of the process, the number of replaced occurrences is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Replace and Find. </b>
+                Replace the currently selected text in the document (if the selection matches the search term), and find the next occurrence. If the currently selected text in the document does not match the currently entered search term, then this function is disabled.
+              </p>
+                </li>
+                <li>
+                  <p><b>Find. </b>
+                Perform the search. If the search term was not found, <span class="emphasis"><em>Phrase not found</em></span> is displayed at the bottom of the dialog.
+              </p>
+                </li>
+                <li>
+                  <p><b>Cancel. </b>
+                Close the dialog.
+              </p>
+                </li>
+              </ul>
+            </div>
+            <p>
+        </p>
+          </div>
+        </div>
+        <div class="section" lang="en">
+          <div class="titlepage">
+            <div>
+              <div>
+                <h3 class="title"><a id="id54736"/>9.5. Exiting the Editor</h3>
+              </div>
+            </div>
+          </div>
+          <p>
+        There are multiple ways to close the editor.
+        </p>
+          <div class="itemizedlist">
+            <ul>
+              <li>
+                <p><b>Exit Button (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">E</strong></span>). </b>
+              When leaving the editor via the <span class="emphasis"><em>Exit</em></span> button on the editor toolbar, you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </p>
+              </li>
+              <li>
+                <p><b>Check back in to CMS and exit (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">Shift</strong></span>+<span><strong class="keycap">C</strong></span>). </b>
+              After the document is checked back in to the CMS, the editor tab is replaced by a new tab which contains the reloaded original document.
+            </p>
+              </li>
+              <li>
+                <p><b>Tab close (<span><strong class="keycap">Accel</strong></span>+<span><strong class="keycap">W</strong></span>). </b>
+              When closing the editor tab (via the tab close button, the menu, the context menu, or the key combination), you are first asked if you really want to quit the editor, should the document contain unsaved changes. After you asserted to indeed leave the editor, or if the document did not contain any unsaved modifications, the editor tab is closed.
+            </p>
+              </li>
+            </ul>
+          </div>
+          <p>
+      </p>
+        </div>
       </div>
       <div class="section" lang="en">
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id54435"/>10. Sidebars</h2>
+              <h2 class="title"><a id="id54826"/>10. Sidebars</h2>
             </div>
           </div>
         </div>
@@ -1344,7 +1526,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54460"/>10.1. Atom Sidebar</h3>
+                <h3 class="title"><a id="id54854"/>10.1. Atom Sidebar</h3>
               </div>
             </div>
           </div>
@@ -1358,9 +1540,9 @@
         Note that the Atom sidebar cannot be opened if the currently shown document does not contain a link to an APP Service Document.
         </p>
           <div class="figure">
-            <a id="id54524"/>
+            <a id="id54915"/>
             <p class="title">
-              <b>Figure 15. Atom Sidebar</b>
+              <b>Figure 17. Atom Sidebar</b>
             </p>
             <div class="mediaobject">
               <img src="figures/atom_sidebar.png" alt="Atom sidebar showing a news feed and the context menu for one of the feed items"/>
@@ -1372,7 +1554,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54553"/>10.1.1. Selecting Workspaces and Collections</h4>
+                  <h4 class="title"><a id="id54944"/>10.1.1. Selecting Workspaces and Collections</h4>
                 </div>
               </div>
             </div>
@@ -1387,7 +1569,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54577"/>10.1.2. Feed Information</h4>
+                  <h4 class="title"><a id="id54968"/>10.1.2. Feed Information</h4>
                 </div>
               </div>
             </div>
@@ -1399,7 +1581,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54593"/>10.1.3. Feed Entries</h4>
+                  <h4 class="title"><a id="id54984"/>10.1.3. Feed Entries</h4>
                 </div>
               </div>
             </div>
@@ -1419,7 +1601,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54633"/>10.1.3.1. Editing Feed Entries</h5>
+                    <h5 class="title"><a id="id55024"/>10.1.3.1. Editing Feed Entries</h5>
                   </div>
                 </div>
               </div>
@@ -1434,7 +1616,7 @@
               <div class="titlepage">
                 <div>
                   <div>
-                    <h5 class="title"><a id="id54658"/>10.1.3.2. Deleting Feed Entries</h5>
+                    <h5 class="title"><a id="id55049"/>10.1.3.2. Deleting Feed Entries</h5>
                   </div>
                 </div>
               </div>
@@ -1450,7 +1632,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54685"/>10.1.4. Searching a Feed</h4>
+                  <h4 class="title"><a id="id55076"/>10.1.4. Searching a Feed</h4>
                 </div>
               </div>
             </div>
@@ -1463,7 +1645,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54701"/>10.2. Neutron Sidebar</h3>
+                <h3 class="title"><a id="id55092"/>10.2. Neutron Sidebar</h3>
               </div>
             </div>
           </div>
@@ -1476,7 +1658,7 @@
         <div class="titlepage">
           <div>
             <div>
-              <h2 class="title"><a id="id54712"/>11. Preferences</h2>
+              <h2 class="title"><a id="id55103"/>11. Preferences</h2>
             </div>
           </div>
         </div>
@@ -1490,7 +1672,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54742"/>11.1. General</h3>
+                <h3 class="title"><a id="id55135"/>11.1. General</h3>
               </div>
             </div>
           </div>
@@ -1498,9 +1680,9 @@
         In the <span class="emphasis"><em>General</em></span> section, you can edit settings related to the overall usage of Yulup.
       </p>
           <div class="figure">
-            <a id="id54757"/>
+            <a id="id55148"/>
             <p class="title">
-              <b>Figure 16. Preferences <span class="emphasis"><em>General</em></span></b>
+              <b>Figure 18. Preferences <span class="emphasis"><em>General</em></span></b>
             </p>
             <div class="mediaobject">
               <img src="figures/preferences_general.png" alt="General settings"/>
@@ -1510,7 +1692,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54785"/>11.1.1. Workspace</h4>
+                  <h4 class="title"><a id="id55176"/>11.1.1. Workspace</h4>
                 </div>
               </div>
             </div>
@@ -1537,7 +1719,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54827"/>11.1.2. Default CMS</h4>
+                  <h4 class="title"><a id="id55222"/>11.1.2. Default CMS</h4>
                 </div>
               </div>
             </div>
@@ -1549,7 +1731,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54840"/>11.1.3. Sidebars</h4>
+                  <h4 class="title"><a id="id55235"/>11.1.3. Sidebars</h4>
                 </div>
               </div>
             </div>
@@ -1572,7 +1754,7 @@
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a id="id54868"/>11.2. Editor</h3>
+                <h3 class="title"><a id="id55259"/>11.2. Editor</h3>
               </div>
             </div>
           </div>
@@ -1580,9 +1762,9 @@
         In the <span class="emphasis"><em>Editor</em></span> section, you can edit settings related to the Yulup editor.
       </p>
           <div class="figure">
-            <a id="id54882"/>
+            <a id="id55253"/>
             <p class="title">
-              <b>Figure 17. Preferences <span class="emphasis"><em>Editor</em></span></b>
+              <b>Figure 19. Preferences <span class="emphasis"><em>Editor</em></span></b>
             </p>
             <div class="mediaobject">
               <img src="figures/preferences_editor.png" alt="Editor settings"/>
@@ -1624,7 +1806,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id54977"/>11.2.2. Layout</h4>
+                  <h4 class="title"><a id="id55368"/>11.2.2. Layout</h4>
                 </div>
               </div>
             </div>
@@ -1646,7 +1828,7 @@
             <div class="titlepage">
               <div>
                 <div>
-                  <h4 class="title"><a id="id55004"/>11.2.3. Appearance</h4>
+                  <h4 class="title"><a id="id55395"/>11.2.3. Appearance</h4>
                 </div>
               </div>
             </div>