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

Commit 93300b7

Browse files
wouterjwouterj
committed
Merge pull request #752 from symfony-cmf/fix_invalid_url
Fix invalid urls
2 parents d9aa9ca + 7dd173b commit 93300b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+166
-166
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ addons:
1515

1616
install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git sphinxcontrib-spelling pyenchant
1717

18-
script:
19-
- sphinx-build -nW -b html -d _build/doctrees . _build/html
20-
- make spelling
18+
script: sphinx-build -nW -b html -d _build/doctrees . _build/html
19+
20+
after_success: if [[ $TRAVIS_PULL_REQUEST == false ]]; then make spelling; fi

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Format][4].
1212
> If you are documenting new features you should base your PR on the
1313
> **dev branch**, *not* the master branch.
1414
15-
[1]: http://symfony.com/doc/current/contributing/documentation/index.html
16-
[2]: http://symfony.com/doc/current/contributing/documentation/format.html
17-
[3]: http://symfony.com/doc/current/contributing/documentation/overview.html#creating-a-pull-request
18-
[4]: http://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format
15+
[1]: https://symfony.com/doc/current/contributing/documentation/index.html
16+
[2]: https://symfony.com/doc/current/contributing/documentation/format.html
17+
[3]: https://symfony.com/doc/current/contributing/documentation/overview.html#creating-a-pull-request
18+
[4]: https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format

‎book/database_layer.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,10 @@ take different actions as objects go through their persistence lifecycle.
370370

371371
.. _`Doctrine PHPCR-ODM`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/index.html
372372
.. _`PHP Content Repository`: http://phpcr.github.io/
373-
.. _`JSR-283 specification`: http://jcp.org/en/jsr/detail?id=283
374-
.. _`Doctrine ORM`: http://symfony.com/doc/current/book/doctrine.html
373+
.. _`JSR-283 specification`: https://jcp.org/en/jsr/detail?id=283
374+
.. _`Doctrine ORM`: https://symfony.com/doc/current/book/doctrine.html
375375
.. _`doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/basic-mapping.html#basicmapping-identifier-generation-strategies
376-
.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/annotations-reference.html
376+
.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/basic-mapping.html
377377
.. _`the QueryBuilder documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/query-builder.html
378378
.. _`create complex queries`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/query-builder.html
379-
.. _`Custom Repository Classes`: http://symfony.com/doc/current/book/doctrine.html#custom-repository-classes
379+
.. _`Custom Repository Classes`: https://symfony.com/doc/current/book/doctrine.html#custom-repository-classes

‎book/installation.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ and then run the following command:
285285
$ php app/console doctrine:phpcr:migrator:migrate page --identifier=/cms/simple/test/foo
286286
287287
.. _`cmf.liip.ch`: http://cmf.liip.ch
288-
.. _`Requirements for running Symfony2`: http://symfony.com/doc/current/reference/requirements.html
288+
.. _`Requirements for running Symfony2`: https://symfony.com/doc/current/reference/requirements.html
289289
.. _`SQLite`: http://www.sqlite.org/
290-
.. _`Composer`: http://getcomposer.org/
291-
.. _`guidelines in the symfony book`: http://symfony.com/doc/master/book/installation.html#configuration-and-setup
292-
.. _`the Symfony2 book`: http://symfony.com/doc/current/book/
293-
.. _`Fixtures`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
294-
.. _`Symfony cookbook article on setup`: http://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html
290+
.. _`Composer`: https://getcomposer.org/
291+
.. _`guidelines in the symfony book`: https://symfony.com/doc/current/book/installation.html#book-installation-permissions
292+
.. _`the Symfony2 book`: https://symfony.com/doc/current/book/index.html
293+
.. _`Fixtures`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
294+
.. _`Symfony cookbook article on setup`: https://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html

‎book/routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,5 +533,5 @@ For more information on the Routing component of Symfony CMF, please refer to:
533533

534534
.. _`Doctrine ORM`: http://www.doctrine-project.org/projects/orm.html
535535
.. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html
536-
.. _`Routing`: http://symfony.com/doc/current/components/routing/introduction.html
537-
.. _`How to Define Controllers as Services`: http://symfony.com/doc/current/cookbook/controller/service.html
536+
.. _`Routing`: https://symfony.com/doc/current/components/routing/introduction.html
537+
.. _`How to Define Controllers as Services`: https://symfony.com/doc/current/cookbook/controller/service.html

‎book/structuring_content.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ optional. You can go to the :doc:`../bundles/menu/index` reference page for the
168168
configuration options list and additional information.
169169

170170
.. _KnpMenuBundle: https://github.com/knplabs/KnpMenuBundle
171-
.. _`KnpMenuBundle's documentation`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md
172-
.. _`respective documentation page`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md#rendering-menus
171+
.. _`KnpMenuBundle's documentation`: https://symfony.com/doc/master/bundles/KnpMenuBundle/index.html
172+
.. _`respective documentation page`: https://symfony.com/doc/master/bundles/KnpMenuBundle/index.html#rendering-menus
173173
.. _`Doctrine PHPCR documentation page`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/association-mapping.html#references
174174
.. _`KnpMenu`: https://github.com/knplabs/KnpMenu
175-
.. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
175+
.. _SonataDoctrinePHPCRAdminBundle: https://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html

‎bundles/block/cache.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ block to be finished rendering or retrieving data. The block is then
316316
asynchronously or synchronously loaded and added to the page.
317317

318318
.. _`SonataCacheBundle`: https://github.com/sonata-project/SonataCacheBundle
319-
.. _`ESI`: http://en.wikipedia.org/wiki/Edge_Side_Includes
320-
.. _`SSI`: http://en.wikipedia.org/wiki/Server_Side_Includes
321-
.. _`SonataCacheBundle documentation`: http://sonata-project.org/bundles/cache/master/doc/index.html
322-
.. _`SonataBlockBundle Advanced usage`: http://sonata-project.org/bundles/block/master/doc/reference/advanced_usage.html#block-context-manager-context-cache
319+
.. _`ESI`: https://en.wikipedia.org/wiki/Edge_Side_Includes
320+
.. _`SSI`: https://en.wikipedia.org/wiki/Server_Side_Includes
321+
.. _`SonataCacheBundle documentation`: https://sonata-project.org/bundles/cache/master/doc/index.html
322+
.. _`SonataBlockBundle Advanced usage`: https://sonata-project.org/bundles/block/master/doc/reference/advanced_usage.html#block-context-manager-context-cache

‎bundles/block/create_your_own_blocks.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,4 @@ handles, as per the ``getType`` method of the block. The second argument is the
341341
->addTag('sonata.block')
342342
;
343343
344-
.. _Assetic: http://symfony.com/doc/current/cookbook/assetic/asset_management.html
344+
.. _Assetic: https://symfony.com/doc/current/cookbook/assetic/asset_management.html

‎bundles/block/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ Read on
416416
* :doc:`configuration`
417417

418418
.. _`symfony-cmf/block-bundle`: https://packagist.org/packages/symfony-cmf/block-bundle
419-
.. _`with composer`: http://getcomposer.org
419+
.. _`with composer`: https://getcomposer.org
420420
.. _`Symfony CMF Sandbox`: https://github.com/symfony-cmf/cmf-sandbox
421-
.. _`prepended configuration`: http://symfony.com/doc/current/components/dependency_injection/compilation.html#prepending-configuration-passed-to-the-extension
421+
.. _`prepended configuration`: https://symfony.com/doc/current/components/dependency_injection/compilation.html#prepending-configuration-passed-to-the-extension
422422
.. _`SonataBlockBundle`: https://github.com/sonata-project/SonataBlockBundle
423423
.. _`discussion how to fix this`: https://github.com/symfony-cmf/BlockBundle/issues/143

‎bundles/block/types.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,9 @@ Please refer to the `Sonata Admin documentation`_
423423
for further information.
424424

425425
.. _`Symfony CMF Sandbox`: https://github.com/symfony-cmf/cmf-sandbox
426-
.. _`Sonata Admin documentation`: http://sonata-project.org/bundles/admin/master/doc/reference/form_types.html
427-
.. _`Sonata Admin Extensions`: http://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
426+
.. _`Sonata Admin documentation`: https://sonata-project.org/bundles/admin/master/doc/reference/form_types.html
427+
.. _`Sonata Admin Extensions`: https://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
428428
.. _`LiipImagineBundle`: https://github.com/liip/LiipImagineBundle
429429
.. _`LiipImagineBundle documentation`: https://github.com/liip/LiipImagineBundle/tree/master/Resources/doc
430-
.. _`sub-request`: http://symfony.com/doc/current/book/internals.html#internal-requests
431-
.. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
430+
.. _`sub-request`: https://symfony.com/doc/current/components/http_kernel/introduction.html#http-kernel-sub-requests
431+
.. _SonataDoctrinePHPCRAdminBundle: https://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html

0 commit comments

Comments
 (0)