diff --git a/aspectj/xdocs/index.xml b/aspectj/xdocs/index.xml
index a39ff34e..cdf613f9 100644
--- a/aspectj/xdocs/index.xml
+++ b/aspectj/xdocs/index.xml
@@ -49,17 +49,14 @@
     <section name="Installing">
       <p>
         To install or update the plugin do the following:<br/>
-        <code>maven plugin:download -DgroupId=maven -DartifactId=maven-aspectj-plugin -Dversion=&lt;version&gt;</code>
       </p>
+      <source>maven plugin:download -DgroupId=maven -DartifactId=maven-aspectj-plugin -Dversion=&lt;version&gt;</source>
     </section>
 
     <section name="Compiling aspect sources">
       <p>You must add the property aspectSourceDirectory in your project.xml</p>
-      <source>
-          <![CDATA[
-          <aspectSourceDirectory>src/aspectj</aspectSourceDirectory>
-          ]]>
-      </source>
+      <source><![CDATA[
+          <aspectSourceDirectory>src/aspectj</aspectSourceDirectory>]]></source>
     </section>
 
     <section name="Using aspects from other libraries">
@@ -68,8 +65,7 @@
       specifying meta-information in the POM, using the
       <code>aspectj.weaveWith</code> property 
       </p>
-      <source>
-          <![CDATA[
+      <source><![CDATA[
           <dependency>
             <groupId>groupid</groupId>
             <artifactId>jarid</artifactId>
@@ -77,9 +73,7 @@
             <properties>
               <aspectj.weaveWith>true</aspectj.weaveWith>
             </properties>
-          </dependency>
-          ]]>
-      </source>
+          </dependency>]]></source>
     </section>
 
     <section name="Weaving classes from other libraries">
@@ -88,8 +82,7 @@
       specifying meta-information in the POM, using the
       <code>aspectj.weaveInto</code> property 
       </p>
-      <source>
-         <![CDATA[
+      <source><![CDATA[
           <dependency>
             <groupId>groupid</groupId>
             <artifactId>jarid</artifactId>
@@ -97,9 +90,7 @@
             <properties>
                 <aspectj.weaveInto>true</aspectj.weaveInto>
             </properties>
-          </dependency>
-          ]]>
-      </source>
+          </dependency>]]></source>
       <p>The jar contents, with classes weaved, are extracted to maven.build.dest.</p>
     </section>
 
@@ -109,8 +100,7 @@
       gets included in the file. You shouldn't need to add it for
       other operations.
       </p>
-      <source>
-          <![CDATA[
+      <source><![CDATA[
            <dependency>
              <groupId>aspectj</groupId>
              <artifactId>aspectjrt</artifactId>
@@ -119,36 +109,27 @@
              <properties>
                 <war.bundle>true</war.bundle>
              </properties>
-           </dependency>
-          ]]>
-      </source>
+           </dependency>]]></source>
     </section>
     
     <section name="Calling AspectJ goal automatically">
       <p>If you want to call the aspectj goal every time you compile
       add the following to your maven.xml file.
       </p>
-      <source>
-         <![CDATA[
+      <source><![CDATA[
            <preGoal name="java:compile">
              <attainGoal name="aspectj"/>
-           </preGoal>
-         ]]>
-      </source>
+           </preGoal>]]></source>
       <p>If you don't want to weave test classes use the following code instead.
       </p>
-      <source>
-         <![CDATA[
+      <source><![CDATA[
            <preGoal name="java:compile">
              <attainGoal name="aspectj:compile"/>
-           </preGoal>
-         ]]>
-      </source>
+           </preGoal>]]></source>
     </section>
 
     <section name="Sample project">
-      <source>
-          <![CDATA[
+      <source><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
@@ -204,9 +185,7 @@
         <aspectSourceDirectory>src/aspectj</aspectSourceDirectory>
     </build>
 
-</project>
-          ]]>
-      </source>
+</project>]]></source>
     </section>
 
  </body>
diff --git a/aspectj/xdocs/properties.xml b/aspectj/xdocs/properties.xml
index 182f437c..f8f3fa9d 100644
--- a/aspectj/xdocs/properties.xml
+++ b/aspectj/xdocs/properties.xml
@@ -174,6 +174,7 @@
           <td>
             If true, produce binaries that can only be used as input for the <code>-injars</code> or <code>-inpath</code> option.
             Defaults to <code>false</code>.
+            <strong>Note</strong>: this option has been deprecated in AspectJ 5.
           </td>
         </tr>