ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/docs/routes.php
View File

@@ -38,7 +38,7 @@ function document_exists($page)
}
/**
* Attach the sidebar to the documentatoin template.
* Attach the sidebar to the documentation template.
*/
View::composer('docs::template', function($view)
{
@@ -68,7 +68,7 @@ Route::get('(:bundle)/(:any)/(:any?)', function($section, $page = null)
// If no page was specified, but a "home" page exists for the section,
// we'll set the file to the home page so that the proper page is
// display back out to the client for the requested doc page.
// displayed back out to the client for the requested doc page.
if (is_null($page) and document_exists($file.'/home'))
{
$file .= '/home';