Skip to content

Commit

Permalink
[1.9.x] Fixed #25578 -- Corrected the casing of "GitHub".
Browse files Browse the repository at this point in the history
Backport of 230d8c7 from master
  • Loading branch information
ymyzk authored and timgraham committed Oct 21, 2015
1 parent 614ba3a commit a083d70
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ answer newbie questions, and generally made Django that much better:
Yasushi Masuda <whosaysni@gmail.com>
ye7cakf02@sneakemail.com
ymasuda@ethercube.com
Yusuke Miyazaki <miyazaki.dev@gmail.com>
Zachary Voase <zacharyvoase@gmail.com>
Zach Thompson <zthompson47@gmail.com>
Zain Memon
Expand Down
6 changes: 3 additions & 3 deletions docs/internals/contributing/writing-code/working-with-git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ used to associate your commits with your GitHub account.
Setting up local repository
---------------------------

When you have created your GitHub account, with the nick "github_nick", and
When you have created your GitHub account, with the nick "GitHub_nick", and
forked Django's repository, create a local copy of your fork::

git clone git@github.com:github_nick/django.git
git clone git@github.com:GitHub_nick/django.git

This will create a new directory "django", containing a clone of your GitHub
repository. The rest of the git commands on this page need to be run within the
Expand Down Expand Up @@ -103,7 +103,7 @@ You can publish your work on GitHub just by doing::
When you go to your GitHub page you will notice a new branch has been created.

If you are working on a Trac ticket, you should mention in the ticket that
your work is available from branch ticket_xxxxx of your github repo. Include a
your work is available from branch ticket_xxxxx of your GitHub repo. Include a
link to your branch.

Note that the above branch is called a "topic branch" in Git parlance. You are
Expand Down
4 changes: 2 additions & 2 deletions docs/man/django-admin.1
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ Django will also accept URLs (\fBhttp\fP, \fBhttps\fP, \fBftp\fP) to compressed
archives with the app template files, downloading and extracting them on the
fly.
.sp
For example, taking advantage of Github\(aqs feature to expose repositories as
For example, taking advantage of GitHub\(aqs feature to expose repositories as
zip files, you can use a URL like:
.INDENT 0.0
.INDENT 3.5
Expand Down Expand Up @@ -1596,7 +1596,7 @@ Django will also accept URLs (\fBhttp\fP, \fBhttps\fP, \fBftp\fP) to compressed
archives with the project template files, downloading and extracting them on the
fly.
.sp
For example, taking advantage of Github\(aqs feature to expose repositories as
For example, taking advantage of GitHub\(aqs feature to expose repositories as
zip files, you can use a URL like:
.INDENT 0.0
.INDENT 3.5
Expand Down
4 changes: 2 additions & 2 deletions docs/ref/django-admin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ Django will also accept URLs (``http``, ``https``, ``ftp``) to compressed
archives with the app template files, downloading and extracting them on the
fly.

For example, taking advantage of Github's feature to expose repositories as
For example, taking advantage of GitHub's feature to expose repositories as
zip files, you can use a URL like::

django-admin startapp --template=https://github.com/githubuser/django-app-template/archive/master.zip myapp
Expand Down Expand Up @@ -1189,7 +1189,7 @@ Django will also accept URLs (``http``, ``https``, ``ftp``) to compressed
archives with the project template files, downloading and extracting them on the
fly.

For example, taking advantage of Github's feature to expose repositories as
For example, taking advantage of GitHub's feature to expose repositories as
zip files, you can use a URL like::

django-admin startproject --template=https://github.com/githubuser/django-project-template/archive/master.zip myproject
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ The localflavor contrib app has been split into separate packages.
``django.contrib.localflavor`` itself will be removed in Django 1.6,
after an accelerated deprecation.

The new packages are available on Github. The core team cannot
The new packages are available on GitHub. The core team cannot
efficiently maintain these packages in the long term — it spans just a
dozen countries at this time; similar to translations, maintenance
will be handed over to interested members of the community.
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ Removal of ``django.contrib.formtools``
The formtools contrib app has been moved to a separate package and the
relevant documentation pages have been updated or removed.

The new package is available `on Github`_ and on PyPI.
The new package is available `on GitHub`_ and on PyPI.

.. _on GitHub: https://github.com/django/django-formtools/

Expand Down
2 changes: 1 addition & 1 deletion docs/spelling_wordlist
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ Gettext
GiB
gid
gis
github
GitHub
globalization
Godwin
google
Expand Down

0 comments on commit a083d70

Please sign in to comment.