aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Configuration.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-01-30 13:20:59 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-01-30 16:19:59 +0000
commitf72ee8e742a171db74ed32b54b85953b8dfe1d77 (patch)
tree80e015f57b8bfc3c0a0fccb6b0d4ef4d602c0a0d /docs/markdown/Configuration.md
parent4f8cecca9733588b083dba8488143fa1ffb0e495 (diff)
downloadmeson-f72ee8e742a171db74ed32b54b85953b8dfe1d77.zip
meson-f72ee8e742a171db74ed32b54b85953b8dfe1d77.tar.gz
meson-f72ee8e742a171db74ed32b54b85953b8dfe1d77.tar.bz2
Rewrap long text lines in docs. [skip ci]
Diffstat (limited to 'docs/markdown/Configuration.md')
-rw-r--r--docs/markdown/Configuration.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/docs/markdown/Configuration.md b/docs/markdown/Configuration.md
index cd1af14..a2fc639 100644
--- a/docs/markdown/Configuration.md
+++ b/docs/markdown/Configuration.md
@@ -115,19 +115,20 @@ Will produce:
## Dealing with file encodings
-The default meson file encoding to configure files is utf-8. If you need to
-configure a file that is not utf-8 encoded the encoding keyword will allow
-you to specify which file encoding to use. It is however strongly advised to
-convert your non utf-8 file to utf-8 whenever possible. Supported file
-encodings are those of python3, see [standard-encodings](https://docs.python.org/3/library/codecs.html#standard-encodings).
+The default meson file encoding to configure files is utf-8. If you
+need to configure a file that is not utf-8 encoded the encoding
+keyword will allow you to specify which file encoding to use. It is
+however strongly advised to convert your non utf-8 file to utf-8
+whenever possible. Supported file encodings are those of python3, see
+[standard-encodings](https://docs.python.org/3/library/codecs.html#standard-encodings).
## Using dictionaries
-Since *0.49.0* `configuration_data()` takes an optional dictionary as first
-argument. If provided, each key/value pair is added into the
+Since *0.49.0* `configuration_data()` takes an optional dictionary as
+first argument. If provided, each key/value pair is added into the
`configuration_data` as if `set()` method was called for each of them.
-`configure_file()`'s `configuration` kwarg also accepts a dictionary instead of
-a configuration_data object.
+`configure_file()`'s `configuration` kwarg also accepts a dictionary
+instead of a configuration_data object.
Example:
```meson