Move FAQ and Developer's FAQ to Eclipsepedia.
diff --git a/_projectCommon.php b/_projectCommon.php
index 2412d01..2af2981 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -37,13 +37,13 @@
 	$Nav->addCustomNav("    Getting Started", 	"/ajdt/gettingstarted.php", 	"_self", 1);
 	$Nav->addCustomNav("    Downloads", 	"/ajdt/downloads/", 	"_self", 1);
 	$Nav->addCustomNav("    Bugs", "/ajdt/bugs.php", 	"_self", 1);
-	$Nav->addCustomNav("    FAQ", "/ajdt/faq.php", "_self", 1);
+	$Nav->addCustomNav("    FAQ", "http://wiki.eclipse.org/FAQ_for_AJDT", "_self", 1);
 	$Nav->addCustomNav("    Demos", "/ajdt/demos/", "_self", 1);
 	$Nav->addCustomNav("    New Features", "/ajdt/newfeatures/", "_self", 1);
 	$Nav->addCustomNav("    Newsgroup", "http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.ajdt", "_self", 1);
 
 	$Nav->addNavSeparator("Developers", "", "_self", 1);
-	$Nav->addCustomNav("   Contributing", "/ajdt/developers.php", 	"_self", 1);
+	$Nav->addCustomNav("   Contributing", "http://wiki.eclipse.org/AJDT_Developer_FAQ", 	"_self", 1);
 	$Nav->addCustomNav("   CVS", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.ajdt/AJDT_src/?cvsroot=Tools_Project", 	"_self", 1);
 	$Nav->addCustomNav("   Mailing list", "http://dev.eclipse.org/mailman/listinfo/ajdt-dev", 	"_self", 1);
 	$Nav->addCustomNav("   Work tasks", "/ajdt/tasks.php", 	"_self", 1);
diff --git a/developers.php b/developers.php
index c9c910b..200ef1a 100644
--- a/developers.php
+++ b/developers.php
@@ -34,473 +34,7 @@
 <div id="maincontent">
 	<div id="midcolumn">
 	
-	<h1>Information for developers</h1>
-	
-	<p>AJDT is changing rapidly and so some of this document may be out of date.  If you find anything that is out of date or you have any problems following these instructions, please send a note to the <a href="https://dev.eclipse.org/mailman/listinfo/ajdt-dev">AJDT mailing list</a>.  We are a friendly bunch and want to encourage new developers to contribute to AJDT.</p>
-	
-<p>There are many ways to contribute to AJDT even if you are not developing code: answering questions (or asking them) on the mailing list, raising bugs and feature requests, submitting documentation and sample programs, and generally being a constructive member of the community.  These are all ways you can help AJDT and AspectJ grow.  Of course, we also appreciate code contributions.
-
-	
-
-	<h2>Contributing</h2>
-	<ol>
-	  			<li><a href="#q:contribute">How can I contribute to the AJDT project?</a> </li>
-	  			<li><a href="#q:source">Where will I find the source for AJDT? </a> </li>
-	  			<li><a href="#q:versions">What do the version numbers mean?</a> </li>
-					<li><a href="#q:cvs">How can I connect the AJDT CVS repository? </a> </li>
-					<li><a href="#q:cvsbranch">I am looking for the AJDT branch 1.X in the CVS repository, but I can&rsquo;t find it.  
-					What gives? </a> </li>
-					<li><a href="#q:develop">How do I setup an AJDT development environment in Eclipse? </a> </li>
-	  			<li><a href="#q:packaging">How can I package my sample code for contribution to the examples plug-in?</a> </li>
-	  			<li><a href="#q:extend">How can I build tools which extend AJDT?</a> </li>
-	  			
-	</ol>
-	
-	<hr>
-			
-		<ol>
-		<a name="q:contribute"></a>
-			<li><em>How can I contribute to the AJDT project?</em>
-		    <p>
-			    Your contributions to the AJDT project are strongly welcomed! You can create a 
-			    patch that fixes a bug or provides an enhancement and submit
-				it to the AJDT developers either as an attachment to a bug in Bugzilla, or as an 
-				attachment to a post to the newsgroup or developer mailing list.
-			    You can also contribute sample code showing interesting uses of AspectJ, by adding 
-			    entries to the example plug-in.
-				All contributions must be made available under the 
-				<a href="http://www.eclipse.org/legal/termsofuse.php">terms of the Eclipse website</a> see
-				the Eclipse 
-				<a href="http://www.eclipse.org/legal/legalfaq.php#contributions">contribution and participation FAQ</a>. Sorry, but for legal reasons
-
-				we are unable to accept patches emailed directly to developers, and will
-				 normally ask you to resubmit these either via Bugzilla or the mailing list.
-				AJDT development is run as a meritocracy, developers who have a track 
-				record of submitting good patches can become committers on the project.
-		    </p>
-		    </li>
-
-		<a name="q:source"></a>
-			<li><em>Where will I find the source for AJDT?</em>
-			<p>
-				AJDT source is held in the Eclipse CVS repository under /cvsroot/tools, see the <a
-				href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.ajdt/AJDT_src/?root=Tools_Project"> root
-				of the AJDT source tree online</a>.
-				AJDT is organized in subdirectories under org.eclipse.ajdt. The main source
-				tree is in the &#8220;AJDT_src&#8221; subdirectory.  Currently, the HEAD of this directory contains source code
-				for AJDT 1.6 (for Eclipse 3.4), although this will change to AJDT 1.7 as Eclipse 3.5 moves closer to its final release.  The source code for AJDT 1.7 is in the ajdt1_7 branch.
-			</p><p>
-				Similarly, the source code for the Eclipse 3.3 version of AJDT is contained in the ajdt1_5 branch, 
-				the source code for the Eclipse 3.2 version of AJDT is contained in
-				the "ajdt1_4" branch, and the source code for the Eclipse 3.1 version is contained
-				in the "ajdt1_3" branch. Here is a description of the various AJDT
-				plug-ins and features.  Some CVS folders are skipped because they are no longer relevant to the current AJDT implementation.
-			</p>
-
-				<table>
-				
-				 <tr>
-				  <td><strong>Relevant packages under &#8220;AJDT_src&#8221;</strong></td>
-				  <td ><strong>Description</strong></td>
-				 </tr>
-				 
-				 <tr>
-				   <td colspan="2">Plugins</td>
-				 </tr>
-				 <tr>
-				  <td>org.aspectj.ajde</td>
-				  <td>The AspectJ compiler and related classes</td>
-				 </tr>
-				 
-				 <tr>
-				  <td>org.aspectj.runtime<o:p></td>				   
-				  <td>The AspectJ runtime classes packaged in a jar file</td>				   
-				 </tr>
-
-				 <tr>
-				  <td>org.aspectj.weaver<o:p></td>				   
-				  <td>The AspectJ weaver packaged in a jar file</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.core</td>				   
-				  <td>Non-UI parts of AJDT</td>				   
-				 </tr>
-				 
-				  <tr>
-				  <td>org.eclipse.ajdt.core.tests</td>				   
-				  <td>AJDT Core tests</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.examples</td>				   
-				  <td>AspectJ examples plug-in</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.mylyn.ui</td>				   
-				  <td>AJDT-Mylyn connector</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.mylyn.ui</td>				   
-				  <td>AJDT-Mylyn connector tests</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.pde.build</td>				   
-				  <td>Headless build plugin.  This is used by the headless build process to build AJDT.</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.source</td>				   
-				  <td>Source code for AJDT plug-ins - only populated by the build process.  Includes visualizer source code</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.ui.tests</td>			   
-				  <td>AJDT UI Tests</td>			   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.ajdt.ui</td>				   
-				  <td>The AJDT UI plug-in</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td >org.eclipse.aspectj</td>				   
-				  <td>The <em>branding</em> plug-in</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.visualiser</td>				   
-				  <td>The Visualiser plug-in</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.visualiser.tests</td>
-				  <td>Visualiser tests</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.weaving.jdt</td>
-				  <td>JDT Weaving plugin.  This plugin contains zips of the Equinox Aspects project that is unzip and added to the update site during the build process.  AJDT 1.6+</td>
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.weaving.source</td>
-				  <td>JDT Weaving plugin source code.  AJDT 1.6+</td>
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref.core</td>				   
-				  <td >The Cross References plug-in (non-UI)</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref.core.tests</td>				   
-				  <td>Tests for the above</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref.source</td>				   
-				  <td >The Cross References source code.  AJDT 1.6+</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref.ui</td>				   
-				  <td>The Cross References UI plug-in</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref.ui.tests</td>				   
-				  <td>Tests for the above</td>				   
-				 </tr>
-				 
-				 <tr>
-				   <td colspan="2">Features</td>
-				 </tr>
-
-				 <tr>
-				  <td>org.eclipse.ajdt-feature</td>				   
-				  <td>The AJDT feature</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.weaving-feature</td>				   
-				  <td>Eclipse Weaving service feature (includes JDT Weaving).  AJDT 1.6+</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td>org.eclipse.contribution.xref-feature</td>				   
-				  <td>The Cross References feature</td>				   
-				 </tr>
-				 
-				 <tr>
-				  <td >org.eclipse.aspectj.feature-tests</td>				   
-				  <td>The test feature/td>				   
-				 </tr>
-				 
-				 <tr>
-				   <td colspan="2">Other</td>
-				 </tr>
-
-				 <tr>
-				  <td>UpdateSite</td>
-				  <td>Non-Java project used to build an update site</td>
-				 </tr>
-				</table>    
-		    </p>
-		    </li>
-	
-	    <br><br>
-			
-		<a name="q:versions"></a>
-			
-			<li><em>What do the version numbers mean?</em>
-			  <p>Each Eclipse point release has a corresponding AJDT point release.  Eclipse 3.1 
-				requires AJDT 1.3, Eclipse 3.2 requires AJDT 1.4, Eclipse 3.3 requires AJDT 1.5, 
-				Eclipse 3.4 requires AJDT 1.6, and Eclipse 3.5 requires AJDT 1.7.  Future releases 
-				are expected to follow the same numbering system.</p>
-				<p>In the CVS repository, each point release of AJDT has its own branch.  To do development on a 
-				particular version, you must check out the appropriate branch.  See <a href="#q:cvs">How can 
-				I connect the AJDT CVS repository? </a> 
-				and <a href="#q:cvsbranch">I am looking for the AJDT branch 1.X in the CVS repository, but 
-				I can't find it.  What gives? </a> for more details/p>
-		    </li>
-	
-	    <br><br>
-		<a name="q:cvs"></a>
-			<li><em>How can I connect the AJDT CVS repository and download?</em>
-			  <p>Use the following credentials to connect to the repository anonymously:<br/>
-								
-				<table>
-				<tr><td>connection type:</td><td>pserver</td></tr>
-				<tr><td>user:</td><td>anonymous</td></tr>
-				<tr><td>password:</td><td><em>&lt;blank&gt;</em></td></tr>
-				<tr><td>host:</td><td>dev.eclipse.org</td></tr>
-				<tr><td>path:</td><td>/cvsroot/tools</td></tr>
-				</table>
-			
-			  If you are connecting to the repository from Eclipse, do the following:
-				<ol>
-				<li>Start with a clean workspace under Eclipse 3.3, 3.4, or 3.5
-				<li>Open the CVS Repository Exploring perspective. 
-				<li>Right-click on the CVS Repositories view.
-				<li>Click &ldquo;New&rdquo; &gt; &ldquo;Repository
-			    Location&rdquo;. 
-				<li>Fill in the blanks using the above credentials. 
-				<li>Click &ldquo;Finish&rdquo;.
-			  <li>Use the CVS Repositories view to navigate to
-			    HEAD/org.eclipse.ajdt/AJDT_src. 
-				</ol>
-		    </li>
-  	    </p>
-	
-	    <br><br>
-
-		<a name="q:cvsbranch"></a>
-			<li><em>I am looking for the AJDT branch 1.X in the CVS repository, but I can't find it.  
-					What gives? </em>
-	
-				<p>Each point version of AJDT has its own branch in the CVS repository.  It may not be 
-				initially visible if you are browsing the repository through Eclsipe.</p>
-				
-				<p>To discover a branch, do the following:
-				<ol>
-				<li>Right-click on the <code>org.eclipse.ajdt</code></li>
-				<li>Select &ldquo;Configure Branches and Versions...&rdquo;
-				<li>In the dialog that opens navigate to
-			    AJDT_src/org.aspect.ajde/.project</li>
-				<li>Various tags should appear in
-			    the right hand side of the dialog</li>
-				<li>Press &ldquo;Add Checked Tags&rdquo;, then
-			    &ldquo;OK&rdquo;</li>
-				<li>Back in the CVS Repositories view you should now be able to
-			    navigate to <code>Branches/ajdt1_6/org.eclipse.ajdt ajdt1_6/AJDT_src</code></li>
-				</ol>
-				</p>
-			</li>	
-		<a name="q:develop"></a>
-			<li><em>How do I setup an AJDT development environment in Eclipse?</em>
-			
-			    <p>There are three stages to this: building AJDT, running the
-			    correctness tests, and creating an
-			    Eclipse update site. The first two stages are sufficient
-			    for most purposes.</p>
-			
-			    <h4>Building AJDT</h4>
-			
-				<p>Many of the plugins which implement AJDT contain aspects, and so are
-				AspectJ projects themselves. This means that you first need to install
-				a <em>recent</em> build of AJDT into your development environment from the
-				update site or zip file.</p>
-							
-			    <p>Note also that in order to build AJDT from source you will probably
-			    need to increase the memory available to Eclipse. This is
-			    typically done by passing something like &ldquo;<code>-vmargs -Xmx512m</code>&rdquo; to
-			    the Eclipse launcher.</p>
-			
-			    <p>See <a href="#q:cvs">How can I connect the AJDT CVS repository?</a> for 
-					instructions on how to download the projects from CVS.</p>
-			    
-			    <p>If you are using Eclipse 3.5 you now need to switch to the
-			    &ldquo;ajdt1_7&rdquo; branch in CVS.  See <a href="#q:cvsbranch">
-					I am looking for the AJDT branch 1.X in the CVS repository, but I can&rsquo;t find it.  
-  			  What gives? </a> for information on how to
-					discover this branch.</p>
-					
-				<p>Eclipse 3.4 uses HEAD.</p>
-			    
-			    <p>If you are using Eclipse 3.3 you need to switch
-			    to the &ldquo;ajdt1_5&rdquo; branch instead.</p>
-			    
-			    <p>If you are using Eclipse 3.2 you need to switch
-			    to the &ldquo;ajdt1_4&rdquo; branch instead. Note that 
-					AJDT 1.4 is only <em>lightly</em> supported now (i.e., 
-					there is no ongoing development and only major bugs will 
-					be fixed).</p>
-			    
-			    <p>Select the following projects,
-			    right-click and select &ldquo;Check out&rdquo; from the context menu:</p>
-			 
-			    <ul>
-			      <li>org.aspectj.ajde,</li>
-			      <li>org.aspectj.runtime,</li>
-			      <li>org.aspectj.weaver,</li>
-			      <li>org.eclipse.ajdt.core,</li>
-			      <li>org.eclipse.ajdt.examples,</li>
-			      <li>org.eclipse.ajdt.ui,</li>
-			      <li>org.eclipse.contribution.visualiser,</li>
-			      <li>org.eclipse.contribution.xref.core,</li>
-			      <li>org.eclipse.contribution.xref.ui,</li>
-			      <li>org.eclipse.contribution.weaving.jdt.</li>
-			    </ul>
-			
-			    <p>Eclipse will build the projects as you import them, after
-			    which should you be ready to run the plugins inside Eclipse:</p>
-			
-			   <ul>
-			     <li>Switch to the Java Perspective if you are not already in
-			     it...</li>
-			
-			     <li>From the run menu select &ldquo;Run...&rdquo;</li>
-			
-				 <li>For Eclipse 3.4, choose <em>AJDT 1.6 Weaving</em></li>
-
-				 <li>For Eclipse 3.5, choose <em>AJDT 1.7 Weaving</em></li>
-			
-			     <li>Click &ldquo;Run&rdquo;.  The reason for using predefined launchers is that in order to enable 
-				 JDT Weaving, a custom config.ini is required.</li>
-
-				<li>If weaving is not enabled at startup or if there are any other problems with the runtime workspace, 
-				open up the custom config.ini (org.eclipse.contribution.weaving.jdt/config.ini) and make sure the entries
-				align with your version of Eclipse.  You may need to edit the version number on the <em>osgi.bundles</em>
-				line.</li>
-				
-				<li>If you continue to have problems, please send a message to the mailing list.</em>
-			
-			   </ul>
-			
-			   <h4>Running the correctness tests</h4>
-			
-			   <p>The next step is to add the test projects. These can be used to
-			   verify that everything is okay with your environment and
-			   configuration, plus of course to verify the integrity of any
-			   changes you might make. Switch back to the CVS perspective and
-			   check-out the following projects:</p>
-			
-			   <ul>
-			     <li>org.eclipse.ajdt.core.tests</li>
-			     <li>org.eclipse.ajdt.ui.tests</li>
-			     <li>org.eclipse.ajdt.ui.visual.tests</li>			     
-			     <li>org.eclipse.contribution.visualiser.tests</li>
-			     <li>org.eclipse.contribution.xref.core.tests</li>
-			     <li>org.eclipse.contribution.xref.ui.tests</li>
-			     <li>org.eclipse.contribution.weaving.tests</li>
-			   </ul>
-			
-			   <p>Note that since many of these tests will only pass if JDT Weaving to be enabled, special launch 
-			 	configurations are provided:</p>
-			
-			   <ul>
-				<li>All Weaving Tests---runs the JDT Weaving tests</li>
-				<li>AllUITests_MaxPermSize---runs the AJDT UI tests</li>
-				<li>AllCoreTests No UI---runs the core tests</li>
-				<li>Some UI Tests---runs a sub-set of the UI tests as specified in the java file SomeUITests.java.  Edit this file to run any sub-set of the UI tests.</li>
-				<li>Some Random Test case---allows you to run any single test case of AJDT.  Edit this launch configuration to specify a project and a test case inside of it.  Useful if you are checking only a single test, but don't want to generate a new, custom launch config for it.</li>
-				
-			  </ul>
-			
-			  <p>If you have any problems with the launch configurations, please send a note to the mailing list.</p>
-				
-				
-			  <h4>Trouble Shooting</h4>
-			  <p>
-				If you are having problems starting your runtime workspace or running the tests, specifically, if Eclipse is in an infinite restart loop (see (<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=235006">Bug 235006</a>), then try the following:
-				
-				<ol>
-					<li>Edit org.eclipse.contribution.weaving.jdt/config.ini and comment the line: osgi.framework.extensions=org.eclipse.equinox.weaving.hook</li>
-					<li>Run Eclipse (this will run Eclipse with JDT Weaving disabled).  Some tests will fail and some functionality will not work, but it is possible to test some things in this mode.</li>
-					<li>Shut down Eclipse</li>
-					<li>Uncomment the line from config.ini</li>
-					<li>Restart Eclipse</li>
-				</ol>
-			  </p>
-			
-			   <p>Now you&srquo;re ready to start enhancing the plugins by adding to or
-			   extending the code in your projects - just use run (or debug) to
-			   try out your changes. When you have a patch to submit to the
-			   project, go to the &ldquo;Team&lrquo; item in the project context menu and
-			   select &ldquo;Create Patch...&rdquo;. Naturally the correctness tests should
-			   also be run, and new tests written to accompany fixes or new
-			   features.</p>
-			
-		    </li>
-		
-		<a name="q:packaging"></a>
-			<li><em>How can I package my sample code for contribution to the examples plug-in?</em>
-				<p>
-				    The org.eclipse.ajdt.examples plugin contains various sample projects which 
-				    are made available under
-				    the Examples category of the New wizard, from where they can be imported into 
-				    your workspace as AspectJ projects.
-				    It is easy to add new samples to this plugin, as follows:
-				    <ul>
-				    	<li>Create a jar file containing your source code, and at least one build 
-						configuration file. Place this
-				    		in the archive folder of the examples plugin.
-				    	<li>Add an entry to the plugin.xml file for your sample project, by copying 
-				    	one of the existing entries.
-				    	<li>Change the src attribute of the import element to refer to your jar 
-				    	file, and change the title,
-				    		description, pagetitle, and pagedescription property names as appropriate, and add
-				    		corresponding entries to the plugin.properties file.
-				    	<li>Change the build attribute to refer to your default build configuration 
-				    	file. Your project may contain
-				    	    more configurations but the one specified here will be the one used to 
-				    	    initially build the project.
-				    	<li>Optionally, you can specify an open attribute to the projectsetup element, 
-				    	which refers to a file,
-				    	    such as a README file, which is opened after the project has been imported 
-				    	    to the workspace.   
-				    </ul>
-			    </p>
-		    </li>
-		    
-		    <br><br>
-		<a name="q:extend"></a>
-			<li><em>How can I build tools which extend AJDT?</em>
-		    <p>
-		       See this Eclipsepedia page: <a href="http://wiki.eclipse.org/index.php/Developer%27s_guide_to_building_tools_on_top_of_AJDT_and_AspectJ">Developer&rsquo;s guide to building tools on top of AJDT and AspectJ.</a>
-		    </p>
-		    </li>
-		
-	</ol>
-	
-	</ol>
-
-		<hr class="clearer" />
+	The AJDT Developer's FAQ has moved to <a href="http://wiki.eclipse.org/AJDT_Developer_FAQ">Eclipsepedia</a>.  Please update your bookmarks.
 	</div>
 
 	$rightcolumn
diff --git a/faq.php b/faq.php
index 812a675..46b49db 100644
--- a/faq.php
+++ b/faq.php
@@ -33,405 +33,7 @@
 
 <div id="maincontent">
 	<div id="midcolumn">
-	
-	<h1>Frequently Asked Questions</h1>
-
-		<ol>
-		<li> Overview
-			<ol>
-	  			<li><a href="#q:whatisajdt">What is AJDT?</a> </li>
-	  			<li><a href="#q:whodevelops">Who develops AJDT?</a> </li>
-	  			<li><a href="#q:aspectj">How does AJDT relate to the AspectJ project?</a> </li>
-			</ol>
-		</li>
-		
-		<li> Community
-			<ol>
-	  			<li><a href="#q:mailinglists">Is there an AJDT mailing list?</a> </li>
-	  			<li><a href="#q:newsgroups">Are there any newsgroups for AJDT users?</a> </li>
-	  			<li><a href="#q:bugs">What do I do if I think I've found a bug in AJDT?</a> </li>
-	  			<li><a href="#q:features">How can I request a new feature in AJDT?</a> </li>
-			</ol>
-		</li>
-
-		<li> Using AJDT
-			<ol>
-				<li><a href="#q:version">What version of AJDT do I need?</a> </li>
-	  			<li><a href="#q:keywords">Why aren't AspectJ keywords highlighted in the editor?</a> </li>
-	  			<li><a href="#q:debug">How can I debug AspectJ programs in Eclipse?</a> </li>
-	  			<li><a href="#q:breakpoints">Why don't breakpoints in around advice work?</a> </li>
-	  			<li><a href="#q:visualiser">How does the Visualiser work?</a> </li>
-	  			<li><a href="#q:errors">Why do I sometimes see errors in the editor but not in the problems view?</a> </li>
-	  			<li><a href="#q:ajfiles">What are the limitations of the AspectJ Editor?</a> </li>
-	  			<li><a href="#q:aspectsinjava">What happens if I write my aspects in .java files?</a> </li>
-	  			<li><a href="#q:ant">How do I use Ant to build my AspectJ projects in AJDT?</a> </li>	 
-	  			<li><a href="#q:upgrade">Can I upgrade my AspectJ version?</a> </li>
-			</ol>
-		</li>
-
-		<li> Extending
-		  <ol>
-		    <li><a href="#q:extend">How can I build tools which extend AJDT?</a> </li>
-		  </ol>
-		</li>
-
-		<li> Contributing
-			<ol>
-	  			<li><a href="#q:contribute">How can I contribute to the AJDT project?</a> </li>
-	  			<li><a href="#q:source">Where will I find the source for AJDT? </a> </li>
-	  			<li><a href="#q:develop">How do I setup an AJDT development environment in Eclipse? </a> </li>
-	  			<li><a href="#q:packaging">How can I package my sample code for contribution to the examples plug-in?</a> </li>
-			</ol>
-		</li>
-
-		<li> Plans
-			<ol>	  			
-			    <li><a href="#q:future">Where do I find out about future releases of AJDT?</a> </li>
-	  			<li><a href="#q:next">What new AJDT features are being worked on at the moment?</a> </li>
-	 		</ol>
-	 	</li>
-	</ol>
-	
-	<hr>
-	
-	<h2>Overview</h2>
-		<ol>
-		
-		<a name="q:whatisajdt"></a>
-			<li><em>What is AJDT?</em>
-		    <p>
-		      The <a href="http://www.eclipse.org/ajdt">AspectJ Development Tools project (AJDT)</a>
-		      is a set of plug-ins for Eclipse that provide support for aspect-oriented software development 
-		      using <a href="http://www.eclipse.org/aspectj">AspectJ</a> within the Eclipse IDE.
-		    </p>
-		    </li>
-	
-		<a name="q:whodevelops"></a>
-			<li><em>Who develops AJDT?</em>
-			<p>
-		      AJDT is an open-source project hosted on eclipse.org, 
-			 <a href="http://www.eclipse.org/ajdt/contributors.php">current contributors</a> 
-		      are listed on the website. Anyone can get involved, see
-		      <a href="#q:contribute">How can I contribute to the AJDT project?</a>
-		    </p>
-		    </li>
-	
-		<a name="q:aspectj"></a>		
-			<li><em>How does AJDT relate to the AspectJ project?</em>
-			<p>
-		      AJDT provides Eclipse IDE integration for AspectJ, and includes the AJDE 
-		      (AspectJ Development Environment) libraries from the AspectJ project as part of its
-		      packaging. Development of the AspectJ compiler and AJDE takes place under the 
-		      <a href="http://www.eclipse.org/aspectj">AspectJ project</a>. 
-		    </p>
-		    </li>
-		</ol>
-	
-	<h2>Community</h2>
-	<ol>
-		<a name="q:mailinglists"></a>
-			<li><em>Is there an AJDT mailing list?</em>
-			<p>
-			     AJDT has a developers mailing list, <a href="mailto:ajdt-dev@dev.eclipse.org">ajdt-dev@dev.eclipse.org</a>, 
-			     with 
-			     <a href="http://dev.eclipse.org/mailman/listinfo/ajdt-dev">archives and subscription information</a> 
-			     available online. Questions regarding the use of AspectJ the language are best 
-			     directed to the 
-			     <a href="http://www.eclipse.org/aspectj/resources.php">AspectJ users mailing list</a>.
-		    </p>
-		    </li>		
-		
-		<a name="q:newsgroups"></a>
-			<li><em>Are there any newsgroups for AJDT users?</em>
-			<p>
-				AJDT is supported through the 
-			     <a href="news://eclipse.org/eclipse.technology.ajdt">eclipse.technology.ajdt</a> 
-			     newsgroup. A 
-			     <a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.ajdt">web interface</a> 
-			     is also available.
-		    </p>
-		    </li>
-		
-		<a name="q:bugs"></a>
-			<li><em>What do I do if I think I've found a bug in AJDT?</em>
-			<p>
-			     First check the 
-			     <a href="http://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=product&type0-0-0=substring&value0-0-0=AJDT&field0-0-1=component&type0-0-1=substring&value0-0-1=AJDT&field0-0-2=short_desc&type0-0-2=substring&value0-0-2=AJDT&field0-0-3=status_whiteboard&type0-0-3=substring&value0-0-3=AJDT">
-			     bug database</a> to see if you've hit a known problem. If it appears to be a 
-			     genuinely new bug, please submit a 
-			     <a href="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT">bug report on AJDT using bugzilla</a>
-			     following the 
-			     <a href="http://bugs.eclipse.org/bugs/bugwritinghelp.html">bug reporting guidelines</a>.
-			      
-			    </p>
-			    <p>
-			     Extra useful information to include in an AJDT bug report:
-			     <ul>
-			       <li>Information from the AJDT Event Trace view. This view displays a lot of diagnositc
-			           information about the execution of the plug-in, for example, it will show
-			           you the exact classpaths being used for compilation, the time spent in the
-			           compiler. To open the AJDT Event Trace go to <b>Window &gt Show view
-			           &gt Other... &gt AspectJ &gt AJDT Event Trace</b>.</li>
-			     </ul> 
-		    </p>
-		    </li>
-		
-		<a name="q:features"></a>
-			<li><em>How can I request a new feature in AJDT?</em>
-			<p>
-				Informal requests can be posted to the <a href="news://eclipse.org/eclipse.technology.ajdt">newsgroup</a> 
-			     or <a href="mailto:ajdt-dev@dev.eclipse.org">mailing list.</a> Formal requests can 
-			     be made by raising an 
-			     <a href="http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AJDT&version=unspecified&priority=P3&bug_severity=enhancement&bug_status=NEW&assigned_to=&cc=&bug_file_loc=&short_desc=&comment=&maketemplate=Remember+values+as+bookmarkable+template&form_name=enter_bug">AJDT enhancement request</a>
-			     on Bugzilla.
- 		    </p>
-		    </li>
-		
-	</ol>
-
-	<h2>Using AJDT</h2>
-		<ol>
-		<a name="q:version"></a>
-			<li><em>What version of AJDT do I need?</em>
-		    <p>
-		    The recommended version of AJDT depends on the version of Eclipse that you are using.  Eclipse 3.4 requires AJDT 1.6, 
-		    Eclipse 3.3 requires AJDT 1.5, and Eclipse 3.2 requires AJDT 1.4 (etc.).  Typically, the latest development version is
-		    just as stable as our official releases (we never release anything unless anything unless it passes all tests).  You can find
-		    the latest development release as well as all of the official AJDT release from the 
-		    <a href="eclipse.org/ajdt/downloads">AJDT downloads page</a>. 
-		    </p>
-		    </li>
-		    
-		<a name="q:keywords"></a>
-			<li><em>Why aren't AspectJ keywords highlighted in the editor?</em>
-		    <p>
-		      The most common cause of this problem is having AspectJ constructs 
-		      in Java files (files with the .java extension) and using the JDT's 
-		      Java Editor. Aspects and AspectJ constructs should be contained in .aj 
-		      files which are opened with the AspectJ Editor, an extension to the 
-		      Java Editor.
-		    </p>
-		    </li>
-	
-		<a name="q:debug"></a>
-			<li><em>How can I debug AspectJ programs in Eclipse?</em>
-			<p>
-		      AspectJ programs can be run in the debugger in the same way as Java 
-		      programs. The tools enable the user to step into, through and out of 
-		      advice. The AspectJ development tools also provide the facility to set 
-		      breakpoints in aspects.
-		    </p>
-		    </li>
-	
-		<a name="q:breakpoints"></a>
-			<li><em>Why don't breakpoints in around advice work?</em>
-			<p>
-		      Around advice is inlined by the weaver by default, which
-		      means that breakpoints set in the declaring aspect are
-		      not detected.  To disable inlining
-		      select <strong>Window &gt; Preferences &gt; AspectJ &gt; Compiler</strong> (Windows/Linux),
-		      or <strong>Eclipse &gt; Preferences &gt; AspectJ &gt; Compiler</strong> (Mac).
-		      Select the <strong>Advanced</strong> tab, then check <strong>No inline</strong>
-		      and click <strong>OK</strong> to apply.
-		    </p>
-		    </li>
-	
-		<a name="q:visualiser"></a>
-			<li><em>How does the Visualiser work?</em>
-			<p>
-		      The Visualiser is an extensible Eclipse plug-in that can be used to 
-		      visualize anything that lends itself to a 'bars and stripes' style 
-		      representation. In AJDT the Visualiser is used to show how aspects 
-			  affect a project.  See the <a href="http://www.eclipse.org/ajdt/visualiser">
-			  Visualiser web page</a> for more information.
-		    </p>
-		    </li>
-	
-		<a name="q:errors"></a>
-			<li><em>Why do I sometimes see errors in the editor but not in the problems view?</em>
-			<p>
-				By default the AspectJ editor is used for files with the .aj extension and the Java editor
-				 for files with the .java extension. Some experienced AspectJ users may wish to use AspectJ 
-				 function in .java files such as referring to ITD methods or fields, using inner aspects, 
-				 implementing interfaces defined in aspects or calling methods on aspects. In this case you 
-				 will see errors in the Java editor (although there will not be errors in the problems view). 
-				 You may wish to either convert the file extension to .aj or use the AspectJ editor.
-		    </p>
-			<p> To open a
-				.java file with the AspectJ editor right click, then select <strong>Open With 
-				&gt; AspectJ/Java Editor</strong>.  To use the AspectJ editor for all .java files
-				select <strong>Window &gt; Preferences &gt; General &gt; File Associations</strong> (Windows/Linux),
-		      or <strong>Eclipse &gt; Preferences &gt; General &gt; File Associations</strong> (Mac).
-				Select <em>.java</em> in the right-hand window, then use the section below to change the 
-				default editor.
-			</p>
-		    </li>	
-
-		<a name="q:ajfiles"></a>
-			<li><em>What are the limitations of the AspectJ Editor?</em>
-			<p>
-			Although similar, using the AspectJ editor is not exactly the same as using a Java editor.
-			Besides an AspectJ editor providing AspectJ-related capabilities, there is some functionality that it does not 
-			provide, but the Java editor does.  For example, override/implement gutter markers are not shown.
-		    </p>
-		    <p>
-			If there is some functionality that is missing from AspectJ editors that is present in Java editors, please 
-			mention it on the mailing list or raise a bug for it.
-		    </p>
-		    </li>
-	
-		<a name="q:aspectsinjava"></a>
-			<li><em>What happens if I write my aspects in .java files?</em>
-			<p>
-				AJDT does not support aspects written in .java files. Although
-				the compiler will compile them correctly, you will find some
-				loss of functionality in AJDT if you do use .java files for your aspects: 
-				
-				<ul>
-					<li>The Outline and Package Explorer views will not show aspects or their contents.</li>
-					<li>The Cross References view will not show any information for an aspect in a .java file, although it will
-					show information for any classes advised by that aspect.</li>		
-				</ul>
-		    </p>
-		    </li>	
-		    
-		<a name="q:ant"></a>
-			<li><em>How do I use Ant to build my AspectJ projects in AJDT? </em>
-			<p>
-		     To use Ant to build an AspectJ project you need to use the iajc Ant task instead of the javac task.
-		     The definition of this is found in ajde.jar in the org.aspectj.ajde plug-in.  In addition you will
-		     need some other plug-ins on the classpath.  A simple example written for Eclipse 3.2.1 is shown below.  
-		     Note that paths and version numbers will be different on different machines and different Eclipse versions.
-		     Using Ant independently from Eclipse will be slightly different - see the 
-		     <a href="http://www.eclipse.org/aspectj/doc/released/devguide/antTasks-iajc.html">AspectJ development guide</a> for more details
-		     and for more information about the iajc Ant task.
-		    </p>
-		    
-		    <p><code>
-			&lt;?xml version="1.0" encoding="UTF-8"?&gt;<br><br>
-			&lt;project name="My Project" default="build" basedir="."&gt;<br><br>				
-							
-			&lt;target name="init"&gt;<br>
-		&nbsp;&nbsp;&lt;path id="ajde.classpath"&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.resources_3.2.1.R32x_v20060914.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.runtime.compatibility_3.1.100.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.osgi_3.2.1.R32x_v20060919.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.jobs_3.2.0.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.equinox.registry_3.2.1.R32x_v20060814.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.equinox.preferences_3.2.1.R32x_v20060717.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.contenttype_3.2.0.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.v20060601.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.update.configurator_3.2.1.v20092006.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.ant.core_3.1.100.v20060531.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.variables_3.1.100.v20060605.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.expressions_3.2.1.r321_v20060721.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.filesystem_1.0.0.v20060603.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.text_3.2.0.v20060605-1400.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.aspectj.ajde_1.5.3.200610201049/ajde.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.aspectj.weaver_1.5.3.200610201049/aspectjweaver.jar"/&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;pathelement path="../../plugins/org.aspectj.runtime_1.5.3.200610201049/aspectjrt.jar"/&gt;<br>
-		&nbsp;&nbsp;&lt;/path&gt;<br>
-		&nbsp;&nbsp;&lt;taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;classpath refid="ajde.classpath" /&gt;<br>
-		&nbsp;&nbsp;&lt;/taskdef&gt;<br>
-	&lt;/target&gt;<br><br>
-	
-	&lt;target name="build" depends="init"&gt;<br>
-		&nbsp;&nbsp;&lt;delete dir="${basedir}/bin"/&gt;<br>
-		&nbsp;&nbsp;&lt;mkdir dir="${basedir}/bin"/&gt;<br>
-		&nbsp;&nbsp;&lt;path id="user.classpath"&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;!-- add additional classpath entries here --&gt;<br>
-		&nbsp;&nbsp;&lt;/path&gt;<br>
-		&nbsp;&nbsp;&lt;!-- read additional ajc options from a file if required --&gt;<br>
-		&nbsp;&nbsp;&lt;property name="ajcArgFile" value=""/&gt;<br>
-		&nbsp;&nbsp;&lt;!-- fork the compiler --&gt;<br>
-		&nbsp;&nbsp;&lt;iajc destDir="${basedir}/bin" failonerror="true" argfiles="${ajcArgFile}"<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;verbose="true" fork="true" maxmem="512m"&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;forkclasspath refid="ajde.classpath" /&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;forkclasspath refid="user.classpath" /&gt;<br>
-		&nbsp;&nbsp;	&nbsp;&nbsp;&lt;src path="src/"/&gt;<br>
-		&nbsp;&nbsp;&lt;/iajc&gt;<br>
-		&lt;/target&gt;<br><br>				
-			&lt;/project&gt;		<br><br>    
-
-			</code></p>
-		    </li>	
-		    
-		<a name="q:upgrade"></a>
-			<li><em>Can I upgrade my AspectJ version?</em>
-			<p>
-		      Upgrading the AspectJ version in an install of AJDT is not generally recommended because it is likely that
-		      different releases will not be compatible with each other. However we do plan to
-		      provide some scripts in the near future that will upgrade your AspectJ to a higher compatible version if available.
-		    </p>
-		    </li>	
-	</ol>	
-		
-		
-	<h2>Extending</h2>
-	<ol>
-		<a name="q:extend"></a>
-			<li><em>How can I build tools which extend AJDT?</em>
-		    <p>
-		       See this Eclipsepedia page: <a href="http://wiki.eclipse.org/index.php/Developer%27s_guide_to_building_tools_on_top_of_AJDT_and_AspectJ">Developer's guide to building tools on top of AJDT and AspectJ.</a>
-		    </p>
-		    </li>
-		
-	</ol>
-	
-	<h2>Contributing</h2>
-	<ol>
-		<a name="q:contribute"></a>
-			<li><em>How can I contribute to the AJDT project?</em>
-		    <p>
-		       See the <a href="developers.php">Developer FAQ</a>
-		    </p>
-		    </li>
-
-		<a name="q:source"></a>
-			<li><em>Where will I find the source for AJDT?</em>
-			<p>
-		       See the <a href="developers.php">Developer FAQ</a>
-			</p>
-			</li>
-				
-		<a name="q:develop"></a>
-			<li><em>How do I setup an AJDT development environment in Eclipse?</em>
-			<p>
-		       See the <a href="developers.php">Developer FAQ</a>
-			</p>
-		    </li>
-		
-		<a name="q:packaging"></a>
-			<li><em>How can I package my sample code for contribution to the examples plug-in?</em>
-				<p>
-		           See the <a href="developers.php">Developer FAQ</a>
-			    </p>
-		    </li>
-	</ol>
-
-	<h2>Plans</h2>
-		<ol>
-		
-		<a name="q:future"></a>
-			<li><em>Where do I find out about future releases of AJDT?</em>
-		    <p>
-		       See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=tools.ajdt">plans</a> page for information about future releases.
-			</p>
-		    </li>		
-		
-		<a name="q:next"></a>
-			<li><em>What new AJDT features are being worked on at the moment?</em>
-		    <p>
-				Look for <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=AJDT&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">open AJDT bugs</a> in bugzilla or ask a question to the mailing list.  We are a friendly bunch and are 
-				happy to answer your questions.
-		    </p>
-		    </li>
-
-		<hr class="clearer" />
+		The AJDT FAQ has moved to <a href="http://wiki.eclipse.org/FAQ_for_AJDT">Eclipsepedia</a>.  Please update your bookmarks.
 	</div>
 
 	$rightcolumn