Skip to content

Commit

Permalink
Merge pull request DjangoGirls#1290 from rhcarvalho/github-spelling
Browse files Browse the repository at this point in the history
Make GitHub capitalization consistent
  • Loading branch information
ekohl authored Jul 1, 2018
2 parents aaef508 + 042933a commit c91510c
Show file tree
Hide file tree
Showing 42 changed files with 73 additions and 73 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,36 @@ The Django Girls Tutorial is licensed under a [*Creative Commons Attribution-Sha

# Editing basics

The source code of the tutorial is [hosted on Github](https://github.com/DjangoGirls/tutorial). The Github [Fork & Pull workflow](https://help.github.com/articles/using-pull-requests) is used to accept and review changes.
The source code of the tutorial is [hosted on GitHub](https://github.com/DjangoGirls/tutorial). The GitHub [Fork & Pull workflow](https://help.github.com/articles/using-pull-requests) is used to accept and review changes.

The tutorial uses the [GitBook](https://legacy.gitbook.com/) service for publishing its documentation. [See more information about how GitBook works](https://help.gitbook.com/).

The tutorial is written in [Markdown mark up language](https://help.github.com/articles/markdown-basics).

You can find any discussions about the contents of the tutorial on the [Github issue tracker](https://github.com/DjangoGirls/tutorial/issues).
You can find any discussions about the contents of the tutorial on the [GitHub issue tracker](https://github.com/DjangoGirls/tutorial/issues).

[Crowdin](https://crowdin.com/project/django-girls-tutorial) platform is used to manage translations. If you want to join an existing translation team or launch a new translation, send an email to the [translation managers](mailto:[email protected]) or contact [support team](mailto:[email protected]). If you want to propose some small changes or fix typos in existing translations, please create a Pull Request.

# Getting started and prerequisites

For contributing to the tutorial the following is needed to get started:

* a [Github account](https://github.com)
* in the case of complex edits familiarity with [Git command line basics](https://help.github.com/articles/set-up-git) or familiarity with an app ([Windows](https://windows.github.com/), [Mac](https://mac.github.com/)) to push your edits made on your computer to Github.
* a [GitHub account](https://github.com)
* in the case of complex edits familiarity with [Git command line basics](https://help.github.com/articles/set-up-git) or familiarity with an app ([Windows](https://windows.github.com/), [Mac](https://mac.github.com/)) to push your edits made on your computer to GitHub.

## Fork the repository

First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) repository to your personal Github account:
First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) repository to your personal GitHub account:

![Fork button](contributing/images/fork.png)

# Editing chapter content

## Simple changes

For simple changes like typo corrections you can use the Github online editor:
For simple changes like typo corrections you can use the GitHub online editor:

* Open your local fork page on Github,
* Open your local fork page on GitHub,
* go to *README.md* file in any chapter,
* press the *Edit* icon (pen)

Expand All @@ -48,15 +48,15 @@ and you can edit the chapter directly on github.com.

Markdown syntax is used to edit the individual pages of the tutorial.

![Github editor](contributing/images/github_editor.png)
![GitHub editor](contributing/images/github_editor.png)

Save your changes and create a pull request as explained below.

## New content and complex changes

For adding new chapters, writing longer snippets of text or adding images, you need to get a copy of the tutorial to your local computer.

Either use the Github app for your operating system (mentioned above) or `git` command line to get the repository locally. You get the repository address from the front page of your own Github repository fork:
Either use the GitHub app for your operating system (mentioned above) or `git` command line to get the repository locally. You get the repository address from the front page of your own GitHub repository fork:

git clone [email protected]:yourgithubusername/tutorial.git

Expand All @@ -70,7 +70,7 @@ Then you can open the tutorial in GitBook Editor (*File* > *Open book*).

Make any changes in the tutorial using GitBook and then save changes (*Book* > *Save all*).

Then commit the changes using `git` and push the changes to your remote Github repository.
Then commit the changes using `git` and push the changes to your remote GitHub repository.

Example:

Expand Down Expand Up @@ -101,17 +101,17 @@ If you don't want to download the GitBook Editor app you can also go to the [Git

# Making a pull request

After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on Github. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version.
After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on GitHub. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version.

In your own repository on Github press do *Compare & pull request*
In your own repository on GitHub press do *Compare & pull request*

![Compare & pull request](contributing/images/pull_request.png)

Fill in the information *why* this change is being made. The reviewer can see the details of the actual change, so you don't need repeat the content of the change.

Then press *Create pull request*.

Github emails will notify you for the follow up process.
GitHub emails will notify you for the follow up process.

# Further information and help

Expand Down
2 changes: 1 addition & 1 deletion cs/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Vzhledem k tomu, že jsi pravděpodobně přihlášená, neuvidíš žádnou zm

Uvidíme, jestli to funguje na PythonAnywhere. Čas na další nasazení!

* Za prvé commitni nový kód a pošli ho na Github
* Za prvé commitni nový kód a pošli ho na GitHub

```
$ git status
Expand Down
2 changes: 1 addition & 1 deletion cs/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Všimla sis, že jsme tentokrát použily lehce odlišnou notaci (`{{ post.title

Bylo by dobré vidět, jestli tvá webová stránka bude stále fungovat i na webu, že? Pojďme zkusit další nasazení/deploy na PythonAnywhere. Tady je rekapitulace postupu...

* Nejdřív hoď svůj kód na Github
* Nejdřív hoď svůj kód na GitHub

```
$ git status
Expand Down
4 changes: 2 additions & 2 deletions cs/html/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Co ve skutečnosti chceme, je zobrazit opravdové příspěvky přidané v naše

Bylo by fajn vidět všecho tohle venku a živě na internetu, že ano? Pojďme udělat další PythonAnywhere nasazení (deploy):

### Commitni a hoď svůj kód na Github
### Commitni a hoď svůj kód na GitHub

Nejdříve se podívejme, které soubory se změnily od posledního nasazení (deploy). Zadej tyto příkazy lokálně (ne na PythonAnywhere):

Expand Down Expand Up @@ -186,7 +186,7 @@ $ git commit -m "Změněn HTML kód stránek."

> **Poznámka** Ujisti se, že používáš dvojité uvozovky kolem zprávy.
Jakmile jsme s tímto hotovy, nahrajeme (push) naše změny na Github:
Jakmile jsme s tímto hotovy, nahrajeme (push) naše změny na GitHub:

```
git push
Expand Down
4 changes: 2 additions & 2 deletions en/chromebook_setup/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ pip install django~=1.11.0

(note that on the last line we use a tilde followed by an equal sign: ~=).

### Github
### GitHub

Make a [Github](https://github.com) account.
Make a [GitHub](https://github.com) account.

### PythonAnywhere

Expand Down
2 changes: 1 addition & 1 deletion en/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Since you're likely logged in, if you refresh the page, you won't see anything d

Let's see if all this works on PythonAnywhere. Time for another deploy!

* First, commit your new code, and push it up to Github:
* First, commit your new code, and push it up to GitHub:

{% filename %}command-line{% endfilename %}
```
Expand Down
2 changes: 1 addition & 1 deletion en/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Have you noticed that we used a slightly different notation this time (`{{ post.

It'd be good to see if your website will still be working on the public Internet, right? Let's try deploying to PythonAnywhere again. Here's a recap of the steps…

* First, push your code to Github
* First, push your code to GitHub

{% filename %}command-line{% endfilename %}
```
Expand Down
2 changes: 1 addition & 1 deletion en/html/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ What we really want to do is display real posts added in our Django admin – an

It'd be good to see all this out and live on the Internet, right? Let's do another PythonAnywhere deploy:

### Commit, and push your code up to Github
### Commit, and push your code up to GitHub

First off, let's see what files have changed since we last deployed (run these commands locally, not on PythonAnywhere):

Expand Down
8 changes: 4 additions & 4 deletions fr/deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Comme vous l'avez appris, un site web a besoin d'être installé sur un serveur.

[1]: https://www.pythonanywhere.com/

Nous allons aussi utiliser les services [GitHub][2], ce qui nous permettra d'héberger notre code en ligne. Il existe d'autres entreprises qui proposent des services similaires. Cependant, presque tous⋅tes les développeurs·ses possèdent aujourd'hui un compte Github et, dans quelques instants, vous aussi !
Nous allons aussi utiliser les services [GitHub][2], ce qui nous permettra d'héberger notre code en ligne. Il existe d'autres entreprises qui proposent des services similaires. Cependant, presque tous⋅tes les développeurs·ses possèdent aujourd'hui un compte GitHub et, dans quelques instants, vous aussi !

[2]: https://www.github.com

Github va nous servir d'intermédiaire pour envoyer et récupérer notre code sur PythonAnywhere.
GitHub va nous servir d'intermédiaire pour envoyer et récupérer notre code sur PythonAnywhere.

# Git

Expand Down Expand Up @@ -110,7 +110,7 @@ Tapez les instructions suivantes dans votre console (remplacez `<votre-nom-d'uti
$ git push -u origin master


Entrez votre nom d'utilisateur et mot de passe Github. Vous devriez voir quelque chose comme ceci :
Entrez votre nom d'utilisateur et mot de passe GitHub. Vous devriez voir quelque chose comme ceci :

Username for 'https://github.com': votre-nom
Password for 'https://[email protected]':
Expand Down Expand Up @@ -141,7 +141,7 @@ Une fois enregistré sur PythonAnywhere, vous serez automatiquement redirigée s

> **Note** : PythonAnywhere utilise Linux. Si vous êtes sous Windows, la console sera un peu différente de celle de votre ordinateur.
Importons notre code depuis Github vers PythonAnywhere en créant un "clone" de notre dépôt. Tapez la commande suivante dans la console de PythonAnywhere (n'oubliez pas d'utiliser votre nom d'utilisateur Github à la place de `<your-github-username>`):
Importons notre code depuis GitHub vers PythonAnywhere en créant un "clone" de notre dépôt. Tapez la commande suivante dans la console de PythonAnywhere (n'oubliez pas d'utiliser votre nom d'utilisateur GitHub à la place de `<your-github-username>`):

$ git clone https://github.com/<votre-nom-d'utilisateur-github>/my-first-blog.git

Expand Down
2 changes: 1 addition & 1 deletion fr/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Comme vous êtes probablement connectée, vous ne verrez aucune différence si v

Nos modifications fonctionnent-elles sur PythonAnywhere ? Pour le savoir, déployons à nouveau !

* Tout d'abord, commitez votre nouveau code et pushez-le à nouveau sur Github
* Tout d'abord, commitez votre nouveau code et pushez-le à nouveau sur GitHub
```
$ git status
$ git add --all .
Expand Down
2 changes: 1 addition & 1 deletion hu/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Próbáld ki a template-edben.

Jó lenne látni, hogy a weblapod még mindig működik az Interneten, nem igaz? Telepítsük újra a PythonAnywhere-en. Itt a lépések összefoglalója...

* Először tedd fel a kódot a Github-ra
* Először tedd fel a kódot a GitHub-ra
```
$ git status
[...]
Expand Down
4 changes: 2 additions & 2 deletions hu/html/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Amit igazából szeretnénk, hogy igazi posztokat jelenítünk meg, amiket a Dja

Jó lenne lenne látni ezt az egészet élesben az interneten, ugye? Csináljunk egy újabb PythonAnywhere deploy-t:

### Commit, és push a Github-ra
### Commit, és push a GitHub-ra

Először nézzük meg, hogy milyen fájlok változtak a legutóbbi deploy óta (futtasd az alábbi parancsot a gépeden, ne PythonAnywhere-en):

Expand All @@ -182,7 +182,7 @@ Már majdnem készen is vagyunk, de előtte el kell mentenünk a változtatások

> **Megjegyzés** Győződj meg róla, hogy idézőjelet használsz a commit üzenetnél.
Miután ezzel megvagy, töltsd fel (push) a változtatásaidat Github-ra:
Miután ezzel megvagy, töltsd fel (push) a változtatásaidat GitHub-ra:

$ git push

Expand Down
2 changes: 1 addition & 1 deletion it/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Ora, dato che probabilmente sei connessa/o, se aggiorni la pagina non troverai a

Vediamo se funziona su PythonAnywhere. È l'ora di un altro deploy!

* Innanzitutto, fai un commit del tuo nuovo codice e fai il push per caricarlo su Github
* Innanzitutto, fai un commit del tuo nuovo codice e fai il push per caricarlo su GitHub

```
$ git status
Expand Down
2 changes: 1 addition & 1 deletion it/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Ti sei accorto che abbiamo utilizzato una notazione leggermente diversa questa v

Sarebbe bello vedere se il tuo sito funziona ancora su Internet, giusto? Proviamo a fare il deploy su PythonAnywhere di nuovo. Ecco un riepilogo dei passaggi...

* Prima di tutto, fai il push del tuo codice verso Github
* Prima di tutto, fai il push del tuo codice verso GitHub

$ git status
[...]
Expand Down
2 changes: 1 addition & 1 deletion it/html/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Ci siamo quasi, ora è il momento di dirgli di salvare questa modifica nella cro

> **Nota** Assicurati di usare doppie virgolette attorno al messaggio di commit.
Quando hai finito, caricheremo (push) le nostre modifiche su Github:
Quando hai finito, caricheremo (push) le nostre modifiche su GitHub:

git push

Expand Down
4 changes: 2 additions & 2 deletions ko/chromebook_setup/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ pip install django~=1.11.0

(마지막 줄에는 물결표 뒤에 등호(~=) 기호를 사용합니다)

### Github
### GitHub

[Github](https://github.com) 계정을 만드세요.
[GitHub](https://github.com) 계정을 만드세요.

### PythonAnywhere

Expand Down
6 changes: 3 additions & 3 deletions ko/deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

앞에서 배웠듯이, 웹사이트는 서버라는 곳에 들어갑니다. 인터넷 상에 서버를 제공하는 업체들은 참 많습니다. 우리는 이 중에 비교적 배포 과정이 간단한 [PythonAnywhere](https://www.pythonanywhere.com/)을 사용할 거에요. PythonAnywhere는 방문자가 아주 많지 않은 소규모 애플리케이션을 위한 무료 서비스를 제공하고 있습니다. 지금 우리가 만드는 웹사이트도 해당됩니다.

우리가 사용할 다른 외부 서비스는 [GitHub](https://github.com/)이라는 코드 호스팅 서비스입니다. 요즘에는 모든 프로그래머들은 Github 계정을 가지고 있으니, 여러분도 Github 계정을 만들어봐요!
우리가 사용할 다른 외부 서비스는 [GitHub](https://github.com/)이라는 코드 호스팅 서비스입니다. 요즘에는 모든 프로그래머들은 GitHub 계정을 가지고 있으니, 여러분도 GitHub 계정을 만들어봐요!

로컬컴퓨터, Github, Pythonanywhere 이 세 곳은 모두 중요해요. 로컬 컴퓨터는 개발 및 테스트를 수행하는 곳이 될 것입니다. 개발이 완료되면 프로그램 복사본을 GitHub에 저장합니다. 웹사이트는 PythonAnywhere에 있고 GitHub에서 코드 사본을 업데이트할 거에요.
로컬컴퓨터, GitHub, Pythonanywhere 이 세 곳은 모두 중요해요. 로컬 컴퓨터는 개발 및 테스트를 수행하는 곳이 될 것입니다. 개발이 완료되면 프로그램 복사본을 GitHub에 저장합니다. 웹사이트는 PythonAnywhere에 있고 GitHub에서 코드 사본을 업데이트할 거에요.

# Git 설치하기
> **Note** 이미 설치가 완료되었다면, 다시 할 필요가 없어요. 다음 장으로 넘어가서 Git 저장소를 만드는 것부터 시작하세요.
Expand Down Expand Up @@ -100,7 +100,7 @@ $ git commit -m "My Django Girls app, first commit"

이제 내 컴퓨터의 Git 저장소를 GitHub에 있는 저장소로 연결해야합니다.

콘솔에 다음과 같이 입력하세요. (`<your-github-username>`에 꺽쇠괄호(<>)를 떼고 내 Github 사용자이름을 입력하세요)
콘솔에 다음과 같이 입력하세요. (`<your-github-username>`에 꺽쇠괄호(<>)를 떼고 내 GitHub 사용자이름을 입력하세요)

{% filename %}command-line{% endfilename %}
```
Expand Down
2 changes: 1 addition & 1 deletion ko/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ https://docs.djangoproject.com/en/1.11/topics/forms/

모든 작업을 끝마쳤으면 PythonAnywhere로 배포해야죠!

* 제일 먼저 코드를 커밋하고 Github로 푸시합니다.
* 제일 먼저 코드를 커밋하고 GitHub로 푸시합니다.

{% filename %}command-line{% endfilename %}
```
Expand Down
2 changes: 1 addition & 1 deletion ko/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ HTML에 여러분은 파이썬 코드를 바로 넣을 수 없어요. 브라우

나 혼자만 웹 사이트를 보는 게 아니라 다른 사람들도 인터넷으로 볼 수 있으면 참 좋겠죠? 이제 PythonAnywhere에 다시 여러분이 만든 블로그를 배포해봅시다. 아래에 각 단계별로 요약했어요.

* 제일 먼저, Github에 여러분의 코드를 git의 push를 사용해서 넣으세요.
* 제일 먼저, GitHub에 여러분의 코드를 git의 push를 사용해서 넣으세요.

{% filename %}command-line{% endfilename %}
```
Expand Down
2 changes: 1 addition & 1 deletion ko/html/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ blog

방금 고친 내용을 인터넷에서도 봐야겠죠? PythonAnywhere으로도 배포해 봅시다.

### Github에 코드를 커밋, 푸시하세요!
### GitHub에 코드를 커밋, 푸시하세요!

제일 먼저, 마지막 배포 이후 수정된 파일을 확인해 봅시다. (PythonAnywhere가 아닌 로컬에서 실행하세요)

Expand Down
4 changes: 2 additions & 2 deletions pt/chromebook_setup/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ pip install django~=1.9.0

(note que na última linha nós usamos um "til" seguido de um sinal de igual: ~=).

### Github
### GitHub

Crie uma conta no [Github](https://github.com).
Crie uma conta no [GitHub](https://github.com).

### PythonAnywhere

Expand Down
2 changes: 1 addition & 1 deletion pt/django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ Como você deve estar "logada", se você atualizar a página, não verá nada de

Vamos ver se tudo isso funciona na PythonAnywhere. Tempo para outro deploy!

* Primeiro, commit o seu novo código e coloque no Github
* Primeiro, commit o seu novo código e coloque no GitHub

```bash
$ git status
Expand Down
2 changes: 1 addition & 1 deletion pt/django_templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Você notou que dessa vez nós usamos uma notação um pouco diferente `{{ post.

Seria bom ver se seu site ainda estará funcionando na internet, certo? Vamos tentar fazer a implantação na PythonAnywhere novamente. Aqui está um resumo dos passos...

* Primeiro, envie seu código para o Github
* Primeiro, envie seu código para o GitHub

{% filename %}command-line{% endfilename %}
```
Expand Down
Loading

0 comments on commit c91510c

Please sign in to comment.