devguide - portlets - Give <instanceable> element in context of entire <portlet> parent element.
Merge branch '6.1.x' into 6.1.x-dev-guide
Merge branch '6.1.x' into 6.1.x-dev-guide
Merge branch '6.1.x' into 6.1.x-dev-guide
devGuide - portlets - Fix JSP and XML code.
devGuide - portlets - Fix JSP and XML code 2.
devGuide - portlets - Update resource-bundle code and add note on mavenizing the bundle.
Merge pull request #695 from jhinkey/6.1.x-dev-guide

6.1.x dev guide