Merged V2.2 to HEAD

7495: Various fixes for restriction in WCM File Picker
         Fixed line endings


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

config/alfresco/web-client-config-wcm.xml

@@ -86,25 +86,21 @@
                    javascript-class-name="alfresco.xforms.FilePicker">
              <param name="selectable_types">wcm:avmcontent,wcm:avmfolder</param>
              <!-- 
-                Uncomment parameter and set to absolute path of AVM folder to 
+                Uncomment parameter and set to relative path of AVM folder 
-                restrict file picker to.
+                to restrict file picker to.
-             <param name="folder_restriction">some-absolute-AVM-folder-path</param>
+                
+             <param name="folder_restriction">some-relative-folder-path</param>
              -->
            </widget>
            <widget xforms-type="xf:upload" 
                    appearance="search_restricted_file_picker"
                    javascript-class-name="alfresco.xforms.FilePicker">
              <!-- 
-                Uncomment parameter and set to name of a saved 
+                Uncomment parameter and set to name of a configured 
                 search. The file picker will be restricted to the results 
-                of this saved search
+                of this configured search
-             <param name="saved_search_name">some-search-name</param>
+                
-             -->
+             <param name="config_search_name">some-configured-search-name</param>
-             <!--
-                Uncomment and set to user or global. If set to user, then named saved search
-                is retrieved from the current user's saved search folder. If set to global
-                then named saved search is retrieved from the global saved seaches folder
-             <param name="saved_search_context">some-search-context</param>
              -->
            </widget>
            <widget xforms-type="xf:upload"