summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorYusuke Miyazaki <miyazaki.dev@gmail.com>2015-10-21 13:50:20 +0900
committerTim Graham <timograham@gmail.com>2015-10-21 07:32:28 -0400
commita083d7019230b1823a02614189bd1911aa62c054 (patch)
treefb300e70a8b5cc152c7fde74041a99883f9ee881 /docs
parent614ba3ad2d5cc210d028cbc21abc1a9f3ca8c686 (diff)
[1.9.x] Fixed #25578 -- Corrected the casing of "GitHub".
Backport of 230d8c7301281176a31443a2f4f425828291e46d from master
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing/writing-code/working-with-git.txt6
-rw-r--r--docs/man/django-admin.14
-rw-r--r--docs/ref/django-admin.txt4
-rw-r--r--docs/releases/1.5.txt2
-rw-r--r--docs/releases/1.8.txt2
-rw-r--r--docs/spelling_wordlist2
6 files changed, 10 insertions, 10 deletions
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt
index 81c8b8a682..c7d551f24d 100644
--- a/docs/internals/contributing/writing-code/working-with-git.txt
+++ b/docs/internals/contributing/writing-code/working-with-git.txt
@@ -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
@@ -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
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 42c56fc558..41c3d64562 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -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
@@ -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
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 492ec50b30..595e0c437b 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -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
@@ -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
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 6c861a5359..e18060aa89 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -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.
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 79d387fc2f..1cbc249d83 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -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/
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index dda4028ca2..e9e119f1d3 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -305,7 +305,7 @@ Gettext
GiB
gid
gis
-github
+GitHub
globalization
Godwin
google