Merged V2.0 to HEAD

5497: cwd variable and forminstancedata
   5512: AR-1303 MLPropertyInterceptor
   5527: CIFS invalid characters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/web/jsp/wcm/output-path-pattern-help.jsp

@@ -18,10 +18,12 @@
    <tbody>
       <tr><td><tt style="font-weight:bold;">name</td></tt><td>The name of the form instance data as entered by the user in the create web content wizard.</td></tr>
       <tr><td><tt style="font-weight:bold;">webapp</td></tt><td>The name of the webapp in which the form instance data is being created.  Typically, if specifying an absolute output path pattern, the path will begin with the webapp folder (i.e. <tt>/&#36;{webapp}/...</tt>)</td></tr>
+      <tr><td><tt style="font-weight:bold;">cwd</td></tt><td>The webapp relative path in which the form is being created.</td></tr>
       <tr><td><tt style="font-weight:bold;">extension</td></tt><td>The default extension associated with the mime-type configured for the rendering engine template.  This variable is only available for rendition ouput path patterns.</td></tr>
       <tr><td><tt style="font-weight:bold;">xml</td></tt><td>The xml instance data collected by the form.</td></tr>
       <tr><td><tt style="font-weight:bold;">node</td></tt><td>The form instance data node.  This variable is only available for rendition ouput path patterns.</td></tr>
       <tr><td><tt style="font-weight:bold;">date</td></tt><td>The current date at which the form instance data is being saved.  Refer to the <a style="color:blue;" href="http://freemarker.sourceforge.net/docs/ref_builtins_date.htm">FreeMarker date reference</a> for more information.</td></tr>
+
    </tbody>
 </table>
 <br/>