forked from DjangoGirls/tutorial
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request DjangoGirls#1290 from rhcarvalho/github-spelling
Make GitHub capitalization consistent
- Loading branch information
Showing
42 changed files
with
73 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
|
||
|
@@ -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 | ||
|
||
|
@@ -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: | ||
|
||
|
@@ -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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
||
|
@@ -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]': | ||
|
@@ -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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.