Merge branch 'master' into update-readme-1793

Author: fltfx

.github/workflows/deploy.yml

@@ -1,27 +1,47 @@
+---
 name: Build and Deploy
+
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
 jobs:
-  build-and-deploy:
+  build:
     runs-on: ubuntu-latest
-    if: github.repository == 'djangogirls/tutorial'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
-
       - name: Install and Build
         run: |
           npm install
           npx honkit build
-
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: _book
+          path: _book
+
+  deploy:
+    needs: build
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
 

README.md

@@ -1,7 +1,25 @@
 # Django Girls Tutorial
 
-This is the source code repository for the Django Girls Tutorial. Django Girls Tutorial is used on [tutorial.djangogirls.org](http://tutorial.djangogirls.org) so if you want to read it, please go there. If you want to contribute please do go further with this file.
+~ 🖥 Source Code 🖥 ~
 
+**NOT** intended for reading here. To read go to: [📖 tutorial.djangogirls.org 📖](https://tutorial.djangogirls.org)
+
+# Contribution QUICKSTART
+
+1. Fork this repo [[fork](#fork-the-repository)]
+
+> 2. **[Small changes](#simple-changes)**: you can now edit your fork on the github website, do this! Make a change, then [create a pull request](#making-a-pull-request)!
+
+2. **[Big changes](#new-content-and-complex-changes)**: clone your fork locally.
+3. [CLI](#cli-for-development) run `make dev` in repo.
+
+```
+$ make dev
+...
+Serving book on http://localhost:4000
+```
+
+Note: we have many changes under way we maybe working on your request already! Refer to existing [Pull requests](https://github.com/DjangoGirls/tutorial/pulls).
 
 # How to contribute
 
@@ -34,7 +52,7 @@ First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) r
 
 ## CLI for Development
 
-This command line tool use `make` to create development environment. It is optional to use this tool. While building the document, it builds the document for every language. The build process can be limited to any one language using this tool and reduce build time considerbly. Afterwards, the translation to other languages are done from crowdin localization process.
+This command line tool use `make` to create development environment. It is optional to use this tool. While building the document, it builds the document for every language. The build process can be limited to any one language using this tool and reduce build time considerably. Afterwards, the translation to other languages are done from crowdin localization process.
 
 Usage instructions are available though `make help` command.
 
@@ -136,8 +154,7 @@ should be made to the `restructure-tutorial`.
 All other steps for creating a pull request are the same as those outlined in the section on [making a pull request below](#making-a-pull-request), just make sure you make the pull request against the `restructure-tutorial` branch.
 
 # Making a pull request {#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://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)  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*
 

book.json

@@ -1,17 +1,14 @@
 {
     "gitbook": ">=3.2.0",
     "variables": {
-      "py_version": "3.8",
-      "py_release": "3.8.6",
-      "py_min_version": "3.6",
-      "py_min_release": "3.6.8",
-      "pa_py_version": "3.8",
-      "django_version": "3.2.10"
+      "py_version": "3.12",
+      "py_release": "3.12.3",
+      "py_min_version": "3.9",
+      "py_min_release": "3.9.19",
+      "pa_py_version": "3.10",
+      "django_version": "4.2.11"
     },
     "links": {
-        "sidebar": {
-            "Need help? Talk to us!": "https://gitter.im/DjangoGirls/tutorial"
-        }
     },
     "pdf": {
         "fontSize": 16
@@ -44,22 +41,28 @@
             "ads": [
                 {
                     "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg",
-                    "url": "https://www.patreon.com/djangogirls",
-                    "description": "💖 Support our work and donate to our project! ✨",
-                    "btnText": "Donate now!"
-                },
-                {
-                    "imageUrl": "https://posthog.com/static/1cf376d3f6ea36d7fafb9b1c50110603/0b2f4/hosthog-banner.webp",
-                    "url": "https://posthog.com/",
-                    "description": "💖 PostHog offers a suite of product analysis tools! ✨",
-                    "btnText": "Learn more!"
+                    "url": "https://surveys.jetbrains.com/s3/w-django-girls-survey-2024",
+                    "description": "💖 Celebrate 10 years with us. Fill our survey! ✨",
+                    "btnText": "Fill in now!"
                 },
                 {
                     "imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png",
                     "url": "https://www.djangoproject.com/",
                     "description": "💖 The DSF supports the development of Django! ✨",
                     "btnText": "Learn more!"
                 },
+                {
+                    "imageUrl": "https://djangogirls.org/static/img/global/supporters/DO_Logo_Vertical_Blue.png",
+                    "url": "https://www.digitalocean.com/",
+                    "description": "💖 DigitalOcean simplifies cloud computing! ✨",
+                    "btnText": "Learn more!"
+                },
+                {
+                    "imageUrl": "https://djangogirls.org/uploads/uploads/posthog.png",
+                    "url": "https://posthog.com/",
+                    "description": "💖 PostHog offers a suite of product analysis tools! ✨",
+                    "btnText": "Learn more!"
+                },
                 {
                     "imageUrl": "https://djangogirls.org/uploads/uploads/lincolnloop.png",
                     "url": "https://lincolnloop.com/",
@@ -78,6 +81,12 @@
                     "description": "💖 Host, run, and code Python in the cloud! ✨",
                     "btnText": "Learn more! "
                 },
+                {
+                    "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg",
+                    "url": "https://www.patreon.com/djangogirls",
+                    "description": "💖 Support our work and donate to our project! ✨",
+                    "btnText": "Donate now!"
+                },
                 {
                     "imageUrl": "https://djangogirls.org/static/img/global/donate/tshirt.jpg",
                     "url": "https://djangogirls.org/en/contact/",

de/README.md

@@ -40,7 +40,7 @@ In jedem Kapitel, das bereits mit Video unterstützt wird, gibt es einen Link au
 
 ## Über uns und wie du mithelfen kannst
 
-Dieses Tutorial wird von [DjangoGirls](https://djangogirls.org/) betreut. Solltest du Fehler finden oder das Tutorial aktualisieren wollen, dann folge den [Richtlinien zum Mitarbeiten](https://github.com/DjangoGirls/tutorial/blob/master/CONTRIBUTING.md).
+Dieses Tutorial wird von [DjangoGirls](https://djangogirls.org/) betreut. Solltest du Fehler finden oder das Tutorial aktualisieren wollen, dann folge den [Richtlinien zum Mitarbeiten](https://github.com/DjangoGirls/tutorial/blob/master/README.md).
 
 ## Möchtest du uns helfen, das Tutorial in andere Sprachen zu übersetzen?
 

de/python_installation/instructions.md

@@ -47,10 +47,10 @@ data-collapse=true ces-->
 Es ist ziemlich wahrscheinlich, dass du Python schon automatisch installiert hast. Um herauszufinden, ob das so ist (und wenn ja, welche Version du hast), öffne eine Konsole und gib das folgende Kommando ein:
 
 {% filename %}command-line{% endfilename %}
-
-    $ python3 --version
-    Python {{ book.py_release }}
-    
+```
+$ python3 --version
+Python {{ book.py_release }}
+``` 
 
 Wenn du eine andere Version von Python installiert hast, die {{ book.py_min_version }} oder höher ist, z.B. {{ book.py_min_release }}, dann musst du die Version nicht aktualisieren. Wenn du Python noch nicht installiert hast oder wenn du eine andere Python-Version willst, prüfe zuerst mit folgendem Befehl, welche Linux-Distribution du benutzt:
 
@@ -103,15 +103,15 @@ Gib diesen Befehl in die Konsole ein:
 Prüfe, ob die Installation erfolgreich war, indem du ein Kommandozeilenfenster öffnest und den `python3`-Befehl ausführst:
 
 {% filename %}command-line{% endfilename %}
-
-    $ python3 --version
-    Python {{ book.py_release }}
-    
+```
+$ python3 --version
+Python {{ book.py_release }}
+```    
 
 Die angezeigte Version kann bei dir eine andere sein als {{ book.py_release }} -- sie sollte aber der entsprechen, die du installiert hast.
 
 **Hinweis:** Wenn du unter Windows eine Fehlermeldung bekommst, dass `python3` nicht gefunden wurde, versuche es mit `python` (ohne die `3`) und prüfe, ob es dennoch eine Version von Python {{ book.py_min_version }} oder höher ist. Wenn auch das nicht funktioniert, kannst du ein neues Kommandozeilenfenster öffnen und es dort erneut versuchen; dies geschieht, wenn du ein Kommandozeilenfenster verwendet, das schon vor der Python-Installation geöffnet war.
 
 * * *
 
-Wenn es Unklarheiten gibt oder wenn etwas schief ging und du nicht weiter weißt, frage bitte deinen Coach! Manchmal laufen die Dinge einfach nicht so glatt und dann ist es besser, jemanden mit mehr Erfahrung um Hilfe zu bitten.
+Wenn es Unklarheiten gibt oder wenn etwas schief ging und du nicht weiter weißt, frage bitte deinen Coach! Manchmal laufen die Dinge einfach nicht so glatt und dann ist es besser, jemanden mit mehr Erfahrung um Hilfe zu bitten.

el/deploy/images/pythonanywhere_account.png

@@ -1,5 +1,4 @@
 # Django Girls Tutorial
-[![Gitter](https://badges.gitter.im/DjangoGirls/tutorial.svg)](https://gitter.im/DjangoGirls/tutorial)
 
 > This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 > To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/4.0/
@@ -27,8 +26,6 @@ It will (more or less) look like this:
 
 ![Figure 0.1](images/application.png)
 
-> If you work with the tutorial on your own and don't have a coach who will help you in case of any problem, we have a chat system for you: [![Gitter](https://badges.gitter.im/DjangoGirls/tutorial.svg)](https://gitter.im/DjangoGirls/tutorial). We asked our coaches and previous attendees to be there from time to time and help others with the tutorial! Don't be afraid to ask your question there!
-
 OK, [let's start at the beginning…](./how_the_internet_works/README.md)
 
 ## Following the tutorial at home

en/README.md

@@ -2,7 +2,6 @@
 
 * [Introduction](README.md)
 * [Installation](installation/README.md)
-  * [Installation (RunCode Cloud)](cloud_development_setup/README.md)
   * [Installation (Chromebook)](chromebook_setup/README.md)
   * [Installation (OS X/Windows/Linux)](installation/README.md#osx-windows-linux)
   * [Command Line](installation/README.md#intro-command-line)