Merge branch '3' into 4

This commit is contained in:
Daniel Hensby 2017-11-25 17:34:24 +00:00
commit 0ceb4cfa18
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 2 additions and 2 deletions

View File

@ -23,7 +23,7 @@ they require a powerful traversal tool: [FileFinder](api:SilverStripe\Assets\Fil
The class provides filtering abilities for files and folders, as well as
callbacks for recursive traversal. Each manifest has its own implementation,
for example [ManifestFileFinder](api:SilverStripe\Core\Manifest\ManifestFileFinder), adding more domain specific filtering
like including themes, or excluding testss.
like including themes, or excluding tests.
## PHP Class Manifest

View File

@ -19,7 +19,7 @@ use SilverStripe\Control\Director;
* <code>
* $parser = new CSVParser('myfile.csv');
* $parser->mapColumns(array(
* 'first name' => 'FirstName'
* 'first name' => 'FirstName',
* 'lastname' => 'Surname',
* 'last name' => 'Surname',
* ));