Merge remote-tracking branch 'remotes/dev/master'

oroinc · Jan 22, 2014 · 97a8424 · 97a8424
2 parents f3de4dc + 3fad7b4
commit 97a8424
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/DistributionKernel.php b/app/DistributionKernel.php
@@ -19,6 +19,7 @@ public function registerBundles()
             new Oro\Bundle\DistributionBundle\OroDistributionBundle(),
             new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new \Oro\Bundle\HelpBundle\OroHelpBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev'))) {

diff --git a/app/config/dist/config.yml b/app/config/dist/config.yml
@@ -68,6 +68,15 @@ services:
          tags:
              - { name: twig.extension }
 
+oro_help:
+    defaults:
+        server: http://help.orocrm.com/
+        prefix: Third_Party
+    vendors:
+        Oro:
+            prefix: ~
+            alias: Platform
+
 monolog:
     handlers:
         oro_distribution: