X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=website%2Fman_dev.html;h=de5c5443f8df9e40560ba02e65abf1acbd3199cc;hb=faac303bf9ad8c17b71a55d23b7a2c0a9e6e2efa;hp=a602a7b79bb114090c026d256e29b9ef15632256;hpb=68b0d4a40dd4f0730fd28ee4bcf1104aa49ddbe0;p=jabaws.git

diff --git a/website/man_dev.html b/website/man_dev.html
index a602a7b..de5c544 100644
--- a/website/man_dev.html
+++ b/website/man_dev.html
@@ -111,8 +111,13 @@
 <h3><a name="connectto" id="connectto"></a>Connecting to JABAWS</h3>
 <p class="attention">
 For a complete working example of JABAWS command line client please see compbio.ws.client.Jws2Client class. JABAWS command line client 
-source code is available from the <a href="http://gjb-www-1.cluster.lifesci.dundee.ac.uk:8086/jabaws-dev">download page</a>. Please note that for now all 
+<<<<<<< HEAD
+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 
+the examples are in Java other languages will follow given a sufficient demand. </p>
+=======
+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 
 the examples are in Java, other languages will follow if there is sufficient demand. </p>
+>>>>>>> 42a3637e24a7a65b5a1e6048e581df998b4a4f95
 <p>
 Download a binary JABAWS client. Add the client to the class path. The following code excerpt will connect your program to Clustal 
 web service deployed in the University of Dundee. </p>
@@ -267,7 +272,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 */, 
 the alternatives given in the code are line commented // comment. You may want to remove line style comments to 
 test alternatives of the functions. All you need for this to work is a 
-<a href="http://gjb-www-1.cluster.lifesci.dundee.ac.uk:8086/jabaws-dev/get?id=min-jaba-client-2.0.jar">JABAWS binary client</a>. 
+<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>. 
 Please make sure that the client is in the Java class path before running this example.</p>
 <pre class="code" style="line-height:1em;">
 import java.io.ByteArrayInputStream;
@@ -409,7 +414,7 @@ generate portable artifacts to work with JABAWS from Java. However if programmin
 it provides a handful of useful methods in addition to plain data types. </p>
 <p class="code">wsimport -keep http://www.compbio.dundee.ac.uk/jabaws/ClustalWS?wsdl</p>
 </div><!-- content end-->
-<div id="copyright">Last update: 14 October 2013<br/>Sasha Sherstnev, Peter Troshin, Jim Procter and Geoff Barton, The Barton Group, University of Dundee, UK</div>
+<div id="copyright">Last update: 30 April 2014<br/>Sasha Sherstnev, Peter Troshin, Jim Procter and Geoff Barton, The Barton Group, University of Dundee, UK</div>
 </div><!-- wrapper end-->
 </div><!-- page end-->