Author: smumford Date: 2012-12-04 23:55:31 -0500 (Tue, 04 Dec 2012) New Revision: 8978 Modified: epp/docs/branches/6.0/Reference_Guide/en-US/Revision_History.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml Log: Resolved svn conflict Modified: epp/docs/branches/6.0/Reference_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/Revision_History.xml 2012-12-04 07:06:38 UTC (rev 8977) +++ epp/docs/branches/6.0/Reference_Guide/en-US/Revision_History.xml 2012-12-05 04:55:31 UTC (rev 8978) @@ -7,6 +7,20 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>6.0.0-22</revnumber> + <date>Fri Nov 30 2012</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email></email> + </author> + <revdescription> + <simplelist> + <member>BZ#807499: Added SME approved content regarding advanced WCI registration features.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>6.0.0-23</revnumber> <date>Tue Dec 04 2012</date> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2012-12-04 07:06:38 UTC (rev 8977) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2012-12-05 04:55:31 UTC (rev 8978) @@ -87,10 +87,10 @@ <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> ]]></programlisting> - </listitem> - </varlistentry> - </variablelist> - </section> + </listitem> + </varlistentry> + </variablelist> + </section> </section> <section id="sect-Reference_Guide-Portal_Life_cycle-The_Command_Servlet"> <title>The Command Servlet</title>