Ingo Schommer 63c8441410 Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	admin/javascript/LeftAndMain.js

2013-03-21 00:11:17 +01:00

..

_images

Rewrite the permission docs for IIS7.

2012-09-10 14:01:17 +12:00

common-problems.md

MINOR: formatting changes and fixes to original document formatting

2011-02-22 10:23:22 +13:00

composer.md

Composer contribution fork/upstream docs (fixes #8332)

2013-03-20 11:37:41 +01:00

from-source.md

Removed 'from-source' documentation

2012-11-06 11:48:39 +13:00

index.md

Removed 'from-source' documentation

2012-11-06 11:48:39 +13:00

lighttpd.md

API-CHANGE Update docs to match renaming of sapphire to framework

2012-04-15 10:50:19 +12:00

mac-osx.md

ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)

2011-02-07 19:48:44 +13:00

nginx.md

Document that yaml files shouldnt be served directly

2013-01-29 14:11:52 +13:00

server-requirements.md

Updated browser requirements, dropping IE7 support

2013-03-18 14:33:43 +01:00

upgrading.md

MINOR Improved upgrading docs (fixes #7508)

2012-06-26 13:49:06 +02:00

webserver.md

Document that yaml files shouldnt be served directly

2013-01-29 14:11:52 +13:00

windows-manual-iis-6.md

Formatted warnings correctly

2012-09-17 12:24:45 +12:00

windows-manual-iis-7.md

Merge pull request #783 from halkyon/iis_install_simplify

2012-09-17 16:06:58 -07:00

windows-manual-iis.md

Formatted warnings correctly

2012-09-17 12:24:45 +12:00

windows-pi.md

ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)

2011-02-07 19:48:44 +13:00

windows-wamp.md

ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)

2011-02-07 19:48:44 +13:00