Skip to content

Commit d3f41fd

Browse files
committed
add hint to release drafting and fix some html errors
1 parent b7ce626 commit d3f41fd

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
2424
<p>Here are some terms that we will use in this repo: </p>
2525
<ol>
2626
<li>"Technology" is used to describe a software, libraries, tool, etc...</li>
27-
<li>"Icon" refers to the svgs and icons version of a technology as a whole.</i>
27+
<li>"Icon" refers to the svgs and icons version of a technology as a whole.</li>
2828
<li>"SVG/<code>svg</code>" refers to the <code>svg</code> versions of the Icons.</li>
2929
<li>"icon" (lowercase) refers specficially to the font icon versions of the Icons.</li>
3030
</ol>
@@ -312,7 +312,7 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web
312312
<h2 id="discordServer">Discord server</h2>
313313
<p>
314314
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.
315-
<b>Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.<b>
315+
<b>Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.</b>
316316
</p>
317317

318318
<h2 id='release'>Release strategy, conventions, preparation and execution</h2>
@@ -335,7 +335,7 @@ We are running a Discord server. You can go here to talk, discuss, and more with
335335
<li>Push the branch <code>draft-release</code></li>
336336
<li>Manually trigger the workflow <code><a href="https://github.com/devicons/devicon/actions/workflows/build_icons.yml">build_icons.yml</a></code> (which has a <code>workflow_dispatch</code> event trigger) and select the branch <code>draft-release</code> 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 <code>draft-release</code></li>
337337
<li>Review and approve the auto-create pull request created by the action of the step above</li>
338-
<li>Create a pull request towards <code>development</code>. 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 <code><a href="https://github.com/devicons/devicon/pull/504">#504</a></code> as an example).</li>
338+
<li>Create a pull request towards <code>development</code>. 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 <code><a href="https://github.com/devicons/devicon/pull/504">#504</a></code> as an example).</li>
339339
<li>Wait for review and approval of the pull request (<b>DON'T</b> perform a squash-merge)</li>
340340
<li>Once merged create a pull request with BASE <code>master</code> and HEAD <code>development</code>. Copy the description of the earlier pull request.</li>
341341
<li>Since it was already approved in the 'development' stage a maintainer is allowed to merge it (<b>DON'T</b> perform a squash-merge).</li>

0 commit comments

Comments
 (0)