Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ When submitting your pull request, please make sure you:

* Tidy up the commit log by squashing commits and [writing good commit messages](#commits).

* Add one or more [ChangeLog Entries](#changelog) to the commit(s).
* Add one or more [changelog entries](#changelog) to the commit(s).

* Become familiar with the *Northern.tech AS Contributor statement* as described
in the [*AUTHORS*](./AUTHORS) file.
Expand Down Expand Up @@ -203,7 +203,7 @@ cf-net: Fixed networking issues on windows

### Changelog

Most new features and fixes should have an entry in the `ChangeLog` file.
Most new features and fixes should have an entry in the `CHANGELOG.md` file.
We have an automatic way of generating them before the release, by properly formatting *commit messages*.

* To write arbitrary message in the ChangeLog:
Expand All @@ -223,7 +223,7 @@ Changes which don't affect users, like changes in tests or in tools which are no

All changelog entries should also include a reference to a ticket:
`Ticket: CFE-1234`

Note that the `Changelog` and `Ticket` entries must be in a *commit message* and not the description of a PR.

Sometimes is necessary to redact a `Changelog` entry, for example a commit needs
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ TAR_OPTIONS = --owner=0 --group=0
export TAR_OPTIONS


EXTRA_DIST = ChangeLog INSTALL README.md LICENSE CFVERSION
EXTRA_DIST = CHANGELOG.md INSTALL README.md LICENSE CFVERSION

doc_DATA = README.md ChangeLog
doc_DATA = README.md CHANGELOG.md

#
# Some basic clean ups
Expand Down
Loading