Merge pull request #39 from creative-commoners/pulls/4.0/add-core-ss4…

…-modules

FIX Add core SS4 modules

README.md

@@ -69,5 +69,5 @@ Examples:
  * `/search/lookup.php?q=DataObject`: Shows `DataObject` docs in `trunk` version of framework
  * `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.0` version of framework
  * `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.6` version of framework (or whatever is the latest stable minor version)
- * `/search/lookup.php?q=DPSPayment&module=payemnt`: Shows `DPSPayment` class docs in the `ecommerce` module
+ * `/search/lookup.php?q=DPSPayment&module=payment`: Shows `DPSPayment` class docs in the `ecommerce` module
  * `/search/lookup.php?q=SilverStripe\ORM\DataExtension::onBeforeWrite()&version=4`: Shows `SilverStripe\ORM\DataExtension::onBeforeWrite()` docs in `master` (4.x) version of framework

conf/apigen/apigen.neon

@@ -1,5 +1,5 @@
 # Mask to exclude file or directory from processing
-exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*']
+exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*', '*/examples/*']
 
 # Grouping of classes
 groups: packages

makedoc.sh

@@ -43,10 +43,17 @@ function generate {
 mkdir -p "$STORAGE_DIR"
 
 # master
+checkout 'git://github.com/silverstripe/silverstripe-admin.git' 'master' 'admin'
+checkout 'git://github.com/silverstripe/silverstripe-asset-admin.git' 'master' 'asset-admin'
+checkout 'git://github.com/silverstripe/silverstripe-assets.git' 'master' 'assets'
+checkout 'git://github.com/silverstripe/silverstripe-campaign-admin.git' 'master' 'campaign-admin'
 checkout 'git://github.com/silverstripe/silverstripe-cms.git' 'master' 'cms'
+checkout 'git://github.com/silverstripe/silverstripe-config.git' 'master' 'config'
 checkout 'git://github.com/silverstripe/silverstripe-framework.git' 'master' 'framework'
-checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig'
+checkout 'git://github.com/silverstripe/silverstripe-graphql.git' 'master' 'graphql'
 checkout 'git://github.com/silverstripe/silverstripe-reports.git' 'master' 'reports'
+checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig'
+checkout 'git://github.com/silverstripe/silverstripe-versioned.git' 'master' 'versioned'
 generate 'master' 'SilverStripe master API Docs'
 
 # 3.6

src/Lookup.php

@@ -77,7 +77,7 @@ public function handle($return = false)
     {
         $paths = array();
 
-        // Only include modules path if we're not request core.
+        // Only include modules path if we're not requesting core.
         if ($this->getArg('module') && !in_array($this->getArg('module'), array('cms', 'framework', 'sapphire'))) {
             $paths[] = 'modules/' . $this->getArg('module');
         }