On Thu, Sep 29, 2011 at 07:59:31AM -0400, Gaetan Nadon wrote: > Use docbook copyright markup for year and holder. > > Signed-off-by: Gaetan Nadon <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> > --- > doc/Xserver-spec.xml | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml > index aabd262..37fd2b2 100644 > --- a/doc/Xserver-spec.xml > +++ b/doc/Xserver-spec.xml > @@ -44,8 +44,9 @@ > <publisher><publishername>The X.Org > Foundation</publishername></publisher> > <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> > <releaseinfo>X server version &xserver.version;</releaseinfo> > + <copyright><year>1994</year><holder>X Consortium, > Inc.</holder></copyright> > + <copyright><year>2004</year><holder>X.org Foundation, > Inc.</holder></copyright> > <legalnotice> > - <para>Copyright © 1994 X Consortium, Inc., 2004 X.org Foundation, > Inc.</para> > <para>Permission is hereby granted, free of charge, to any person > obtaining a copy of this software and associated documentation files (the > ``Software''), to deal in the Software without restriction, including without > limitation the rights to use, copy, modify, merge, publish, distribute, > sublicense, and/or sell copies of the Software, and to permit persons to whom > the Software is furnished to do so, subject to the following > conditions:</para> > <para>The above copyright notice and this permission notice shall be > included in all copies or substantial portions of the Software.</para> > <para>THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY > KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO > EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > SOFTWARE.</para> > -- > 1.7.4.1 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
