james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1526134 - /james/hupa/trunk/src/site/xdoc/index.xml
Date Wed, 25 Sep 2013 08:18:21 GMT
Author: manolo
Date: Wed Sep 25 08:18:21 2013
New Revision: 1526134

URL: http://svn.apache.org/r1526134
Log:
Fix hupa doc

Modified:
    james/hupa/trunk/src/site/xdoc/index.xml

Modified: james/hupa/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1526134&r1=1526133&r2=1526134&view=diff
==============================================================================
--- james/hupa/trunk/src/site/xdoc/index.xml (original)
+++ james/hupa/trunk/src/site/xdoc/index.xml Wed Sep 25 08:18:21 2013
@@ -26,64 +26,20 @@
 				language used in the James project. And It has been a reference of a
 				devloping using GWT good practices (MVP pattern and Unit testing) </p>
 			<p> Hupa is a functional and well designed email client, ready for
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 				reading, sending and managing messages, but it still lacks of many features
 				email clients nowadays have.</p>
-=======
-				reading, sending and managing messages, but it lacks of many features
-				email clients nowadays have like address book </p>
->>>>>>> first commit
-=======
-				reading, sending and managing messages, but it still lacks of many features
-				email clients nowadays have.</p>
->>>>>>> constantly changed by manolo
-=======
-				reading, sending and managing messages, but it lacks of many features
-				email clients nowadays have like address book </p>
->>>>>>> first commit
-=======
-				reading, sending and managing messages, but it still lacks of many features
-				email clients nowadays have.</p>
->>>>>>> constantly changed by manolo
 		</section>
 
         <section name="Releases">
             <p>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
-                Last release is Hupa 0.0.2:<br/>
-                <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war'>
binary </a> : ready to run or to deploy in any servlet container.<br/>
-                <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip'>
sources </a>.
+                Last release is Hupa 0.0.3:<br/>
+                <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.3/hupa-0.0.3.war'>
binary </a> : ready to run or to deploy in any servlet container.<br/>
+                <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.3/hupa-parent-0.0.3-source-release.zip'>
sources </a>.
             </p>
             <p>
                 Current trunk:<br/>
-                <a href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.james.hupa$hupa/artifact/org.apache.james.hupa/hupa/0.0.3-SNAPSHOT/hupa-0.0.3-SNAPSHOT.war'>
+                <a href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.james.hupa$hupa/artifact/org.apache.james.hupa/hupa/0.0.5-SNAPSHOT/hupa-0.0.5-SNAPSHOT.war'>
                  0.3-SNAPSHOT
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                Although there isn't a stable release yet you can download the latest
-                <a href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war'>
-                 0.2-SNAPSHOT
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-                Although there isn't a stable release yet you can download the latest
-                <a href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war'>
-                 0.2-SNAPSHOT
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
                 </a>
                 from our continuous integration server.
             </p>
@@ -99,55 +55,15 @@
 
         <section name="News">
             <subsection name="2012">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
                 <h4>Jun/2012 - Hupa 0.2 released</h4>
                 <p>
                    First stable version.
                 </p>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                <h4>Apr/2012 - Hupa evolution accepted</h4>
-                <p>
-                    We have got a <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"
-                        target="_blank">GSOC student</a> who will work with Hupa
this Summer
-                        making it better !.
-=======
-=======
->>>>>>> constantly changed by manolo
-                <h4>Apr/2012 - Hupa evolution accepted</h4>
-                <p>
-<<<<<<< HEAD
-                    Whe have got a GSOC student who will work with Hupa this Summer
-                    <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"
-                        target="_blank">making it better.</a>
->>>>>>> first commit
-=======
-                    We have got a <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"
-                        target="_blank">GSOC student</a> who will work with Hupa
this Summer
-                        making it better !.
->>>>>>> constantly changed by manolo
-=======
-=======
->>>>>>> constantly changed by manolo
                 <h4>Apr/2012 - Hupa evolution accepted</h4>
                 <p>
-<<<<<<< HEAD
-                    Whe have got a GSOC student who will work with Hupa this Summer
-                    <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"
-                        target="_blank">making it better.</a>
->>>>>>> first commit
-=======
                     We have got a <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1"
                         target="_blank">GSOC student</a> who will work with Hupa
this Summer
                         making it better !.
->>>>>>> constantly changed by manolo
                 </p>
                 <h4>Mar/2012 - removed snapshots</h4>
                 <p>Removed snapshot dependencies, updated to last GWT release,
@@ -168,23 +84,7 @@
                 </p>
             </subsection>
             <subsection name="2010">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                <h4>Jun/2010 - Hupa 0.0.1</h4>
-=======
-                <h4>Jun/2010 - Hupa 0.1</h4>
->>>>>>> first commit
-=======
-                <h4>Jun/2010 - Hupa 0.0.1</h4>
->>>>>>> constantly changed by manolo
-=======
-                <h4>Jun/2010 - Hupa 0.1</h4>
->>>>>>> first commit
-=======
                 <h4>Jun/2010 - Hupa 0.0.1</h4>
->>>>>>> constantly changed by manolo
                 <p>First beta release, with an improved interface and fully
                     functional (read, edit, send, secure, attachments, etc)</p>
             </subsection>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message