Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename master branch to main #5803

Closed
charlottetan opened this issue Oct 3, 2021 · 6 comments · Fixed by #6627
Closed

Rename master branch to main #5803

charlottetan opened this issue Oct 3, 2021 · 6 comments · Fixed by #6627
Assignees
@eshellman
Labels
New Feature New feature / enhancement / translation...

Comments

@charlottetan
Copy link
Contributor

Request to rename master to main for cultural sensitivity and inclusivity:

https://github.com/github/renaming

https://www.theserverside.com/feature/Why-GitHub-renamed-its-master-branch-to-main
@Kriti021999
Copy link

I would like to work on this issue.

@davorpa
Copy link
Member

davorpa commented Oct 4, 2021 •
edited
Loading

I would like to work on this issue.

#BlackLivesMatter No masters, no slaves neither is the time. It's Hacktoberfest 🎉 and repo is 🔥

/addthis: backlog

@davorpa davorpa added conflicts Conflict(s) need to be resolved 👥 discussion This Repo is guided by its community! Let's talk! New Feature New feature / enhancement / translation... labels Oct 4, 2021
@eshellman
Copy link
Collaborator

We should do this after hacktoberfest as part of the general cleanup.

@codexmon
Copy link

only org owners or admin folks can change the name - "For organization owners, on the https://github.com/organizations/YOUR-ORGANIZATION/settings/repository-defaults page
For enterprise administrators, on the https://github.com/enterprises/YOUR-ENTERPRISE/settings/member_privileges page"

@eshellman
Copy link
Collaborator

master branch has been renamed to main.

@davorpa
Copy link
Member

davorpa commented Nov 20, 2021 •
edited
Loading

I review a bit and it left some rewording in files.

free-programming-books/.github/PULL_REQUEST_TEMPLATE.md

Line 14 in 31fb248

- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/master/CONTRIBUTING.md)

plus changes already made in #6614

@davorpa davorpa reopened this Nov 20, 2021
@davorpa davorpa added waiting for changes PR has been reviewed and changes/suggestions requested and removed 👥 discussion This Repo is guided by its community! Let's talk! conflicts Conflict(s) need to be resolved labels Nov 20, 2021
davorpa added a commit to davorpa/free-programming-books that referenced this issue Nov 20, 2021
@davorpa
chore: Rename master to main #blacklivesmatter
8335d05 
Resolves EbookFoundation#5803
@davorpa davorpa mentioned this issue Nov 20, 2021
Merged
1 task
eshellman pushed a commit that referenced this issue Nov 23, 2021
@davorpa @LuigiImVector
chore: Rename master to main #blacklivesmatter (#6627)
ee4b9ee 
* chore: Rename `master` to `main` #blacklivesmatter

Resolves #5803

* docs(contributing): fix broken ref link to `programming-playgrounds`

Fix over #5449 and commit 3c42c36

(cherry picked from commit 59ebfe3)

* fix: Complete #6614 upstream/main merge

Over commit: 4d3c9fe

Co-authored-by: ImVector <[email protected]>

Co-authored-by: ImVector <[email protected]>
@davorpa davorpa removed the waiting for changes PR has been reviewed and changes/suggestions requested label Nov 24, 2021
eshellman pushed a commit that referenced this issue Feb 3, 2022
@davorpa
docs(contributing): Homogenize format across translated files (#6625)
84438cb 
* docs(contributing): remove trailing spaces

* docs(contributing): Apply headings `2-1` empty lines lint rule

* docs(contributing): Apply headings `2-1` empty lines lint rule

forgotten in previous commit: e83220a

* docs(contributing): Move anchor alias to inside list items

... there where an anchor alias `<a name="...">` is used near to each of those list items

This solves markdownlint `MD032/blanks-around-lists` issue

* docs(contributing): Homogenize `1` blank line in nutshell enumeration

* docs(contributing): Homogenize `1` blank line inside Formatting section

* docs(contributing): Ensure `4-spaces` indent `.editorconfig` param

* docs(contributing): Homogenize format & indent of code blocks

- Format using fenced style.
- Well indent in those placed inside list enumerations.
- Simulate `Good` - `Bad` monospace double colon indent inside each one.

- Examples highlighting as `text-plain`. The `md, markdown` style doesn't work very well since blocks has mixed syntax.
- `check_urls` code block highlighted as `properties` style (key-value pair).

Solves markdownlint rules:
- MD040/fenced-code-language: Fenced code blocks should have a language specified
- MD046/code-block-style: Code block style [Expected: indented; Actual: fenced]

* docs(contributing): Ensure `4-spaces` indent `.editorconfig` param

Forgotten in commit: 31c776c

* docs(contributing): Homogenize format & indent of code blocks

- Simulate `Good` - `Bad` monospace double colon indent inside each one.

Revert commit f9dc719 only in this file after check non-needs in a deployed web snapshot

* docs(contributing): Use "consistent" unordered list mark

Solves markdownlint rules:
MD004/ul-style: Unordered list style "consistent"

* docs(contributing): Solve `no-space-in-*` lint rules

markdownlint rules:
MD037/no-space-in-emphasis: Spaces inside emphasis
MD038/no-space-in-code: Spaces inside code span elements
MD039/no-space-in-links: Spaces inside link text

* docs(contributing): Move some punctuation just before any closing brackets after it

* docs(contributing): Hack highlight IDE/Editors headings+HTML

It apply the hack to highlight in IDE/Editors those headings with an anchor alias just before itself

* docs(contributing): Homogenize Pull Request acronym

* docs(contributing): Fix `GitHub` trademark typos

* docs(contributing): ALLCAPS

* docs(contributing): Git trademark

* docs(contributing): YouTube trademark

* docs(contributing): ISBN acronym

* fix: flag emoji code `en` > `us`

Resolves d775cb3#commitcomment-59537594

#5831: `:en:` emoji flag markup doesn't work. Use `:us:` :us: or `:gb:` :gb:

d775cb3#diff-b35eb40c148657d4ea1361c44496e11c5625f484a4c6040c022770e88cbcfdccR8-R10

* docs(contributing): Fix fa_IR broken anchors

* docs(contributing): filenames in monospace font

* docs(contributing): Homogenize `check_urls=file_to_check`

* docs(contributing): literals/markup texts in monospace font

- `et al.`
- File extensions `.md`
- Protocols: `http`, `https`...
- Notes: LeanPub, require email, StackOverflow, in process, archived

trailing dots in that lines

* docs(contributing): linkify wayback machine

* docs(contributing): Fix `Leanpub` trademark typos

* chore: Rename `master` to `main` #blacklivesmatter

Resolves #5803

* docs(contributing): fix broken ref link to `programming-playgrounds`

Fix over #5449 and commit 3c42c36

(cherry picked from commit 59ebfe3)

* docs(contributing): fix repo urls on initial FR translation

- `ElivreFoundation` -> `EbookFoundation`
- `free-programming-livres` ->`free-programming-books`

PR: #5554
Commit: e629db6

Affected lines: 
- 18bb745#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R4 // e629db6#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R4
- 18bb745#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R7 // e629db6#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R7
- 18bb745#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R13 // e629db6#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R13
- 18bb745#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R45 // e629db6#diff-d6fa57ebb070f7f05f8c686a2fe92110652f48886774460ffee08d4be4cd5f27R45

* docs(contributing): use relative urls EN

Via #6614

* docs(contributing): greek. place translations link in right place

Via #6614

* Merge #6631 upstream/main commit into docs/contributing/sync/1

* Add repo badges (see #5983)

(cherry picked from a16a79b solving merge conflict)

* Merge #6662 upstream/main commit into docs/contributing/sync/1

* Apply centering proposed at #5983 but not implemented in #6631

(cherry picked from commit f36fd03)

* format(contributing): Bold 5th nutshell equal zh

* Merge #6677 upstream/main commit into docs/contributing/sync/1

fix(docs): Use Kramdown processor (#6677)
* Update _config.yml
* add markdown="1"
* update url
* complete removing spaces?
* explicitly use kramdown

(cherry picked from commit de2f319)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@eshellman eshellman

Labels
New Feature New feature / enhancement / translation...
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

chore!: Rename master to main #blacklivesmatter davorpa/free-programming-books
5 participants
@eshellman @davorpa @charlottetan @codexmon @Kriti021999