From 317e2b6ee890963b93a55ed8d7e91f32fa6c7f54 Mon Sep 17 00:00:00 2001
From: Claudia Wong <claudiaywong@msn.com>
Date: Wed, 25 Sep 2024 21:35:04 +0200
Subject: [PATCH 1/2] Added csuggestions for git installation bug for Mac
 M1/M2/M3 ussers

---
 LANGS.md                 | 19 -------------------
 en/deploy/install_git.md |  7 ++++++-
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/LANGS.md b/LANGS.md
index 751d6faf913..46a4163db80 100644
--- a/LANGS.md
+++ b/LANGS.md
@@ -1,20 +1 @@
 * [🇺🇸 English](en/)
-* [🇧🇬 Български (beta)](bg/)
-* [🇨🇿 Čeština (beta)](cs/)
-* [🇩🇪 Deutsch](de/)
-* [🇬🇷 Ελληνικά (beta)](el/)
-* [🇪🇸 Español (beta)](es/)
-* [🇮🇷 فارسی (beta)](fa/)
-* [🇫🇷 Français (beta)](fr/)
-* [🇭🇺 Magyar (beta)](hu/)
-* [🇦🇲 հայերեն (beta)](hy/)
-* [🇮🇹 Italiano (beta)](it/)
-* [🇯🇵 日本語](ja/)
-* [🇰🇵/🇰🇷 한국어 (beta)](ko/)
-* [🇵🇱 Polski](pl/)
-* [🇧🇷 Português-brasileiro](pt/)
-* [🇷🇺 Русский (beta)](ru/)
-* [🇸🇰 Slovenčina (beta)](sk/)
-* [🇹🇷 Türkçe (beta)](tr/)
-* [🇺🇦 Українська](uk/)
-* [🇨🇳 简体中文](zh/)
diff --git a/en/deploy/install_git.md b/en/deploy/install_git.md
index 0208d483d93..8ee9f29ee07 100644
--- a/en/deploy/install_git.md
+++ b/en/deploy/install_git.md
@@ -13,10 +13,15 @@ Do not forget to restart the command prompt or PowerShell after the installation
 <!--sec data-title="Installing Git: OS X" data-id="git_install_OSX"
 data-collapse=true ces-->
 
-Download Git from [git-scm.com](https://git-scm.com/) and follow the instructions.
+Download Git from [https://git-scm.com/download/mac](https://git-scm.com/download/mac) and follow the instructions.
 
 > **Note** If you are running OS X 10.6, 10.7, or 10.8, you will need to install the version of git from here: [Git installer for OS X Snow Leopard](https://sourceforge.net/projects/git-osx-installer/files/git-2.3.5-intel-universal-snow-leopard.dmg/download)
 
+> It is recommended to install using brew (you may need to install homebrew if you don't already have it): 
+> ```brew install git```
+> 
+> Please note that some Mac M1/M2/M3 users may have the error `zsh: command not found: brew`. In that case, please follow [this](https://stackoverflow.com/a/66019047) or [this](https://mac.install.guide/homebrew/zsh-command-not-found-brew) to fix the error.
+
 <!--endsec-->
 
 <!--sec data-title="Installing Git: Debian or Ubuntu" data-id="git_install_debian_ubuntu"

From 744e7840085ca0a3a79fc091bfd4cc77b0081ed3 Mon Sep 17 00:00:00 2001
From: Claudia Wong <claudiaywong@msn.com>
Date: Wed, 25 Sep 2024 22:24:35 +0200
Subject: [PATCH 2/2] Added github generate access token instructions

---
 LANGS.md            | 19 +++++++++++++++++++
 en/deploy/README.md | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/LANGS.md b/LANGS.md
index 46a4163db80..751d6faf913 100644
--- a/LANGS.md
+++ b/LANGS.md
@@ -1 +1,20 @@
 * [🇺🇸 English](en/)
+* [🇧🇬 Български (beta)](bg/)
+* [🇨🇿 Čeština (beta)](cs/)
+* [🇩🇪 Deutsch](de/)
+* [🇬🇷 Ελληνικά (beta)](el/)
+* [🇪🇸 Español (beta)](es/)
+* [🇮🇷 فارسی (beta)](fa/)
+* [🇫🇷 Français (beta)](fr/)
+* [🇭🇺 Magyar (beta)](hu/)
+* [🇦🇲 հայերեն (beta)](hy/)
+* [🇮🇹 Italiano (beta)](it/)
+* [🇯🇵 日本語](ja/)
+* [🇰🇵/🇰🇷 한국어 (beta)](ko/)
+* [🇵🇱 Polski](pl/)
+* [🇧🇷 Português-brasileiro](pt/)
+* [🇷🇺 Русский (beta)](ru/)
+* [🇸🇰 Slovenčina (beta)](sk/)
+* [🇹🇷 Türkçe (beta)](tr/)
+* [🇺🇦 Українська](uk/)
+* [🇨🇳 简体中文](zh/)
diff --git a/en/deploy/README.md b/en/deploy/README.md
index a2561b9171b..dd2a7cd7cf2 100644
--- a/en/deploy/README.md
+++ b/en/deploy/README.md
@@ -151,13 +151,42 @@ To https://github.com/ola/my-first-blog.git
 Branch main set up to track remote branch main from origin.
 ```
 
-> **Note** You might encounter the following error when trying to push to GitHub:
+**Note** You will likely encounter the following error when trying to push to GitHub:
 ```
 remote: Support for password authentication was removed on August 13, 2021.
 remote: Please see https://docs.github.com/get-started/getting-started-with-git/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.
 fatal: Authentication failed for 'https://github.com/<your-github-username>/my-first-blog.git/'
 ```
-In this case, follow the instructions from GitHub to [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic). The token should have the 'repo' scope. Copy the value of the token, then try the git push command again. When you are prompted to enter your username and password, enter the access token instead of your password. 
+In this case, follow the instructions from GitHub to [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic). The token should have the 'repo' scope. Copy the value of the token, then try the git push command again. When you are prompted to enter your username and password, enter the access token instead of your password:
+
+1. Go to profile settings or go here: https://github.com/settings/profile
+2. Scroll down and click "Developer settings" on left-hand menu or go here: https://github.com/settings/apps
+3. On left-hand menu, press "Personal access tokens" to expand the dropdown menu. Click "Tokens (classic)"
+4. In the top-right, click "Generate new token", and then click "Generate new token (classic)". You will need to authenticate your account at this point.
+5. Fill in the form:
+  - Note: Django girls blog
+  - Expiration: No expiration (or if you want more security, choose 90 days)
+  - Select scopes: Check every box 
+6. Press "Generate token"
+7. Copy the token generated (it's the text string that likely starts with `ghp...`) and store this token somewhere secure as once you close this page, you will lose access to viewing this token and will need to generate a new one if you lose it. For example, you could store it in a password manager or even in a note on your computer.
+8. Run the command in the terminal again:
+  {% filename %}command-line{% endfilename %}
+  ```
+  $ git push -u origin HEAD
+  ```
+9. When the terminal asks for `username`, enter in your github username. Press enter.
+10. Next, it will ask for `password`. Do not use your github password as this method of authenticating ("logging in") is deprecated. Copy the token you just generated (either from github or wherever you carefully stored this token) and carefully paste it into the terminal. Note that as you paste or even type into the terminal for the password, nothing will appear (you can't see what you typed) for security reasons (it's designed like this on purpose). Press enter.
+11. If that worked, you will see the output as below. If you are unsuccesful, try to run `git push -u origin HEAD` again and make sure that you enter in your github username and the token (as the password) correctly.
+
+{% filename %}command-line{% endfilename %}
+```
+Counting objects: 6, done.
+Writing objects: 100% (6/6), 200 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To https://github.com/ola/my-first-blog.git
+ * [new branch]      main -> main
+Branch main set up to track remote branch main from origin.
+```
 
 <!--TODO: maybe do ssh keys installs in install party, and point ppl who dont have it to an extension -->