From 60015e61cafa098bf9761e67ea4d2ffbc4861829 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 7 Jul 2014 18:36:02 +0200 Subject: [PATCH] use GitHub instead of Github --- contributing/code/git.rst | 6 +++--- contributing/code/patches.rst | 6 +++--- cookbook/deployment/azure-website.rst | 4 ++-- cookbook/workflow/new_project_git.rst | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contributing/code/git.rst b/contributing/code/git.rst index 47950e44c6b..5dbe97bae01 100644 --- a/contributing/code/git.rst +++ b/contributing/code/git.rst @@ -18,8 +18,8 @@ this pattern: merged branch USER_NAME/BRANCH_NAME (PR #1111) The PR reference allows you to have a look at the original pull request on -Github: https://github.com/symfony/symfony/pull/1111. But all the information -you can get on Github is also available from the repository itself. +GitHub: https://github.com/symfony/symfony/pull/1111. But all the information +you can get on GitHub is also available from the repository itself. The merge commit message contains the original message from the author of the changes. Often, this can help understand what the changes were about and the @@ -34,7 +34,7 @@ your ``.git/config`` file: fetch = +refs/notes/*:refs/notes/* -After a fetch, getting the Github discussion for a commit is then a matter of +After a fetch, getting the GitHub discussion for a commit is then a matter of adding ``--show-notes=github-comments`` to the ``git show`` command: .. code-block:: bash diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index 1967c8dc0f0..12998b9031f 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -37,7 +37,7 @@ Set up your user information with your real name and a working email address: If your IDE creates configuration files inside the project's directory, you can use global ``.gitignore`` file (for all projects) or ``.git/info/exclude`` file (per project) to ignore them. See - `Github's documentation`_. + `GitHub's documentation`_. .. tip:: @@ -249,7 +249,7 @@ Check that all tests still pass and push your branch remotely: Make a Pull Request ~~~~~~~~~~~~~~~~~~~ -You can now make a pull request on the ``symfony/symfony`` Github repository. +You can now make a pull request on the ``symfony/symfony`` GitHub repository. .. tip:: @@ -401,7 +401,7 @@ messages of all the commits. When you are finished, execute the push command. .. _ProGit: http://git-scm.com/book .. _GitHub: https://github.com/signup/free -.. _`Github's Documentation`: https://help.github.com/articles/ignoring-files +.. _`GitHub's Documentation`: https://help.github.com/articles/ignoring-files .. _Symfony2 repository: https://github.com/symfony/symfony .. _dev mailing-list: http://groups.google.com/group/symfony-devs .. _travis-ci.org: https://travis-ci.org/ diff --git a/cookbook/deployment/azure-website.rst b/cookbook/deployment/azure-website.rst index 4c324d9a76e..0485ad613a3 100644 --- a/cookbook/deployment/azure-website.rst +++ b/cookbook/deployment/azure-website.rst @@ -272,7 +272,7 @@ directory with at least the following contents: /composer.phar /web/app_dev.php /web/bundles/ - /web/config.php + /web/config.php The ``.gitignore`` file asks Git not to track any of the files and directories 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 skip the ``web/`` folder in the URL. The first rule called ``BlockAccessToPublic`` matches all url patterns that contain the ``web/`` folder and serves a ``403 Forbidden`` HTTP response instead. This example is based on Benjamin -Eberlei's sample you can find on Github in the `SymfonyAzureEdition`_ bundle. +Eberlei's sample you can find on GitHub in the `SymfonyAzureEdition`_ bundle. Deploy this file under the ``site/wwwroot`` directory of the Azure Website and browse to your application without the ``web/app.php`` segment in the URL. diff --git a/cookbook/workflow/new_project_git.rst b/cookbook/workflow/new_project_git.rst index 8baf116d60f..0b96a42f146 100644 --- a/cookbook/workflow/new_project_git.rst +++ b/cookbook/workflow/new_project_git.rst @@ -57,7 +57,7 @@ git repository: You may also want to create a ``.gitignore`` file that can be used system-wide. This allows you to exclude files/folders for all your projects that are created by - your IDE or operating system. For details, see `Github .gitignore`_. + your IDE or operating system. For details, see `GitHub .gitignore`_. #. Create an initial commit with your started project: @@ -116,6 +116,6 @@ manage this is `Gitolite`_. .. _`GitHub`: https://github.com/ .. _`barebones repository`: http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository .. _`Gitolite`: https://github.com/sitaramc/gitolite -.. _`Github .gitignore`: https://help.github.com/articles/ignoring-files +.. _`GitHub .gitignore`: https://help.github.com/articles/ignoring-files .. _`Bitbucket`: https://bitbucket.org/ .. _`comparison of hosting services`: http://en.wikipedia.org/wiki/Comparison_of_open-source_software_hosting_facilities