Replace temporary path to the download app with the standard one

[jabaws.git] / website / man_dev.html

diff --git a/website/man_dev.html b/website/man_dev.html
index de5c544..35da5fd 100644 (file)
--- a/website/man_dev.html
+++ b/website/man_dev.html
@@ -111,13 +111,9 @@
 <h3><a name="connectto" id="connectto"></a>Connecting to JABAWS</h3>\r
 <p class="attention">\r
 For a complete working example of JABAWS command line client please see compbio.ws.client.Jws2Client class. JABAWS command line client \r
-<<<<<<< HEAD\r
-source code is available from the <a href="http://gjb-www-4.cluster.lifesci.dundee.ac.uk:8091/jabaws-dev">download page</a>. Please note that for now all \r
+source code is available from the <a href="http://www.compbio.dundee.ac.uk/download">download page</a>. Please note that for now all \r
 the examples are in Java other languages will follow given a sufficient demand. </p>\r
-=======\r
-source code is available from the <a href="http://gjb-www-4.cluster.lifesci.dundee.ac.uk:8091/jabaws-dev">download page</a>. Please note that for now all \r
-the examples are in Java, other languages will follow if there is sufficient demand. </p>\r
->>>>>>> 42a3637e24a7a65b5a1e6048e581df998b4a4f95\r
+\r
 <p>\r
 Download a binary JABAWS client. Add the client to the class path. The following code excerpt will connect your program to Clustal \r
 web service deployed in the University of Dundee. </p>\r
@@ -272,7 +268,7 @@ one of the  Clustal web service presets. There is also a <a href="Example_templa
 this example with syntax highlighted. The text comments are commented by block style comments e.g. /* comment */, \r
 the alternatives given in the code are line commented // comment. You may want to remove line style comments to \r
 test alternatives of the functions. All you need for this to work is a \r
-<a href="http://gjb-www-4.cluster.lifesci.dundee.ac.uk:8091/jabaws-dev/get?id=min-jaba-client-2.0.jar">JABAWS binary client</a>. \r
+<a href="http://www.compbio.dundee.ac.uk/download/get?id=min-jaba-client-2.0.jar">JABAWS binary client</a>. \r
 Please make sure that the client is in the Java class path before running this example.</p>\r
 <pre class="code" style="line-height:1em;">\r
 import java.io.ByteArrayInputStream;\r