diff options
author | Topi Reinio <topi.reinio@qt.io> | 2018-11-23 12:15:25 +0100 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-26 21:25:26 +0000 |
commit | 80d127dcac7695efbb1f3e4f5cecf3ac5943c952 (patch) | |
tree | 9843b90de563859ca724ad930c93101078747339 | |
parent | 164f4418de1a5ed19e160b1ec8457503a1e8c9d6 (diff) |
Doc: Update copyright statements and obsolete info
Update the copyright statements visible in Shiboken2 and ApiExtractor
documentation sets. Update the name of the Qt documentation tool.
Change-Id: I09726e15a6b860f2698df683138a02683596d07d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | sources/shiboken2/ApiExtractor/doc/conf.py.in | 2 | ||||
-rw-r--r-- | sources/shiboken2/ApiExtractor/doc/typesystem_documentation.rst | 6 | ||||
-rw-r--r-- | sources/shiboken2/data/generatorrunner.1 | 6 | ||||
-rw-r--r-- | sources/shiboken2/doc/conf.py.in | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sources/shiboken2/ApiExtractor/doc/conf.py.in b/sources/shiboken2/ApiExtractor/doc/conf.py.in index 609c4a363..185709590 100644 --- a/sources/shiboken2/ApiExtractor/doc/conf.py.in +++ b/sources/shiboken2/ApiExtractor/doc/conf.py.in @@ -43,7 +43,7 @@ source_encoding = 'utf-8' # General information about the project. project = u'API Extractor' -copyright = u'2009-2010, Nokia Corporation' +copyright = u'© 2018 The Qt Company Ltd. Documentation contributions included herein are the copyrights of their respective owners. The documentation provided herein is licensed under the terms of the <a href="http://www.gnu.org/license/fdl.html">GNU Free Documentation License version 1.3</a> as published by the Free Software Foundation. Qt and respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/sources/shiboken2/ApiExtractor/doc/typesystem_documentation.rst b/sources/shiboken2/ApiExtractor/doc/typesystem_documentation.rst index 43f72a1ba..d73e43cb1 100644 --- a/sources/shiboken2/ApiExtractor/doc/typesystem_documentation.rst +++ b/sources/shiboken2/ApiExtractor/doc/typesystem_documentation.rst @@ -30,9 +30,9 @@ modify-documentation ^^^^^^^^^^^^^^^^^^^^ The modify-documentation node allows you to change the auto-generated - documentation. API Extractor transforms XML's from qdoc3 (the Qt documentation - tool) into .rst files to be processed later using Sphinx. So you can modify - the XML before the transformation occur. + documentation. API Extractor transforms XML's from qdoc (the Qt documentation + tool) into .rst files to be processed later using Sphinx. You can modify + the XML before the transformation takes place. .. code-block:: xml diff --git a/sources/shiboken2/data/generatorrunner.1 b/sources/shiboken2/data/generatorrunner.1 index 045b55ad4..f5a61f139 100644 --- a/sources/shiboken2/data/generatorrunner.1 +++ b/sources/shiboken2/data/generatorrunner.1 @@ -13,9 +13,9 @@ are two generators available: .B qtdoc \- Generates Sphinx-based documentation for C++ libraries documented using -.B qdoc3 +.B qdoc documentation syntax, using the XML files created by the documentation tool -.B (qdoc3). +.B (qdoc). Can be called supplying .B \-\-generator-set=qtdoc to @@ -65,7 +65,7 @@ Drops support for named args. .IP \-\-documentation\-code\-snippets\-dir Directory used to search code snippets used by the documentation .IP \-\-documentation\-data\-dir -Directory with XML files generated by documentation tool (qdoc3 or Doxygen) +Directory with XML files generated by documentation tool (qdoc or Doxygen) .IP \-\-documentation\-out\-dir The directory where the generated documentation files will be written .IP \-\-library\-source\-dir diff --git a/sources/shiboken2/doc/conf.py.in b/sources/shiboken2/doc/conf.py.in index 29517309d..3ca8ac573 100644 --- a/sources/shiboken2/doc/conf.py.in +++ b/sources/shiboken2/doc/conf.py.in @@ -43,7 +43,7 @@ source_encoding = 'utf-8' # General information about the project. project = u'Shiboken' -copyright = u'Copyright (C) 2016 The Qt Company Ltd.' +copyright = u'© 2018 The Qt Company Ltd. Documentation contributions included herein are the copyrights of their respective owners. The documentation provided herein is licensed under the terms of the <a href="http://www.gnu.org/license/fdl.html">GNU Free Documentation License version 1.3</a> as published by the Free Software Foundation. Qt and respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the |