[Bf-docboard-svn] bf-manual: [7672] trunk/blender_docs: Merge branch 'blender-v2.92-release'
Aaron Carlisle
noreply at blender.org
Mon Jan 25 22:35:39 CET 2021
Revision: 7672
https://developer.blender.org/rBM7672
Author: Blendify
Date: 2021-01-25 22:35:39 +0100 (Mon, 25 Jan 2021)
Log Message:
-----------
Merge branch 'blender-v2.92-release'
Modified Paths:
--------------
trunk/blender_docs/exts/404.py
trunk/blender_docs/manual/compositing/types/groups.rst
trunk/blender_docs/manual/glossary/index.rst
trunk/blender_docs/manual/images/interface_controls_nodes_groups_example.png
trunk/blender_docs/manual/interface/controls/templates/color_picker.rst
trunk/blender_docs/resources/templates/404.html
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs 2021-01-25 21:35:39 UTC (rev 7672)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7666
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7671
\ No newline at end of property
Modified: trunk/blender_docs/exts/404.py
===================================================================
--- trunk/blender_docs/exts/404.py 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs/exts/404.py 2021-01-25 21:35:39 UTC (rev 7672)
@@ -15,41 +15,9 @@
"""Adds a version tag variable to the context which can be accessed by the template."""
if templatename == "404.html":
- version_nbr = context['version']
- version_tag = version_nbr
+ gen_htaccess(app, context['language'], context['version'])
- version_data = read_versions()
- if version_data:
- for tag, title in version_data.items():
- m = re.match(r"\d\.\d[\w\d\.]*", title)
- if m and m[0] == version_nbr:
- version_tag = tag.strip();
- break;
- if "versiontag" not in context:
- context['versiontag'] = version_tag
- else:
- logger = logging.getLogger(__name__)
- logger.error('context override')
-
- gen_htaccess(app, context['language'], version_tag)
-
-
-def read_versions():
- current_dir = os.path.abspath(os.path.dirname(__file__))
- version_fn = os.path.normpath(os.path.join(current_dir, "..", "resources", "versions.json"))
-
- try:
- with open(version_fn) as json_data:
- data = json.load(json_data)
- return data
-
- except (IOError, OSError) as err:
- logger = logging.getLogger(__name__)
- logger.warning("{0}: cannot read: {1}".format(version_fn, err))
- return None
-
-
def gen_htaccess(app, lang, version):
text = read_htaccess()
if text:
Modified: trunk/blender_docs/manual/compositing/types/groups.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/groups.rst 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs/manual/compositing/types/groups.rst 2021-01-25 21:35:39 UTC (rev 7672)
@@ -8,7 +8,9 @@
Group
*****
-Grouping nodes can simplify a node tree by allowing instancing and hiding parts of the tree.
+:doc:`Group Nodes </interface/controls/nodes/groups.rst>` are a collection of nodes
+that can be combined into a single node while selectively exposing inputs of the embedded nodes.
+Group nodes can simplify a node tree by allowing instancing and hiding parts of the tree.
Make Group
Modified: trunk/blender_docs/manual/glossary/index.rst
===================================================================
--- trunk/blender_docs/manual/glossary/index.rst 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs/manual/glossary/index.rst 2021-01-25 21:35:39 UTC (rev 7672)
@@ -177,7 +177,7 @@
Three values often considered as more intuitive (human perception) than the RGB system.
In this model, colors are represented as :term:`Hue`, :term:`Saturation`, and :term:`Value`.
HSL
- Similar to :term:`HSV` except the colors are represented as :term:`Hue`, :term:`Saturation`, and :term:`Luminance`.
+ Similar to *HSV* except the colors are represented as :term:`Hue`, :term:`Saturation`, and :term:`Luminance`.
YUV
Luminance-Chrominance standard used in broadcasting analog PAL (European) video.
YCbCr
Modified: trunk/blender_docs/manual/images/interface_controls_nodes_groups_example.png
===================================================================
(Binary files differ)
Modified: trunk/blender_docs/manual/interface/controls/templates/color_picker.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/color_picker.rst 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs/manual/interface/controls/templates/color_picker.rst 2021-01-25 21:35:39 UTC (rev 7672)
@@ -28,7 +28,8 @@
In Blender, the RGB and HSV/HSL values are in Scene Linear color space,
and are therefore not :term:`Gamma` corrected.
- On the contrary, *Hex* are automatically :term:`Gamma` corrected for the :term:`sRGB` color space.
+ On the contrary, *Hex* are automatically :term:`Gamma`
+ corrected for the :term:`sRGB Color Space <Color Space>`.
For more information, see :doc:`Color Management </render/color_management>`.
Color Values
@@ -38,7 +39,7 @@
Shorthand hex colors are also supported as ``RGB``,
e.g. dark-yellow ``FFCC00``, can be written as ``FC0``.
- For operations that are capable of using :term:`Alpha`, another slider "A" is added.
+ For operations that are capable of using the :term:`Alpha Channel`, another slider "A" is added.
.. _bpy.ops.ui.eyedropper_color:
Modified: trunk/blender_docs/resources/templates/404.html
===================================================================
--- trunk/blender_docs/resources/templates/404.html 2021-01-25 21:27:34 UTC (rev 7671)
+++ trunk/blender_docs/resources/templates/404.html 2021-01-25 21:35:39 UTC (rev 7672)
@@ -3,7 +3,7 @@
{%- set ROOT = "https://docs.blender.org/manual/" %}
{%- block htmltitle %}
{{ super() }}
- <base href="{{ ROOT + language + '/' + versiontag + '/' }}" />
+ <base href="{{ ROOT + language + '/' + version + '/' }}" />
{% endblock %}
{%- block extrahead %}
<style>
@@ -27,7 +27,7 @@
</div>
<noscript>
-<a href="{{ ROOT + language + '/' + versiontag + '/index.html' }}" class="btn btn-neutral" title="{{ _('Return Home') }}">
+<a href="{{ ROOT + language + '/' + version + '/index.html' }}" class="btn btn-neutral" title="{{ _('Return Home') }}">
<span class="fa fa-home"></span> {{ _('Return Home') }}</a>
<span style="font-style: italic">The search functionality needs JavaScript activated in order to work.</span>
More information about the Bf-docboard-svn
mailing list