[libcamera-devel,1/3] Documentation: Remove _static and _templates directory

Message ID 20181213142327.4455-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 24038c2c44627cb12e84cde3be1350f6170a5f38
Headers show
Series
  • [libcamera-devel,1/3] Documentation: Remove _static and _templates directory
Related show

Commit Message

Laurent Pinchart Dec. 13, 2018, 2:23 p.m. UTC
sphinx only requires those directories to be present because they're
referenced in the configuration file. Remove the references and the
directories.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 Documentation/_static/.keep_empty    | 0
 Documentation/_templates/.keep_empty | 0
 Documentation/conf.py                | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 Documentation/_static/.keep_empty
 delete mode 100644 Documentation/_templates/.keep_empty

Comments

Jacopo Mondi Dec. 14, 2018, 8:15 a.m. UTC | #1
Hi Laurent,

On Thu, Dec 13, 2018 at 04:23:25PM +0200, Laurent Pinchart wrote:
> sphinx only requires those directories to be present because they're
> referenced in the configuration file. Remove the references and the
> directories.

Provided the documentation content matches what's on website (I
haven't gone through it), please push these.

Acked-by: Jacopo Mondi <jacopo@jmondi.org>

>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  Documentation/_static/.keep_empty    | 0
>  Documentation/_templates/.keep_empty | 0
>  Documentation/conf.py                | 4 ++--
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  delete mode 100644 Documentation/_static/.keep_empty
>  delete mode 100644 Documentation/_templates/.keep_empty
>
> diff --git a/Documentation/_static/.keep_empty b/Documentation/_static/.keep_empty
> deleted file mode 100644
> index e69de29bb2d1..000000000000
> diff --git a/Documentation/_templates/.keep_empty b/Documentation/_templates/.keep_empty
> deleted file mode 100644
> index e69de29bb2d1..000000000000
> diff --git a/Documentation/conf.py b/Documentation/conf.py
> index 83d233e51e91..770358198f03 100644
> --- a/Documentation/conf.py
> +++ b/Documentation/conf.py
> @@ -42,7 +42,7 @@ extensions = [
>  ]
>
>  # Add any paths that contain templates here, relative to this directory.
> -templates_path = ['_templates']
> +templates_path = []
>
>  # The suffix(es) of source filenames.
>  # You can specify multiple suffix as a list of string:
> @@ -85,7 +85,7 @@ html_theme = 'alabaster'
>  # Add any paths that contain custom static files (such as style sheets) here,
>  # relative to this directory. They are copied after the builtin static files,
>  # so a file named "default.css" will overwrite the builtin "default.css".
> -html_static_path = ['_static']
> +html_static_path = []
>
>  # Custom sidebar templates, must be a dictionary that maps document names
>  # to template names.
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Kieran Bingham Dec. 14, 2018, 8:27 a.m. UTC | #2
On 14/12/2018 08:15, jacopo mondi wrote:
> Hi Laurent,
> 
> On Thu, Dec 13, 2018 at 04:23:25PM +0200, Laurent Pinchart wrote:
>> sphinx only requires those directories to be present because they're
>> referenced in the configuration file. Remove the references and the
>> directories.
> 
> Provided the documentation content matches what's on website (I
> haven't gone through it), please push these.
> 
> Acked-by: Jacopo Mondi <jacopo@jmondi.org>

Agreed!

This will be a good way forwards to keeping the website, and project in
sync.

--
Kieran


>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> ---
>>  Documentation/_static/.keep_empty    | 0
>>  Documentation/_templates/.keep_empty | 0
>>  Documentation/conf.py                | 4 ++--
>>  3 files changed, 2 insertions(+), 2 deletions(-)
>>  delete mode 100644 Documentation/_static/.keep_empty
>>  delete mode 100644 Documentation/_templates/.keep_empty
>>
>> diff --git a/Documentation/_static/.keep_empty b/Documentation/_static/.keep_empty
>> deleted file mode 100644
>> index e69de29bb2d1..000000000000
>> diff --git a/Documentation/_templates/.keep_empty b/Documentation/_templates/.keep_empty
>> deleted file mode 100644
>> index e69de29bb2d1..000000000000
>> diff --git a/Documentation/conf.py b/Documentation/conf.py
>> index 83d233e51e91..770358198f03 100644
>> --- a/Documentation/conf.py
>> +++ b/Documentation/conf.py
>> @@ -42,7 +42,7 @@ extensions = [
>>  ]
>>
>>  # Add any paths that contain templates here, relative to this directory.
>> -templates_path = ['_templates']
>> +templates_path = []
>>
>>  # The suffix(es) of source filenames.
>>  # You can specify multiple suffix as a list of string:
>> @@ -85,7 +85,7 @@ html_theme = 'alabaster'
>>  # Add any paths that contain custom static files (such as style sheets) here,
>>  # relative to this directory. They are copied after the builtin static files,
>>  # so a file named "default.css" will overwrite the builtin "default.css".
>> -html_static_path = ['_static']
>> +html_static_path = []
>>
>>  # Custom sidebar templates, must be a dictionary that maps document names
>>  # to template names.
>> --
>> Regards,
>>
>> Laurent Pinchart
>>
>> _______________________________________________
>> libcamera-devel mailing list
>> libcamera-devel@lists.libcamera.org
>> https://lists.libcamera.org/listinfo/libcamera-devel
>>
>> _______________________________________________
>> libcamera-devel mailing list
>> libcamera-devel@lists.libcamera.org
>> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/Documentation/_static/.keep_empty b/Documentation/_static/.keep_empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/Documentation/_templates/.keep_empty b/Documentation/_templates/.keep_empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 83d233e51e91..770358198f03 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -42,7 +42,7 @@  extensions = [
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = []
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
@@ -85,7 +85,7 @@  html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.