-added RSS feeds to feature tour

-updated some of the images in the tour


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674417 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 40 insertions, 15 deletions

diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index 71cfd3373..1b22aea11 100644
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -23,22 +23,16 @@ Release Notes for Archiva 1.1
    To simplify adding artifacts to a repository, an upload form has been put in place that allows you to put an artifact and POM into
    the repository without the need for the Maven <<<deploy-file>>> command.
 
-   ~~TODO: screenshot, more detail
-
 ** RSS
 
    RSS is now available for getting a feed of new artifacts being added to a given repository. Two types of feeds are generated by Archiva:
    new artifacts in a repository and new versions of a specific artifact. Details are available in {{{userguide/rss.html}Rss Feeds}}.
 
-   ~~TODO: screenshot, more detail
-
 ** Virtual Repositories
 
    Virtual repositories or repository groups allows downloading from a group of repositories via one url. For more details of this feature,
    see {{{userguide/virtual-repositories.html}Virtual Repositories}}.
 
-   ~~TODO: screenshot, more detail
-
 ** Timeouts
 
    Connections to remote repositories can now have a configurable timeout value
diff --git a/archiva-docs/src/site/resources/images/tour/maintenance.png b/archiva-docs/src/site/resources/images/tour/maintenance.png
index e628359e0..e1a9318af 100644
--- a/archiva-docs/src/site/resources/images/tour/maintenance.png
+++ b/archiva-docs/src/site/resources/images/tour/maintenance.png
diff --git a/archiva-docs/src/site/resources/images/tour/reports.png b/archiva-docs/src/site/resources/images/tour/reports.png
index 6f6ef9f4c..4f7c1edb3 100644
--- a/archiva-docs/src/site/resources/images/tour/reports.png
+++ b/archiva-docs/src/site/resources/images/tour/reports.png
diff --git a/archiva-docs/src/site/resources/images/tour/rss.png b/archiva-docs/src/site/resources/images/tour/rss.png
new file mode 100644
index 000000000..62efd7e9a
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/tour/rss.png
diff --git a/archiva-docs/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml
index 05bafdbf7..66a19f102 100644
--- a/archiva-docs/src/site/xdoc/tour/index.xml
+++ b/archiva-docs/src/site/xdoc/tour/index.xml
@@ -51,14 +51,14 @@ table.bodyTable tr.b {
                3. Remote Proxying Cache
             </a>
           </td>
-        </tr>
-        <tr>
           <td>
             <a href="upload.html">
               <img src="../images/tour/upload.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
                4. Artifact Upload
             </a>
           </td>
+        </tr>
+        <tr>
           <td>
             <a href="admin.html">
               <img src="../images/tour/admin.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
@@ -71,24 +71,30 @@ table.bodyTable tr.b {
               6. Virtual Repositories
             </a>
           </td>
-        </tr>
-        <tr>
+          <td>
+            <a href="rss.html">
+              <img src="../images/tour/rss.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
+              7. RSS Feeds
+            </a>
+          </td>
           <td>
             <a href="security.html">
               <img src="../images/tour/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              7. Role-based Security
+              8. Role-based Security
             </a>
           </td>
+        </tr>
+        <tr>             
           <td>
             <a href="reports.html">
               <img src="../images/tour/reports.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              8. Integrity Reports
+              9. Integrity Reports
             </a>
           </td>
           <td>
             <a href="maintenance.html">
               <img src="../images/tour/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              9. Maintenance
+              10. Maintenance
             </a>
           </td>
         </tr>
diff --git a/archiva-docs/src/site/xdoc/tour/rss.xml b/archiva-docs/src/site/xdoc/tour/rss.xml
new file mode 100644
index 000000000..7421c7621
--- /dev/null
+++ b/archiva-docs/src/site/xdoc/tour/rss.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>RSS Feeds</title>
+    <author email="oching@apache.org">Maria Odea Ching</author>
+  </properties>
+  <head>
+  </head>
+  <body>
+    <section name="RSS Feeds">
+      <div style="text-align: center">
+        <img src="../images/tour/rss.png" width="640" height="401" alt="" />
+        <p>
+          Archiva provides RSS feeds for new artifacts in the repositories and new versions
+          of a specific artifact.
+        </p>
+        <p>
+          <a href="virtual-repos.html">Previous: Virtual Repositories</a> |
+          <strong>RSS Feeds</strong> |
+          <a href="security.html">Next: Role-based Security</a>
+        </p>
+      </div>
+    </section>
+  </body>
+</document>
diff --git a/archiva-docs/src/site/xdoc/tour/security.xml b/archiva-docs/src/site/xdoc/tour/security.xml
index 76149face..f489318bd 100644
--- a/archiva-docs/src/site/xdoc/tour/security.xml
+++ b/archiva-docs/src/site/xdoc/tour/security.xml
@@ -16,7 +16,7 @@
           access for individuals, or given roles.
         </p>
         <p>
-          <a href="virtual-repos.html">Previous: Virtual Repositories</a> |
+          <a href="rss.html">Previous: RSS Feeds</a> |
           <strong>Role-based Security</strong> |
           <a href="reports.html">Next: Integrity Reports</a>
         </p>
diff --git a/archiva-docs/src/site/xdoc/tour/virtual-repos.xml b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
index f9ee9254a..a3284f5cb 100644
--- a/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
+++ b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
@@ -18,7 +18,7 @@
         <p>
           <a href="admin.html">Previous: Graphical Administration</a> |
           <strong>Virtual Repositories</strong> |
-          <a href="security.html">Next: Role-based Security</a>
+          <a href="rss.html">Next: RSS Feeds</a>
         </p>
       </div>
     </section>