Index: src/main/webapp/developers-guide/writing-tests.conf
===================================================================
--- src/main/webapp/developers-guide/writing-tests.conf	(revision 1148938)
+++ src/main/webapp/developers-guide/writing-tests.conf	(working copy)
@@ -1,6 +1,6 @@
 h1. Writing integration tests
 
-We recommend using [PAX Exam|http://wiki.ops4j.org/display/paxexam/Pax+Exam] to write integration tests when developing
+We recommend using [PAX Exam|http://team.ops4j.org/wiki/display/paxexam/Pax+Exam] to write integration tests when developing
 applications using Karaf.
 
 Karaf provides an helper library to help writing such integration tests.
Index: src/main/webapp/users-guide/web-applications.conf
===================================================================
--- src/main/webapp/users-guide/web-applications.conf	(revision 1148938)
+++ src/main/webapp/users-guide/web-applications.conf	(working copy)
@@ -88,7 +88,7 @@
 
 The following steps will describe how to install a simple WAR file (with JSPs or Servlets) to the just installed web feature.
 # To deploy a WAR (JSP or Servlet) to Jetty, update its MANIFEST.MF to include the required OSGi headers as described here - \\
-[http://wiki.ops4j.org/confluence/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
+[http://team.ops4j.org/wiki/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
 # Copy the updated WAR (archive or extracted files) to the _deploy_ directory.
 
 If you want to deploy a sample web application into Karaf, you could use the following command:
Index: src/main/webapp/users-guide/logging-system.conf
===================================================================
--- src/main/webapp/users-guide/logging-system.conf	(revision 1148938)
+++ src/main/webapp/users-guide/logging-system.conf	(working copy)
@@ -1,7 +1,7 @@
 
 h1. Logging system
 
-Karaf provides a powerful logging system based on [OPS4j Pax Logging|http://wiki.ops4j.org/display/paxlogging/Pax+Logging]. 
+Karaf provides a powerful logging system based on [OPS4j Pax Logging|http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging]. 
 
 In addition to being a standard OSGi Log service, it supports the following APIs:
 * Apache Commons Logging
Index: src/main/webapp/users-guide/http.conf
===================================================================
--- src/main/webapp/users-guide/http.conf	(revision 1148938)
+++ src/main/webapp/users-guide/http.conf	(working copy)
@@ -33,7 +33,7 @@
 root@karaf> features:install http-whiteboard
 {code}
 
-The [Pax Web whiteboard|http://wiki.ops4j.org/display/ops4j/Pax+Web+Extender+-+Whiteboard] extender listens to services
+The [Pax Web whiteboard|http://team.ops4j.org/wiki/display/ops4j/Pax+Web+Extender+-+Whiteboard] extender listens to services
 of interface type HttpServlet and Filter.
 It will register each of these interfaces with the HttpService and remove them as soon as the service goes down.
 So it is much more convenient than registering with the HttpService directly.
@@ -51,4 +51,5 @@
 
 The above snippet publishes the Servlet MyServlet on http://localhost:8080/myServlet.
 
-Please keep in mind that the Whiteboard pattern for Servlets is not standardized and only works with Pax Web.
\ No newline at end of file
+Please keep in mind that the Whiteboard pattern for Servlets is not standardized and only works with Pax Web.
+