merge-update from trunk

diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt
index f615732f552e65ebce53590d27b9629d62af49f2..67e5232cd438d76d030bf6254f9616ed1b453381 100644 (file)
--- a/src/site/apt/getting-started.apt
+++ b/src/site/apt/getting-started.apt
@@ -7,7 +7,7 @@
 
 Setting up a Taxonomic Editor development environment
 
-       This document describes all steps necessarry to create a development environment to develop the EDIT Taxonomic Editor. If you are looking for 
+       This document describes all steps necessary to create a development environment to develop the EDIT Taxonomic Editor. If you are looking for 
        instructions on how to install the EDIT Taxonomic Editor please consult the {{{./manual.html} manual}}.
        
        <Table of Contents>
@@ -122,7 +122,7 @@ $ mvn validate
 
 ** <eu.etaxonomy.taxeditor.test>
        
-       Automated GUI Tests for the Taxonomic Editor that can be run with {{{http://swtbot.com/}SWTBot}}.
+       Automated GUI Tests for the Taxonomic Editor that can be run with {{{http://eclipse.org/swtbot/}SWTBot}}.
 
 * Creating a launch configuration