Github's wiki being essentially a git repo with markdown is one of the killer features that I can't believe people don't rave about. It's so wonderfully useful and open. I can edit pages locally in vim and commit them, but my non-technical partner can edit them easily in the UI as well. If/when there are merge conflicts, it's just standard git to resolve them!