Sam Minnee 65d20e4acc Simplified some of the code contribution guidelines. ... The current guides have a few areas where they recommend an approach that is more complex than what most people take. - Rebase straight onto upsteam/msaster - Force push a rebased branch I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.		2012-10-09 14:53:45 +13:00
..
_images	MINOR: Forms, navigation howto plus adjustments to tutorial one (#6367 )	2012-08-07 21:06:34 +02:00
changelogs	Added 3.0.2 changelog (and added missing 3.0.1 changelog to the list)	2012-09-17 13:25:31 +12:00
howto	Update docs/en/howto/extend-cms-interface.md	2012-10-08 13:11:33 +13:00
installation	Merge pull request #783 from halkyon/iis_install_simplify	2012-09-17 16:06:58 -07:00
misc	Simplified some of the code contribution guidelines.	2012-10-09 14:53:45 +13:00
reference	Update docs/en/reference/dataextension.md	2012-10-07 18:11:40 +03:00
topics	NEW Add documentation for the new config system in 3.0	2012-10-04 16:34:57 +13:00
tutorials	Fixed markdown whitespace usage	2012-10-02 11:38:16 +02:00
index.md	Removed 'built-in page controls' links from docs	2012-10-05 17:39:19 +02:00