Updated Windows and OS X documentation.
[ci skip]
Merge pull request #2857 from edgy360/master

Update Windows and OS X documentation