Merge branch 'correct-broken-links-in-committer-faq' into 'master'

Bug 465241 - Correct broken links in committer FAQ

See merge request !1

faq/CommitterFAQ.xml

@@ -10,17 +10,19 @@
   <category name="Website"/>
   <entry id="git_1" category="Build/Git">
     <question>Where are the source code repositories for the webtools project?</question>
-	<answer>WTP's source code repositories are hosted on Eclipse.org and accessed through Gerrit. The following pages allow browsing the repositories and list the current cloning URLs at the bottom of the respective pages:<br/>
-	<a href="https://git.eclipse.org/c/gerrit/webtools-common/webtools.common.git">webtools.common</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/dali/webtools.dali.git">webtools.dali</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/jeetools/webtools.javaee.git">webtools.javaee</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/jsdt/webtools.jsdt.git">webtools.jsdt</a><br/>
+	<answer>Most of WTP's source code repositories are hosted on Eclipse.org and accessed through Gerrit. The following pages allow browsing the repositories and list the current cloning URLs at the bottom of the respective pages:<br/>
+	<a href="https://git.eclipse.org/c/webtools-common/webtools.common.git">webtools.common</a><br/>
+	<a href="https://git.eclipse.org/c/dali/webtools.dali.git">webtools.dali</a><br/>
+	<a href="https://git.eclipse.org/c/jeetools/webtools.javaee.git">webtools.javaee</a><br/>
 	<a href="https://git.eclipse.org/c/jsf/webtools.jsf.git">webtools.jsf</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/servertools/webtools.servertools.git">webtools.servertools</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/sourceediting/webtools.sourceediting.git">webtools.sourceediting</a><br/>
-	<a href="https://git.eclipse.org/c/gerrit/webservices/webtools.webservices.git">webtools.webservices</a><br/>
+	<a href="https://git.eclipse.org/c/servertools/webtools.servertools.git">webtools.servertools</a><br/>
+	<a href="https://git.eclipse.org/c/sourceediting/webtools.sourceediting.git">webtools.sourceediting</a><br/>
+	<a href="https://git.eclipse.org/c/webservices/webtools.webservices.git">webtools.webservices</a><br/>
     <br/>
-    All of the repositories are controlled by <a href="https://wiki.eclipse.org/WTP_Gerrit_Access">Gerrit</a>.
+    The repositories at Eclipse.org are controlled by <a href="https://wiki.eclipse.org/WTP_Gerrit_Access">Gerrit</a>.
+    <br/>
+    Some repositories have been moved to GitHub:<br/>
+    <a href="https://github.com/eclipse-jsdt/webtools.jsdt">webtools.jsdt</a>
 	</answer>
   </entry>
   <entry id="website_1" category="Website">
@@ -33,7 +35,7 @@
   <entry id="website_2" category="Website">
     <question>How do I update the WTP website?</question>
     <answer>
-	The web site is itself hosted within a git repository, whose page can be found <a href="https://git.eclipse.org/c/www.eclipse.org/webtools.git/">here</a>. Updates pushed to it are not made live immediately, but periodically published within a matter of minutes.
+	The web site is itself hosted within a git repository, whose page can be found <a href="https://gitlab.eclipse.org/eclipse/webtools/webtools-website">here</a>. Updates pushed to it are not made live immediately, but periodically published within a matter of minutes.
     </answer>
   </entry>
   <entry id="general_1" category="General">
@@ -243,7 +245,7 @@
     			<li>
     					Add your plug-in to the appropriate feature.xml. Features are typically in their own directory.
                         For example, for Common you can find features
-    					under the top-level <code>features</code> <a href="https://git.eclipse.org/c/gerrit/webtools-common/webtools.common.git/tree/features">directory</a>.
+    					under the top-level <code>features</code> <a href="https://git.eclipse.org/c/webtools-common/webtools.common.git/tree/features">directory</a>.
               <b>Your plug-in will need its requirements to be provided in the feature or that feature's dependencies.</b>
     			</li>
     			<li>