Fixes: #20746

The sentence "Base all new work on the upstream master branch." may be
interpreted to mean that one should commit on a 'master' branch.
Precede this with an explicit step for creating a topic branch.

Recent GitLab updates have changed the label associated with the
checkbox in merge request descriptions for allowing edits from
maintainers. Make the contributor guidelines match the new label
and add a note for why it is recommended.

Kitware Robot authored Jun 01, 2018 and Brad King committed Jun 01, 2018

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 8ef62b289e0a99856893ef49106c2b2d94e9dd0c (master).

Upstream Shortlog
-----------------

Brad King (2):
      6b9c233c clang-format.bash: update to clang-format-6.0
      b7a341cf Empty commit at end of history preceding clang-format-6.0 style transition

Kitware Robot (1):
      828b6837 Revise C++ coding style using clang-format-6.0

Collaboration between contributors and developers is easier if a
developer can push an update to a contributor's MR source branch.

Kitware Robot authored May 25, 2017 and Brad King committed May 25, 2017

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 160bed451833380e9f6ddc60e709ab6800bf2129 (master).

Upstream Shortlog
-----------------

Brad King (1):
      51859eab CONTRIBUTING: Specify clang-format version used for code style

Florian Maushart (2):
      684bcda6 SystemInformation: Expose CPU feature flags publicly
      70b8332f SystemInformation: Add CPU_FEATURE_FPU flag

Simplify the `CONTRIBUTING.rst` document by moving the code style
section over to our dedicated coding guide and linking to it instead.

Kitware Robot authored Dec 14, 2016 and Brad King committed Dec 14, 2016

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 95a7e234ffd0c6bdfaa8b21c59a119198c050164 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      e0967411 Add a script to help update third-party sources

Brad King (10):
      98505f79 Add script to update GitSetup from upstream
      365edba8 GitSetup: Tell Git not to export .gitattributes
      41a7fe5b Add pre-commit hook to check whether SetupForDevelopment must re-run
      17a1200c Convert developer setup scripts away from Gerrit Code Review
      5f206c3a Tell Git to use a distinct conflict marker size in `.rst` files
      33f828d4 README: Convert from `.txt` to `.rst` markup
      56b707dd README: Add section about reporting bugs
      140357ea CONTRIBUTING: Document contribution through the Kitware GitLab Instance
      4b7bf8e4 Tell Git not to export any `.sh` or `.bash` scripts
      e25eb8dc CONTRIBUTING: Add step for running developer setup script

GitSetup Upstream (3):
      fed3d191 GitSetup 2012-09-27 (341043cf)
      a0144297 GitSetup 2016-12-13 (8af10838)
      868c1e68 GitSetup 2016-12-13 (cd5ada6d)

Kitware Robot authored Nov 09, 2016 and Brad King committed Nov 09, 2016

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 18c654114de3aa65429542f95308720bc68f9231 (master).

Upstream Shortlog
-----------------

Brad King (14):
      37306a1c FStream: Quiet unused argument warning
      15e90a3c Sort includes to stabilize include order w.r.t. clang-format
      26509227 Copyright.txt: Add notice of copyright by contributors
      fc42d3f2 Add temporary script to filter license notices
      c41c1bc4 Simplify KWSys per-source license notices
      1d4c0b4a Remove temporary script that filtered license notices
      a4f5ef79 SystemInformation: Remove stray comment
      8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
      89b98af5 Configure clang-format for KWSys source tree
      547dacad Add a script to run clang-format on the entire source tree
      aa94be0c CONTRIBUTING: Add a section on coding style
      6604c4b6 Empty commit at end of history preceding clang-format style transition
      2b3e2b1c Tell Git to not export 'clang-format' infrastructure
      18c65411 FStream: Include Configure.hxx before other headers

Kitware Robot (1):
      6c973b46 Revise C++ coding style using clang-format

Replace the instructions that routed patches to the mailing list with
new instructions routing them to our GitLab instance.

Document that we now define our coding style with `clang-format`.

The latter is now the preferred URL for visiting cmake.org with a
browser.  Convert using the shell code:

 git ls-files -z | xargs -0 sed -i 's|http://www\.cmake|https://cmake|g'

Reported-by: Radovan Bast

Kitware Robot authored Jul 02, 2015 and Brad King committed Jul 02, 2015

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 1f19c187 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' d217407c..1f19c187
Brad King (1):
      1f19c187 CONTRIBUTING: Spell "offered" correctly

Kitware Robot authored Dec 16, 2014 and Brad King committed Dec 17, 2014

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8
Brad King (2):
      9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute
      cc4046a8 Directory: Work around PGI problem with Linux Large File Support

Jean-Christophe Fillion-Robin (2):
      c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows
      58308145 SystemInformation: Improve comments in private implementation

Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6

Use the name "Kitware" rather than "Kitware, Inc." to simplify the text.
Provide a CMake-specific URL.

Rename 'Readme.txt' to 'README.rst', format the documentation as
reStructuredText, and modernize the content.  Also add a new
'CONTRIBUTING.rst' explaining the preferred entry path for new
contributors.