[PATCH 04/11] doc: make COPYING rst and include it at the top level

Jani Nikula jani.nikula at intel.com
Wed Oct 31 14:57:27 UTC 2018


On Thu, 25 Oct 2018, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> On Thu, Oct 25, 2018 at 06:22:04PM +0300, Jani Nikula wrote:
>> Make the license more prominant. Remove include from drm-intel.rst.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Thanks, I've pushed up to and including this patch.

BR,
Jani.

>
>> ---
>>  COPYING => COPYING.rst | 6 ++++++
>>  drm-intel.rst          | 6 ------
>>  index.rst              | 1 +
>>  3 files changed, 7 insertions(+), 6 deletions(-)
>>  rename COPYING => COPYING.rst (96%)
>> 
>> diff --git a/COPYING b/COPYING.rst
>> similarity index 96%
>> rename from COPYING
>> rename to COPYING.rst
>> index ca956633954f..6bc14f2fbdc3 100644
>> --- a/COPYING
>> +++ b/COPYING.rst
>> @@ -1,3 +1,9 @@
>> +.. _license:
>> +
>> +=========
>> + License
>> +=========
>> +
>>  Copyright © 2012-2015 Intel Corporation
>>  
>>  Permission is hereby granted, free of charge, to any person obtaining a
>> diff --git a/drm-intel.rst b/drm-intel.rst
>> index eb06655d2308..087402cf985d 100644
>> --- a/drm-intel.rst
>> +++ b/drm-intel.rst
>> @@ -333,9 +333,3 @@ Tooling
>>  drm-intel git repositories are managed with dim_:
>>  
>>  .. _dim: dim.html
>> -
>> -Copyright
>> -=========
>> -
>> -.. include:: COPYING
>> -	:literal:
>> diff --git a/index.rst b/index.rst
>> index 176f75273ad0..0a9841f532b0 100644
>> --- a/index.rst
>> +++ b/index.rst
>> @@ -32,6 +32,7 @@ Contents:
>>     qf
>>     CONTRIBUTING
>>     MAINTAINERS
>> +   COPYING
>>     TODO
>>  
>>  Indices and tables
>> -- 
>> 2.11.0
>> 
>> _______________________________________________
>> dim-tools mailing list
>> dim-tools at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dim-tools

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the dim-tools mailing list