Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

remove blogbundle from docs and cleanup examples #757

Merged
merged 2 commits into from
Apr 8, 2016
Merged

remove blogbundle from docs and cleanup examples #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4818697
remove blogbundle from docs and cleanup examples
dbu Apr 7, 2016
2a5ecad
limit sphinx version to 1.3.*
dbu Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ cache:
- $HOME/.cache/pip
- _build

install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git
install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copied from symfony/symfony-docs#6414


script: sphinx-build -nW -b html -d _build/doctrees . _build/html
329 changes: 0 additions & 329 deletions bundles/blog.rst
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions bundles/content/introduction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ For instance, a very simple template looks like:

.. code-block:: html+jinja

{# src/Acme/BlogBundle/Resources/views/Post/index.html.twig #}
{# src/AppBundle/Resources/views/Post/index.html.twig #}
{% extends '::layout.html.twig' %}

{% block title -%}
Expand All @@ -94,7 +94,7 @@ For instance, a very simple template looks like:

.. code-block:: html+php

<!-- src/Acme/BlogBundle/Resources/views/Post/index.html.php -->
<!-- src/AppBundle/Resources/views/Post/index.html.php -->
<?php $view->extend('::layout.html.twig') ?>

<?php $view['slots']->set('title', $cmfMainContent->getTitle()) ?>
Expand All @@ -120,7 +120,7 @@ To configure a default template, use the ``default_template`` option:

# ...
cmf_content:
default_template: AcmeBlogBundle:Content:static.html.twig
default_template: AppBundle:Content:static.html.twig

.. code-block:: xml

Expand All @@ -131,7 +131,7 @@ To configure a default template, use the ``default_template`` option:
<!-- ... -->

<config xmlns="http://cmf.symfony.com/schema/dic/content"
default-template="AcmeMainBundle:Content:static.html.twig"
default-template="AppBundle:Content:static.html.twig"
/>
</container>

Expand All @@ -141,7 +141,7 @@ To configure a default template, use the ``default_template`` option:

// ...
$container->loadFromExtension('cmf_content', array(
'default_template' => 'AcmeMainBundle:Content:static.html.twig',
'default_template' => 'AppBundle:Content:static.html.twig',
));

Whenever the content controller gets called without a specified template, it
Expand Down
Loading