diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1455458..b86006dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ First of all, thanks for taking the time to contribute! This project can only gr

Here are some terms that we will use in this repo:

  1. "Technology" is used to describe a software, libraries, tool, etc...
  2. -
  3. "Icon" refers to the svgs and icons version of a technology as a whole. +
  4. "Icon" refers to the svgs and icons version of a technology as a whole.
  5. "SVG/svg" refers to the svg versions of the Icons.
  6. "icon" (lowercase) refers specficially to the font icon versions of the Icons.
@@ -312,7 +312,7 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web

Discord server

We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ. If you don't have a GitHub account but want to suggest ideas or new icons, you can do that here in our Discord channel. -Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub. +Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.

Release strategy, conventions, preparation and execution

@@ -335,7 +335,7 @@ We are running a Discord server. You can go here to talk, discuss, and more with
  • Push the branch draft-release
  • Manually trigger the workflow build_icons.yml (which has a workflow_dispatch event trigger) and select the branch draft-release as target branch. This will build a font version of all icons using icomoon and automatically creates a pull request to merge the build result back into draft-release
  • Review and approve the auto-create pull request created by the action of the step above
  • -
  • Create a pull request towards development. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. It's also a good idea to mention and thank all contributions who participated in the release (take description of #504 as an example).
  • +
  • Create a pull request towards development. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. Take the commits as a guideline. It's also a good idea to mention and thank all contributions who participated in the release (take description of #504 as an example).
  • Wait for review and approval of the pull request (DON'T perform a squash-merge)
  • Once merged create a pull request with BASE master and HEAD development. Copy the description of the earlier pull request.
  • Since it was already approved in the 'development' stage a maintainer is allowed to merge it (DON'T perform a squash-merge).