8000 Merge branch '2.3' into 2.4 · danielsan/symfony-docs@0718cee · GitHub
[go: up one dir, main page]
Skip to content

Commit 0718cee

Browse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.4
* 2.3: use GitHub instead of Github
2 parents b6e631e + 4669620 commit 0718cee

File tree

4 files changed

+10
-10
lines changed
  • cookbook

    • 4 files changed

    +10
    -10
    lines changed

    ‎contributing/code/git.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -18,8 +18,8 @@ this pattern:
    1818
    merged branch USER_NAME/BRANCH_NAME (PR #1111)
    1919
    2020
    The PR reference allows you to have a look at the original pull request on
    21-
    Github: https://github.com/symfony/symfony/pull/1111. But all the information
    22-
    you can get on Github is also available from the repository itself.
    21+
    GitHub: https://github.com/symfony/symfony/pull/1111. But all the information
    22+
    you can get on GitHub is also available from the repository itself.
    2323

    2424
    The merge commit message contains the original message from the author of the
    2525
    changes. Often, this can help understand what the changes were about and the
    @@ -34,7 +34,7 @@ your ``.git/config`` file:
    3434
    3535
    fetch = +refs/notes/*:refs/notes/*
    3636
    37-
    After a fetch, getting the Github discussion for a commit is then a matter of
    37+
    After a fetch, getting the GitHub discussion for a commit is then a matter of
    3838
    adding ``--show-notes=github-comments`` to the ``git show`` command:
    3939

    4040
    .. code-block:: bash

    ‎contributing/code/patches.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -37,7 +37,7 @@ Set up your user information with your real name and a working email address:
    3737
    If your IDE creates configuration files inside the project's directory,
    3838
    you can use global ``.gitignore`` file (for all projects) or
    3939
    ``.git/info/exclude`` file (per project) to ignore them. See
    40-
    `Github's documentation`_.
    40+
    `GitHub's documentation`_.
    4141

    4242
    .. tip::
    4343

    @@ -249,7 +249,7 @@ Check that all tests still pass and push your branch remotely:
    249249
    Make a Pull Request
    250250
    ~~~~~~~~~~~~~~~~~~~
    251251

    252-
    You can now make a pull request on the ``symfony/symfony`` Github repository.
    252+
    You can now make a pull request on the ``symfony/symfony`` GitHub repository.
    253253

    254254
    .. tip::
    255255

    @@ -401,7 +401,7 @@ messages of all the commits. When you are finished, execute the push command.
    401401

    402402
    .. _ProGit: http://git-scm.com/book
    403403
    .. _GitHub: https://github.com/signup/free
    404-
    .. _`Github's Documentation`: https://help.github.com/articles/ignoring-files
    404+
    .. _`GitHub's Documentation`: https://help.github.com/articles/ignoring-files
    405405
    .. _Symfony2 repository: https://github.com/symfony/symfony
    406406
    .. _dev mailing-list: http://groups.google.com/group/symfony-devs
    407407
    .. _travis-ci.org: https://travis-ci.org/

    ‎cookbook/deployment/azure-website.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -272,7 +272,7 @@ directory with at least the following contents:
    272272
    /composer.phar
    273273
    /web/app_dev.php
    274274
    /web/bundles/
    275-
    /web/config.php
    275+
    /web/config.php
    276276
    277277
    The ``.gitignore`` file asks Git not to track any of the files and directories
    278278
    that match these patterns. This means these files won't be deployed to the Azure
    @@ -457,7 +457,7 @@ rewriting any urls to the ``web/app.php`` front controller which allows you to
    457457
    skip the ``web/`` folder in the URL. The first rule called ``BlockAccessToPublic``
    458458
    matches all url patterns that contain the ``web/`` folder and serves a
    459459
    ``403 Forbidden`` HTTP response instead. This example is based on Benjamin
    460-
    Eberlei's sample you can find on Github in the `SymfonyAzureEdition`_ bundle.
    460+
    Eberlei's sample you can find on GitHub in the `SymfonyAzureEdition`_ bundle.
    461461

    462462
    Deploy this file under the ``site/wwwroot`` directory of the Azure Website and
    463463
    browse to your application without the ``web/app.php`` segment in the URL.

    ‎cookbook/workflow/new_project_git.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -57,7 +57,7 @@ git repository:
    5757

    5858
    You may also want to create a ``.gitignore`` file that can be used system-wide.
    5959
    This allows you to exclude files/folders for all your projects that are created by
    60-
    your IDE or operating system. For details, see `Github .gitignore`_.
    60+
    your IDE or operating system. For details, see `GitHub .gitignore`_.
    6161

    6262
    #. Create an initial commit with your started project:
    6363

    @@ -116,6 +116,6 @@ manage this is `Gitolite`_.
    116116
    .. _`GitHub`: https://github.com/
    117117
    .. _`barebones repository`: http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository
    118118
    .. _`Gitolite`: https://github.com/sitaramc/gitolite
    119-
    .. _`Github .gitignore`: https://help.github.com/articles/ignoring-files
    119+
    .. _`GitHub .gitignore`: https://help.github.com/articles/ignoring-files
    120120
    .. _`Bitbucket`: https://bitbucket.org/
    121121
    .. _`comparison of hosting services`: http://en.wikipedia.org/wiki/Comparison_of_open-source_software_hosting_facilities

    0 commit comments

    Comments
     (0)
    0