remove "dist-win" target
extend prefix used for .zip and .markdown files during dist
Merge branch 'master' into dist-win-update
Merge branch 'master' into dist-win-update
Merge branch 'dist-win-update' of git://github.com/codyhoag/liferay-docs into LRDOCS-383-ant-dist
modified other targets for compatibility with new prefix
Added skeleton for Recycle Bin documentation, and placed Recycle Bin in the list of configurable features in the introduction
updated prefix for markdown conversions and messages
removed hyphen
Merge branch 'dist-win-update' of git://github.com/codyhoag/liferay-docs into LRDOCS-383-ant-dist
Fix my typo
removed now unnecessary glassfish hacks
Merge pull request #387 from rbohl/recyclebin

Recycle Bin Documentation--Rough Start
Merge pull request #388 from jhinkey/LRDOCS-383-ant-dist

LRDOCS-383 improve namespacing of dist ZIP files.
Merge pull request #389 from stephenkostas/glassfish-instructions

removed now unnecessary glassfish hacks