From: Jacco van den Berg <39033624+LeeLenaleee@users.noreply.github.com> Date: Fri, 26 Feb 2021 19:57:34 +0000 (+0100) Subject: Update wording in docs about merging options (#8533) X-Git-Tag: v3.0.0-beta.12~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd303f4a2caa842bbea67cacd436b4400eced766;p=thirdparty%2FChart.js.git Update wording in docs about merging options (#8533) --- diff --git a/docs/docs/charts/bar.mdx b/docs/docs/charts/bar.mdx index 1f977dbf3..22ea19361 100644 --- a/docs/docs/charts/bar.mdx +++ b/docs/docs/charts/bar.mdx @@ -200,7 +200,7 @@ If not set (default), the base sample widths are calculated using the smallest i ## Config Options -These are the customisation options specific to Bar charts. These options are merged with the global chart configuration options, and form the options of the chart. +These are the customisation options specific to Bar charts. These options are looked up on access, and form together with the global chart configuration, `Chart.defaults`, the options of the chart. | Name | Type | Default | Description | ---- | ---- | ------- | ----------- diff --git a/docs/docs/charts/doughnut.mdx b/docs/docs/charts/doughnut.mdx index d34e296b0..02838865d 100644 --- a/docs/docs/charts/doughnut.mdx +++ b/docs/docs/charts/doughnut.mdx @@ -159,7 +159,7 @@ All these values, if `undefined`, fallback to the associated [`elements.arc.*`]( ## Config Options -These are the customisation options specific to Pie & Doughnut charts. These options are merged with the global chart configuration options, and form the options of the chart. +These are the customisation options specific to Pie & Doughnut charts. These options are looked up on access, and form together with the global chart configuration the options of the chart. | Name | Type | Default | Description | ---- | ---- | ------- | ----------- diff --git a/docs/docs/charts/line.mdx b/docs/docs/charts/line.mdx index 0536a1cea..2a265c0a3 100644 --- a/docs/docs/charts/line.mdx +++ b/docs/docs/charts/line.mdx @@ -179,7 +179,7 @@ If the `stepped` value is set to anything other than false, `tension` will be ig ## Configuration Options -The line chart defines the following configuration options. These options are merged with the global chart configuration options, `Chart.defaults`, to form the options passed to the chart. +The line chart defines the following configuration options. These options are looked up on access, and form together with the global chart configuration, `Chart.defaults`, the options of the chart. | Name | Type | Default | Description | ---- | ---- | ------- | ----------- diff --git a/docs/docs/charts/polar.mdx b/docs/docs/charts/polar.mdx index 00155c0b2..17c5d4fa3 100644 --- a/docs/docs/charts/polar.mdx +++ b/docs/docs/charts/polar.mdx @@ -108,7 +108,7 @@ All these values, if `undefined`, fallback to the associated [`elements.arc.*`]( ## Config Options -These are the customisation options specific to Polar Area charts. These options are merged with the [global chart default options](#default-options) and form the options of the chart. +These are the customisation options specific to Polar Area charts. These options are looked up on access, and form together with the [global chart default options](#default-options) the options of the chart. | Name | Type | Default | Description | ---- | ---- | ------- | ----------- diff --git a/docs/docs/charts/radar.mdx b/docs/docs/charts/radar.mdx index 414f49daf..23ee58d7a 100644 --- a/docs/docs/charts/radar.mdx +++ b/docs/docs/charts/radar.mdx @@ -166,7 +166,7 @@ The interaction with each point can be controlled with the following properties: ## Configuration Options -The radar chart defines the following configuration options. These options are merged with the global chart configuration options, `Chart.defaults`, to form the options passed to the chart. +The radar chart defines the following configuration options. These options are looked up on access, and form together with the global chart configuration, `Chart.defaults`, the options of the chart. | Name | Type | Default | Description | ---- | ---- | ------- | -----------