[wesnoth-commits] [wesnoth/wesnoth] 14ec99: Replace a few instances of "mermen" with "merfolk"...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 14ec9954f1c322d47d172e2e2572f2ece308d047
      https://github.com/wesnoth/wesnoth/commit/14ec9954f1c322d47d172e2e2572f2ece308d047
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2018-04-22 (Sun, 22 Apr 2018)

  Changed paths:
    M changelog.md
    M data/core/terrain.cfg
    M data/core/units.cfg
    M data/core/units/merfolk/Priestess.cfg

  Log Message:
  -----------
  Replace a few instances of "mermen" with "merfolk" in core descriptions

These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").

See issue #2940.

[ci skip]