more doc updates
diff --git a/src/site/xdoc/docs/WS_policy.xml b/src/site/xdoc/docs/WS_policy.xml
index 382de99..d4b31f3 100644
--- a/src/site/xdoc/docs/WS_policy.xml
+++ b/src/site/xdoc/docs/WS_policy.xml
@@ -179,7 +179,7 @@
<li>Sanka Samaranayake, March 2006. <a href=
"http://wso2.org/library/23">Web services Policy - Why, What & How</a></li>
<li><a href=
-"http://svn.apache.org/viewcvs.cgi/webservices/commons/trunk/modules/neethi/">WS-commons/policy SVN</a></li>
+"https://github.com/apache/ws-neethi">WS-commons/policy GitHub</a></li>
<li><a href=
"http://specs.xmlsoap.org/ws/2004/09/policy/ws-policy.pdf">Web Services Policy Framework (WS-Policy)</a></li>
</ul>
diff --git a/src/site/xdoc/docs/builder-formatter.xml b/src/site/xdoc/docs/builder-formatter.xml
index a284a7e..ff4debc 100644
--- a/src/site/xdoc/docs/builder-formatter.xml
+++ b/src/site/xdoc/docs/builder-formatter.xml
@@ -56,7 +56,7 @@
<h4>Step1 : MessageBuilder implementation</h4>
<!--<p>LoggingModule is the implementation class of the Axis2 module.-->
<!--Axis2 modules should implement the "<a href=-->
-<!--"http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java?rev=396785&view=log">org.apache.axis2.modules.Module</a>"-->
+<!--"https://github.com/apache/axis-axis2-java-core/blob/master/modules/kernel/src/org/apache/axis2/modules/Module.java">org.apache.axis2.modules.Module</a>"-->
<!--interface with the following methods.</p>-->
<!--<pre>-->
<!--public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault;//Initialize the module-->
diff --git a/src/site/xdoc/docs/modules.xml b/src/site/xdoc/docs/modules.xml
index ea7f872..3d80244 100644
--- a/src/site/xdoc/docs/modules.xml
+++ b/src/site/xdoc/docs/modules.xml
@@ -102,7 +102,7 @@
<h4>Step1 : LoggingModule Class</h4>
<p>LoggingModule is the implementation class of the Axis2 module.
Axis2 modules should implement the "<a href=
-"http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java?rev=396785&view=log">org.apache.axis2.modules.Module</a>"
+"https://github.com/apache/axis-axis2-java-core/blob/master/modules/kernel/src/org/apache/axis2/modules/Module.java">org.apache.axis2.modules.Module</a>"
interface with the following methods.</p>
<pre>
public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault;//Initialize the module
@@ -125,9 +125,9 @@
<a href="Axis2ArchitectureGuide.html#incomingsoap"
>Architecture Guide</a> for more information on phases). To
write a handler one should implement <a href=
-"http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Handler.java?rev=357187&view=log">
+"https://github.com/apache/axis-axis2-java-core/blob/master/modules/kernel/src/org/apache/axis2/engine/Handler.java">
org.apache.axis2.engine.Handler</a>. But for convenience, <a href=
-"http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/handlers/AbstractHandler.java?rev=396788&view=log">
+"https://github.com/apache/axis-axis2-java-core/blob/master/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java">
org.apache.axis2.handlers.AbstractHandler</a> provides an abstract
implementation of the Handler interface.</p>
<p>For the logging module, we will write a handler with the
diff --git a/src/site/xdoc/docs/userguide-samples.xml b/src/site/xdoc/docs/userguide-samples.xml
index 3b2bd3c..ae6b04e 100644
--- a/src/site/xdoc/docs/userguide-samples.xml
+++ b/src/site/xdoc/docs/userguide-samples.xml
@@ -41,6 +41,8 @@
hood?</a></li>
<li><a href="userguide.html#handlessoap">How Axis2 handles SOAP
messages</a></li>
+<li><a href="userguide.html#handlesjson">How Axis2 handles JSON
+messages</a></li>
<li><a href="userguide.html#distributions">Axis2
distributions</a></li>
<li><a href="userguide.html#sbd">The Axis2 Standard Binary
diff --git a/src/site/xdoc/docs/userguide.xml b/src/site/xdoc/docs/userguide.xml
index c9a130c..ca543a8 100644
--- a/src/site/xdoc/docs/userguide.xml
+++ b/src/site/xdoc/docs/userguide.xml
@@ -54,6 +54,8 @@
hood?</strong></a></li>
<li><a href="userguide.html#handlessoap"><strong>How Axis2 handles
SOAP messages</strong></a></li>
+<li><a href="userguide.html#handlesjson">How Axis2 handles JSON
+messages</a></li>
<li><a href="userguide.html#distributions"><strong>Axis2
Distributions</strong></a></li>
<li><a href="userguide.html#sbd"><strong>The Axis2 Standard Binary
@@ -202,6 +204,20 @@
Axis2 system. These modules, such as Rampart, which provides an
implementation of WS-Security, are the main extensibility
mechanisms in Axis2.</p>
+<a name="handlesjson" id="handlesjson"></a>
+<h2>How Axis2 Handles JSON Messages</h2>
+<p>Axis2 with REST provides GSON or the newer Moshi library as the JSON parser.
+With the proper axis2.xml configuration, this support is triggered by the HTTP header
+"Content-Type: application/json". </p>
+<p>More docs concerning Axis2 and JSON can be found in the <a href="
+json_support_gson.html">Pure JSON Support</a> and <a href="
+json_gson_user_guide.html">JSON User Guide.</a>
+</p>
+<p>
+For users of JSON and Spring Boot - or anyone interesed in a complete JSON example that
+includes Spring Security - see the sample application in the <a href=
+"json-springboot-userguide.html">JSON and Spring Boot User's Guide.</a>
+</p>
<a name="distributions" id="distributions"></a>
<h2>Axis2 Distributions</h2>
<p>Axis2 is released in several <a href="../download.cgi">
