diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d3ab47e35..8b101419c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ _Please explain the changes you made here._ #### Requirements / Checklist -- [ ] Read the [Contributing Guidelines](https://github.com/ryanoasis/nerd-fonts/blob/master/contributing.md) +- [ ] Read the [Contributing Guidelines](https://github.com/ryanoasis/nerd-fonts/blob/-/contributing.md) - [ ] Verified the license of any newly added font, glyph, or glyph set #### What does this Pull Request (PR) do? diff --git a/LICENSE b/LICENSE index 42e0e661f..d163912b3 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ There are various sources used under various licenses: * Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files are licensed under SIL OPEN FONT LICENSE Version 1.1 (see below). * Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others) are licensed under the MIT License (MIT) (see below). -* Many other licenses are present in this project for even more detailed breakdown see: [License Audit](https://github.com/ryanoasis/nerd-fonts/blob/master/license-audit.md). +* Many other licenses are present in this project for even more detailed breakdown see: [License Audit](https://github.com/ryanoasis/nerd-fonts/blob/-/license-audit.md). ## Source files not in folders containing an explicit license are using the MIT License (MIT) diff --git a/bin/scripts/generate-glyph-info-from-set.py b/bin/scripts/generate-glyph-info-from-set.py index 7ea72f9c1..67a2cf48c 100755 --- a/bin/scripts/generate-glyph-info-from-set.py +++ b/bin/scripts/generate-glyph-info-from-set.py @@ -35,7 +35,7 @@ try: except ImportError: sys.exit(projectName + ": FontForge module could not be loaded. Try installing fontforge python bindings [e.g. on Linux Debian or Ubuntu: `sudo apt install fontforge python-fontforge`]") -parser = argparse.ArgumentParser(description='Nerd Fonts Glyph Info Generator: displays code point and glyph names from given set\n\n* Website: https://www.nerdfonts.com\n* Version: ' + version + '\n* Development Website: https://github.com/ryanoasis/nerd-fonts\n* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md', formatter_class=RawTextHelpFormatter) +parser = argparse.ArgumentParser(description='Nerd Fonts Glyph Info Generator: displays code point and glyph names from given set\n\n* Website: https://www.nerdfonts.com\n* Version: ' + version + '\n* Development Website: https://github.com/ryanoasis/nerd-fonts\n* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md', formatter_class=RawTextHelpFormatter) parser.add_argument('-start', '--start', type=str, nargs='?', dest='symbolFontStart', help='The starting unicode hex codepoint') parser.add_argument('-end', '--end', type=str, nargs='?', dest='symbolFontEnd', help='The ending unicode hex codepoint') parser.add_argument('-offset', '--offset', type=str, nargs='?', dest='symbolOffset', help='The amount (in hex) to offset the range by for the source font') diff --git a/chocolatey/base.nuspec b/chocolatey/base.nuspec index a989ba9f2..5f638ad9a 100644 --- a/chocolatey/base.nuspec +++ b/chocolatey/base.nuspec @@ -17,7 +17,7 @@ https://imgur.com/pEDFEje - https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/LICENSE + https://raw.githubusercontent.com/ryanoasis/nerd-fonts/-/LICENSE true https://github.com/ryanoasis/nerd-fonts https://github.com/ryanoasis/nerd-fonts/wiki diff --git a/contributing.md b/contributing.md index c510f7ae2..6aa6132b2 100644 --- a/contributing.md +++ b/contributing.md @@ -4,7 +4,7 @@ ## How to contribute summary -* Fork the project from the `master` branch and submit a Pull Request (PR) +* Fork the project and submit a Pull Request (PR) * Explain what the PR fixes or improves * Screenshots for bonus points * Use sensible commit messages @@ -74,9 +74,9 @@ Common types for this project include: `code`, `doc`, `translation`, `review` .F * Smaller Pull Requests are likely to be merged more quickly than bigger changes * This project is using a [KISS Workflow][] - * Pull Requests and bugfixes are directly merged into `master` after sanity testing - * `master` is basically consider the main developer branch - * We no longer wait to get changes into master when there is a release/milestone/version! + * Pull Requests and bugfixes are directly merged into the default branch after sanity testing + * The default branch is basically consider the main developer branch + * We no longer wait to get changes into the default branch when there is a release/milestone/version! * the release branches and version tags are considered stable and frozen * This project is using [Semantic Versioning 2.0.0](http://semver.org/) * If a bugfix or PR is *not* trivial it will likely end up in the next **MINOR** version @@ -106,8 +106,8 @@ Common types for this project include: `code`, `doc`, `translation`, `review` .F [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 +[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 [KISS Workflow]: https://github.com/ryanoasis/nerd-fonts/wiki/Development-Workflow#kiss-workflow [First PR]: https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github diff --git a/font-patcher b/font-patcher index c245d3b0d..8f731af46 100755 --- a/font-patcher +++ b/font-patcher @@ -6,7 +6,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Change the script version when you edit this script: -script_version = "3.1.1" +script_version = "3.1.2" version = "2.3.0-RC" projectName = "Nerd Fonts" @@ -573,7 +573,7 @@ class font_patcher: "* Website: https://www.nerdfonts.com\n" "* Version: " + version + "\n" "* Development Website: https://github.com/ryanoasis/nerd-fonts\n" - "* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md" + "* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md" ) familyname = replace_font_name(familyname, reservedFontNameReplacements) @@ -1279,7 +1279,7 @@ def setup_arguments(): '* Website: https://www.nerdfonts.com\n' '* Version: ' + version + '\n' '* Development Website: https://github.com/ryanoasis/nerd-fonts\n' - '* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md'), + '* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md'), formatter_class=RawTextHelpFormatter ) diff --git a/readme.md b/readme.md index c9243e89e..43bb1617a 100644 --- a/readme.md +++ b/readme.md @@ -286,7 +286,7 @@ git sparse-checkout add patched-fonts/JetBrainsMono ```sh mkdir -p ~/.local/share/fonts -cd ~/.local/share/fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf +cd ~/.local/share/fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/-/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf ``` _Note:_ deprecated alternative paths: `~/.fonts` @@ -294,7 +294,7 @@ _Note:_ deprecated alternative paths: `~/.fonts` #### macOS (OS X) ```sh -cd ~/Library/Fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf +cd ~/Library/Fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/-/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf ``` ### `Option 7: Unofficial Arch User Repository (AUR)` @@ -390,7 +390,7 @@ Nerd Fonts Font Patcher: patches a given font with programming and development r * Website: https://www.nerdfonts.com * Version: 2.2.2 * Development Website: https://github.com/ryanoasis/nerd-fonts -* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/master/changelog.md +* Changelog: https://github.com/ryanoasis/nerd-fonts/blob/-/changelog.md positional arguments: font The path to the font to patch (e.g., Inconsolata.otf) @@ -582,8 +582,8 @@ Link References [dank]:https://dank.sh/ [release]:https://github.com/ryanoasis/nerd-fonts/releases/latest "Latest Release (external link) ➶" -[coc]:https://github.com/ryanoasis/nerd-fonts/blob/master/code_of_conduct.md "Contributor Covenant Code of Conduct" -[LICENSE]:https://github.com/ryanoasis/nerd-fonts/blob/master/LICENSE +[coc]:https://github.com/ryanoasis/nerd-fonts/blob/-/code_of_conduct.md "Contributor Covenant Code of Conduct" +[LICENSE]:https://github.com/ryanoasis/nerd-fonts/blob/-/LICENSE [prs]:http://makeapullrequest.com "Make a Pull Request (external link) ➶"