From 912fad7169cbce0b35855854877ed028b2a99db8 Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Mon, 17 Oct 2022 12:45:47 +0200 Subject: [PATCH] Remove references to "master" Instead use the default branch (`-`) or `HEAD`. Fixes: #971 (partially) Signed-off-by: Fini Jastrow --- Codepoint-Conflicts.md | 2 +- Contributor-Developer-Setup.md | 4 ++-- Development-Guide.md | 6 +++--- Development-Workflow.md | 10 +++++----- FAQ-and-Troubleshooting.md | 4 ++-- Font-Substitution-&-Fallback.md | 4 ++-- Glyph-Sets-and-Code-Points.md | 2 +- Home.md | 4 ++-- Icon-Names-in-Shell.md | 6 +++--- Project-Purpose.md | 4 ++-- Real-World-Mentions-&-Usage-(Sightings).md | 4 ++-- Release-Workflow.md | 20 ++++++++++---------- Reporting-Issues.md | 6 +++--- Screenshots.md | 4 ++-- Terminal-Emulators.md | 2 +- _Footer.md | 6 +++--- _Sidebar.md | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Codepoint-Conflicts.md b/Codepoint-Conflicts.md index a7f557b..ae882f6 100644 --- a/Codepoint-Conflicts.md +++ b/Codepoint-Conflicts.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

## Everyone wants to be at `u_F000` diff --git a/Contributor-Developer-Setup.md b/Contributor-Developer-Setup.md index 29ae65c..fdef5b2 100644 --- a/Contributor-Developer-Setup.md +++ b/Contributor-Developer-Setup.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

0. [Prerequisites](#prerequisites) @@ -131,7 +131,7 @@ todo ```sh pip install fonttools -curl https://raw.githubusercontent.com/source-foundry/Hack/master/tools/scripts/install/ttfautohint-build.sh --output ~/ttfautohint-build.sh +curl https://raw.githubusercontent.com/source-foundry/Hack/HEAD/tools/scripts/install/ttfautohint-build.sh --output ~/ttfautohint-build.sh chmod 770 ~/ttfautohint-build.sh cd ~ sudo ./ttfautohint-build.sh diff --git a/Development-Guide.md b/Development-Guide.md index 142af84..40a5a3b 100644 --- a/Development-Guide.md +++ b/Development-Guide.md @@ -1,8 +1,8 @@

- Nerd Fonts + Nerd Fonts

* [Contributor Developer Setup](https://github.com/ryanoasis/nerd-fonts/wiki/Contributor-Developer-Setup) -* [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/master/contributing.md) +* [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/-/contributing.md) * [Development Workflow](https://github.com/ryanoasis/nerd-fonts/wiki/Development-Workflow) -* [Pull Request Template](https://github.com/ryanoasis/nerd-fonts/blob/master/.github/PULL_REQUEST_TEMPLATE.md) \ No newline at end of file +* [Pull Request Template](https://github.com/ryanoasis/nerd-fonts/blob/-/.github/PULL_REQUEST_TEMPLATE.md) diff --git a/Development-Workflow.md b/Development-Workflow.md index c4bb939..aff04c2 100644 --- a/Development-Workflow.md +++ b/Development-Workflow.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

## KISS Workflow* @@ -14,7 +14,7 @@ ### Overview -- `master` is basically the stable dev or nightly branch +- The default branch is basically the stable dev or nightly branch - Pull Requests are simply merged in (not rebased) - There are no squashing requirements at the moment - Each release will have a tag and a branch @@ -23,9 +23,9 @@ ### Workflow -1. Pull Requests and Bug Fixes go directly into `master` after basic testing +1. Pull Requests and Bug Fixes go directly into the default branch after basic testing 2. Releases are built and 'released' about once a month - 1. Items/Issues ready at this time (i.e. in `master`) get added in the release + 1. Items/Issues ready at this time (i.e. in the default branch) get added in the release 2. Items/Issues not ready at this time do get to be in the official release @@ -42,4 +42,4 @@ _*Based on [GitFlow][], [GitHub Flow][] and [a][gitflow-considered-harmful] [few [GitHub Flow]: http://scottchacon.com/2011/08/31/github-flow.html [gitflow-considered-harmful]: http://endoflineblog.com/gitflow-considered-harmful [follow-up-to-gitflow-considered-harmful]: http://endoflineblog.com/follow-up-to-gitflow-considered-harmful -[a-succesful-git-branching-model-considered-harmful]: http://barro.github.io/2016/02/a-succesful-git-branching-model-considered-harmful/ \ No newline at end of file +[a-succesful-git-branching-model-considered-harmful]: http://barro.github.io/2016/02/a-succesful-git-branching-model-considered-harmful/ diff --git a/FAQ-and-Troubleshooting.md b/FAQ-and-Troubleshooting.md index 3dc5edc..b600029 100644 --- a/FAQ-and-Troubleshooting.md +++ b/FAQ-and-Troubleshooting.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

@@ -14,7 +14,7 @@ 0. [Why do some of the fonts names appear incorrect or appear to have typos?](#why-do-some-of-the-fonts-names-appear-incorrect-or-appear-to-have-typos) 0. [What do these acronym variations in the font name mean: `LG`, `L`, `M`, `S`, `DZ`, `SZ`?](#what-do-these-acronym-variations-in-the-font-name-mean-lg-l-m-s-dz-sz) 0. [Why isn't my favorite font included (already patched)?](#why-isnt-my-favorite-font-included) -0. [Error: munmap_chunk(): invalid pointer](#munmap_chunk-invalid-pointer) +0. [Error: munmap\_chunk(): invalid pointer](#munmap_chunk-invalid-pointer) 0. [segmentation fault running patcher](#segmentation-fault-running-python-patcher) --- diff --git a/Font-Substitution-&-Fallback.md b/Font-Substitution-&-Fallback.md index c8b48a4..2f55c17 100644 --- a/Font-Substitution-&-Fallback.md +++ b/Font-Substitution-&-Fallback.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

In general Patched Fonts are not necessary required, because several systems support [font substitution](https://en.wikipedia.org/wiki/Font_substitution) and/or [Fallback fonts](https://en.wikipedia.org/wiki/Fallback_font) @@ -28,4 +28,4 @@ Adapted from @sharkusk's issue, for complete context see: https://github.com/rya Leveraging Fontconfig -see: https://github.com/ryanoasis/nerd-fonts/blob/master/10-nerd-font-symbols.conf +see: https://github.com/ryanoasis/nerd-fonts/blob/-/10-nerd-font-symbols.conf diff --git a/Glyph-Sets-and-Code-Points.md b/Glyph-Sets-and-Code-Points.md index 3284fba..7a673f2 100644 --- a/Glyph-Sets-and-Code-Points.md +++ b/Glyph-Sets-and-Code-Points.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

:mag: :mag: You can now search for glyphs easily on [NerdFonts.com][Cheat Sheet] via the [Cheat Sheet][] diff --git a/Home.md b/Home.md index 13e26cb..be89c78 100644 --- a/Home.md +++ b/Home.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

@@ -48,4 +48,4 @@ Being its own project and repository adds a lot of benefits besides just separat [octicons]:https://github.com/github/octicons [gabrielelana-pomicons]:https://github.com/gabrielelana/pomicons [Seti-UI]:https://atom.io/themes/seti-ui -[ryanoasis-powerline-extra-symbols]:https://github.com/ryanoasis/powerline-extra-symbols \ No newline at end of file +[ryanoasis-powerline-extra-symbols]:https://github.com/ryanoasis/powerline-extra-symbols diff --git a/Icon-Names-in-Shell.md b/Icon-Names-in-Shell.md index ff5f8ad..7f86e7c 100644 --- a/Icon-Names-in-Shell.md +++ b/Icon-Names-in-Shell.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

:mag: :mag: You can now search for glyphs easily on [NerdFonts.com][Cheat Sheet] via the [Cheat Sheet][] @@ -9,7 +9,7 @@ # Icon Names in Shell -Download provided `.sh` files from [bin/scripts/lib/](https://github.com/ryanoasis/nerd-fonts/blob/master/bin/scripts/lib/) directory somewhere, recommended locations are `~/.local/share/fonts/` or `~/bin/`. +Download provided `.sh` files from [bin/scripts/lib/](https://github.com/ryanoasis/nerd-fonts/blob/-/bin/scripts/lib/) directory somewhere, recommended locations are `~/.local/share/fonts/` or `~/bin/`. - `i_all.sh` - helper to load all files you've downloaded at once - `i_dev.sh` - Devicons (198 icons, 8 does not have an established name) @@ -63,4 +63,4 @@ Website References [website-iecpower]:https://unicodepowersymbol.com/ [Cheat Sheet]:https://nerdfonts.com/#cheat-sheet -[stickers]:https://www.redbubble.com/people/ryanoasis/works/30764810-nerd-fonts-iconic-font-aggregator \ No newline at end of file +[stickers]:https://www.redbubble.com/people/ryanoasis/works/30764810-nerd-fonts-iconic-font-aggregator diff --git a/Project-Purpose.md b/Project-Purpose.md index 69e4318..e0e5d63 100644 --- a/Project-Purpose.md +++ b/Project-Purpose.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

@@ -19,4 +19,4 @@ This project began as a part of the [VimDevIcons] Repository but soon it became * project and repository previously known as `nerd-filetype-glyphs-fonts-patcher` and `font-nerd-icons` -[VimDevIcons]:https://github.com/ryanoasis/vim-devicons "VimDevIcons Vim Plugin (external link) ➶" \ No newline at end of file +[VimDevIcons]:https://github.com/ryanoasis/vim-devicons "VimDevIcons Vim Plugin (external link) ➶" diff --git a/Real-World-Mentions-&-Usage-(Sightings).md b/Real-World-Mentions-&-Usage-(Sightings).md index a00d8bd..c76ee4d 100644 --- a/Real-World-Mentions-&-Usage-(Sightings).md +++ b/Real-World-Mentions-&-Usage-(Sightings).md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

0. [News](#news) @@ -90,4 +90,4 @@ Real World mentions and usage of the Nerd Fonts project. * [Urxvt and zsh with Zim and powerline font displays boxes](https://www.reddit.com/r/linux4noobs/comments/4eepf1/urxvt_and_zsh_with_zim_and_powerline_font/) * [Monospace Font Favorites](http://charlesleifer.com/blog/monospace-font-favorites/) -* [t-vim Wiki](https://github.com/tracyone/t-vim) \ No newline at end of file +* [t-vim Wiki](https://github.com/tracyone/t-vim) diff --git a/Release-Workflow.md b/Release-Workflow.md index 17bfc21..00e6385 100644 --- a/Release-Workflow.md +++ b/Release-Workflow.md @@ -1,12 +1,12 @@

- Nerd Fonts + Nerd Fonts

## Release Workflow ### `Merge latest PRs` -- Merge latest Pull Requests into `master` that are for the latest milestone -- Pull Requests and Bug Fixes go directly into `master` after basic testing +- Merge latest Pull Requests into the default branch that are for the latest milestone +- Pull Requests and Bug Fixes go directly into the default branch after basic testing ### `Run release script` - Change to scripts dir (@todo fix reliance on dir) @@ -41,8 +41,8 @@ - Fixed xyz (fixes #101) (PR #101 @someone) - ... ``` -- see diff comparison from last release vs master to ensure nothing is missed: `https://github.com/ryanoasis/nerd-fonts/compare/latest-release-branch...master` - - e.g. https://github.com/ryanoasis/nerd-fonts/compare/1.0.0...master +- see diff comparison from last release vs default branch to ensure nothing is missed: `https://github.com/ryanoasis/nerd-fonts/compare/latest-release-branch...HEAD` + - e.g. https://github.com/ryanoasis/nerd-fonts/compare/1.0.0...HEAD ### `Update the Sankey Diagram (if glyph changes)` @@ -132,7 +132,7 @@ Nerd Fonts [2119] Material Design - Update the [download links](https://github.com/ryanoasis/nerd-fonts/blob/gh-pages/_posts/2017-01-03-downloads.md) - If there are new fonts add the new links - Update the [release notes](https://github.com/ryanoasis/nerd-fonts/blob/gh-pages/_posts/2017-01-06-release.md) - - Insert new release notes from [changelog](https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md) to the top + - Insert new release notes from [changelog](https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md) to the top - Remove 'open' attribute from previous release container div ## Ad hoc updating of the Glyph-only fonts @@ -144,7 +144,7 @@ Nerd Fonts [2119] Material Design [pulls]: https://github.com/ryanoasis/nerd-fonts/pulls -[Features Section]: https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md#features -[Combinations Section]: https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md#combinations -[Patched Fonts]: https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md#patched-fonts -[website]: https://nerdfonts.com \ No newline at end of file +[Features Section]: https://github.com/ryanoasis/nerd-fonts/blob/-/readme.md#features +[Combinations Section]: https://github.com/ryanoasis/nerd-fonts/blob/-/readme.md#combinations +[Patched Fonts]: https://github.com/ryanoasis/nerd-fonts/blob/-/readme.md#patched-fonts +[website]: https://nerdfonts.com diff --git a/Reporting-Issues.md b/Reporting-Issues.md index 71f3e69..2d87f44 100644 --- a/Reporting-Issues.md +++ b/Reporting-Issues.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

## First Steps @@ -21,5 +21,5 @@ [issues]: https://github.com/ryanoasis/nerd-fonts/issues [latest-release]: https://github.com/ryanoasis/nerd-fonts/releases/latest -[Issue Template]: https://github.com/ryanoasis/nerd-fonts/blob/master/.github/ISSUE_TEMPLATE.md -[Gitter Chat]: https://gitter.im/ryanoasis/nerd-fonts \ No newline at end of file +[Issue Template]: https://github.com/ryanoasis/nerd-fonts/blob/-/.github/ISSUE_TEMPLATE.md +[Gitter Chat]: https://gitter.im/ryanoasis/nerd-fonts diff --git a/Screenshots.md b/Screenshots.md index f00ff92..6520e15 100644 --- a/Screenshots.md +++ b/Screenshots.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

If you have done something interesting with Nerd Fonts feel free to show us here! @@ -12,4 +12,4 @@ If you have done something interesting with Nerd Fonts feel free to show us here # Configurations -Share your stuff here! \ No newline at end of file +Share your stuff here! diff --git a/Terminal-Emulators.md b/Terminal-Emulators.md index 1592820..9f0a2a9 100644 --- a/Terminal-Emulators.md +++ b/Terminal-Emulators.md @@ -1,5 +1,5 @@

- Nerd Fonts + Nerd Fonts

diff --git a/_Footer.md b/_Footer.md index 978d7b9..8c862de 100644 --- a/_Footer.md +++ b/_Footer.md @@ -3,9 +3,9 @@ lot of information, please take your time to read the information. If you run into any trouble, please start by looking in the [FAQ](https://github.com/ryanoasis/nerd-fonts/wiki/FAQ-and-Troubleshooting) and if you still need help you can visit the [Gitter Chat]. -There is a heavily detailed [Changelog](https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md) and [Release changes](https://github.com/ryanoasis/nerd-fonts/releases). +There is a heavily detailed [Changelog](https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md) and [Release changes](https://github.com/ryanoasis/nerd-fonts/releases). -Be sure to read the [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/master/contributing.md) before opening a pull request to Nerd Fonts. +Be sure to read the [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/-/contributing.md) before opening a pull request to Nerd Fonts. If you have any questions about the Nerd Fonts usage or want to share some information with the community, please go to one of the following places: @@ -15,4 +15,4 @@ community, please go to one of the following places: -[Gitter Chat]: https://gitter.im/ryanoasis/nerd-fonts \ No newline at end of file +[Gitter Chat]: https://gitter.im/ryanoasis/nerd-fonts diff --git a/_Sidebar.md b/_Sidebar.md index ef969de..6a843d5 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -22,9 +22,9 @@ ### [Development Guide](https://github.com/ryanoasis/nerd-fonts/wiki/Development-Guide) * [Contributor Developer Setup](https://github.com/ryanoasis/nerd-fonts/wiki/Contributor-Developer-Setup) -* [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/master/contributing.md) +* [Contributing Guide](https://github.com/ryanoasis/nerd-fonts/blob/-/contributing.md) * [Development Workflow](https://github.com/ryanoasis/nerd-fonts/wiki/Development-Workflow) * [Release Workflow](https://github.com/ryanoasis/nerd-fonts/wiki/Release-Workflow) -* [Pull Request Template](https://github.com/ryanoasis/nerd-fonts/blob/master/.github/PULL_REQUEST_TEMPLATE.md) +* [Pull Request Template](https://github.com/ryanoasis/nerd-fonts/blob/-/.github/PULL_REQUEST_TEMPLATE.md) ### [Real World Mentions & Usage (Sightings)](https://github.com/ryanoasis/nerd-fonts/wiki/Real-World-Mentions-&-Usage-(Sightings))