Subject: Re: GPL, COPYING file
From: "Ben Tilly" <btilly@gmail.com>
Date: Wed, 2 Jul 2008 10:14:58 -0700

On Wed, Jul 2, 2008 at 9:22 AM, Paolo Ciarrocchi
<paolo.ciarrocchi@gmail.com> wrote:
> Hi all,
> a friend of mine wants to release a CMS under GPLv3.
> We disagree on how the licence should be inserted in the package.
[...]

You are basically correct.  For confirmation read the section at the
bottom of the license called "How to Apply These Terms to Your New
Programs".

Your biggest mistake is that you said GPL v2 or later when (if you
really want GPL v3) you should be saying GPL v3 or later.

Cheers,
Ben