diff --git a/content/docs/api/db/record/children/contents.lr b/content/docs/api/db/record/children/contents.lr index 04e6b5c9..37d36abf 100644 --- a/content/docs/api/db/record/children/contents.lr +++ b/content/docs/api/db/record/children/contents.lr @@ -6,7 +6,7 @@ type: property --- body: -Because of Lektor's tree based nature it almost all records can have children +Because of Lektor's tree based nature almost all records can have children below them. The `children` attribute provides a convenient way to access those. It returns a [Query :ref](../../query/) object that can be used to further filter down children. diff --git a/content/docs/api/db/record/contents.lr b/content/docs/api/db/record/contents.lr index eb934c57..d92ba541 100644 --- a/content/docs/api/db/record/contents.lr +++ b/content/docs/api/db/record/contents.lr @@ -9,7 +9,7 @@ type: class body: Records are [Source Objects :ref](../obj/) that come from the `content/` -folder and correspond to [Data Models :ref](../../../models/). The provide +folder and correspond to [Data Models :ref](../../../models/). They provide a wider range of functionality compared to a standard source object but they also provide all the functionality a regular source object does. diff --git a/content/docs/api/db/record/exif/contents.lr b/content/docs/api/db/record/exif/contents.lr index c7f3aa8c..67d8b580 100644 --- a/content/docs/api/db/record/exif/contents.lr +++ b/content/docs/api/db/record/exif/contents.lr @@ -38,6 +38,8 @@ into a dictionary that can be dumped to JSON for instance. | `latitude` | The longitude as floating point value. | `longitude` | The longitude as floating point value. | `altitude` | The altitude in meters as floating point value. +| `documentname` | The image document name as a string. +| `description` | The image description as a string. ## Example diff --git a/content/docs/cli/plugins/add/contents.lr b/content/docs/cli/plugins/add/contents.lr index c3eba5c5..8ebabb7b 100644 --- a/content/docs/cli/plugins/add/contents.lr +++ b/content/docs/cli/plugins/add/contents.lr @@ -10,7 +10,7 @@ body: `lektor plugins add NAME` -This command can add a new plugion to the project. If just given +This command can add a new plugin to the project. If just given the name of the plugin the latest version of that plugin is added to the project. diff --git a/content/docs/content/alts/contents.lr b/content/docs/content/alts/contents.lr index b5f17b4e..167ced12 100644 --- a/content/docs/content/alts/contents.lr +++ b/content/docs/content/alts/contents.lr @@ -75,7 +75,7 @@ targeted, different files will be used. This table visualizes this: ## Alternatives and Paths -Alternatives have a special behavior with regards to paths. They alternative +Alternatives have a special behavior with regards to paths. The alternative code does not exist in the path! This can be confusing at first, but has the advantage that they automatically work in most places as the paths are the same for different alternatives. For more information see diff --git a/content/docs/deployment/ftp/contents.lr b/content/docs/deployment/ftp/contents.lr index 18c7ea8b..55c8bc2c 100644 --- a/content/docs/deployment/ftp/contents.lr +++ b/content/docs/deployment/ftp/contents.lr @@ -32,7 +32,7 @@ target = ftps://myuser:mypassword@ftp.example.com/var/www/example ## Credentials FTP is considered a largely insecure protocol for Lektor. As such if you -want to use it you should keep your project file save as credentials will +want to use it you should keep your project file safe as credentials will be most likely embedded there. Alternatively you can set the credentials via the command line with the `--username` and `--password` option (or via the environment variables `LEKTOR_DEPLOY_USERNAME` and `LEKTOR_DEPLOY_PASSWORD`) diff --git a/content/docs/deployment/ghpages/contents.lr b/content/docs/deployment/ghpages/contents.lr index ef82ceb4..6c56e769 100644 --- a/content/docs/deployment/ghpages/contents.lr +++ b/content/docs/deployment/ghpages/contents.lr @@ -44,15 +44,18 @@ with behavior for GitHub Pages. ## CNAME Support -If you want to use a [CNAME :ext](https://en.wikipedia.org/wiki/CNAME) with -GitHub pages and Lektor you can provide the intended CNAME with the `?cname` -parameter: +If you want to use a custom domain with GitHub pages (also known as a +[CNAME :ext](https://en.wikipedia.org/wiki/CNAME)), provide the intended +CNAME in the target URL using the `?cname` parameter: ```ini [servers.production] target = ghpages://your-user/your-repository?cname=www.example.com ``` +Note that this will overwrite whatever custom domain you may have set on +GitHub with every deployment. + For more information about how CNAMEs work with GitHub you can read about the feature in the GitHub help center: [Adding a CNAME file to your repository diff --git a/content/docs/guides/error-pages/contents.lr b/content/docs/guides/error-pages/contents.lr index 69d00612..7d3a4c78 100644 --- a/content/docs/guides/error-pages/contents.lr +++ b/content/docs/guides/error-pages/contents.lr @@ -36,7 +36,7 @@ For more information about this you can read the [Project File Documentation ## Creating an Error Page -You can create easy create a 404 page by creating a `404.html/contents.lr` +You can easily add a 404 page by creating a `404.html/contents.lr` file. If you do not care much about the contents and structure of the file you can just point it to an empty model (`none`) and manually select a `404.html` template like this: diff --git a/content/docs/guides/single-page/contents.lr b/content/docs/guides/single-page/contents.lr index 912ce61d..3f2ef833 100644 --- a/content/docs/guides/single-page/contents.lr +++ b/content/docs/guides/single-page/contents.lr @@ -93,7 +93,7 @@ _model: doc-pages _hidden: yes ``` -This will set up our index model and our doc-pages model for the `docs/` +This will set up our index model and our doc-pages model for the `doc/` folder. The latter is also set to `_hidden` which will make Lektor prevent the generation of those files: they are invisible. So we need to find other ways to render them. diff --git a/content/docs/models/contents.lr b/content/docs/models/contents.lr index c8bc06be..f80341b7 100644 --- a/content/docs/models/contents.lr +++ b/content/docs/models/contents.lr @@ -89,7 +89,7 @@ Models have the following options that can customize the model itself: This is very useful for models that are implied through configuration. - `protected`: if a model is set to protected then all of its instances cannot be deleted once created. -- `inherits`: if you want to inherit all fields from another model then this +- `inherits`: if you want to inherit all fields and model option settings from another model then this can be set to the name of another model. In addition to that, there are some configuration sections in the model file diff --git a/content/docs/plugins/list/contents.lr b/content/docs/plugins/list/contents.lr index 8d5f23b3..7ce76d72 100644 --- a/content/docs/plugins/list/contents.lr +++ b/content/docs/plugins/list/contents.lr @@ -37,6 +37,7 @@ so they might not keep pace with development on Lektor. * [github-repos :ext](https://github.com/marksteve/lektor-github-repos): fetches your GitHub repos for display in Lektor templates * [google-analytics :ext](https://github.com/kmonsoor/lektor-google-analytics): Adds `Google Analytics` support to Lektor-generated site. +* [yandex-metrica :ext](https://github.com/gagoman/lektor-yandex-metrica): Adds `Yandex Metrica` support to Lektor-generated site. * [atom :ext](https://github.com/ajdavis/lektor-atom): Generate Atom feeds for your content. * [surge :ext](https://github.com/ajdavis/lektor-surge): Publish your site to [Surge](https://surge.sh/). * [netlify :ext](https://github.com/ajdavis/lektor-netlify): Publish your site to [Netlify](https://www.netlify.com/). @@ -44,6 +45,7 @@ so they might not keep pace with development on Lektor. * [i18n :ext](https://github.com/numericube/lektor-i18n-plugin): Use GetText .PO files to translate your site **content**. * [htmlmin :ext](https://github.com/vesuvium/lektor-htmlmin): Automatically minifies .html files in build directory * [creative-commons :ext](https://github.com/humrochagf/lektor-creative-commons): Add Creative Commons license to your pages +* [nofollow :ext](https://github.com/yargies/lektor-nofollow): Easily create nofollow links in markdown ! Have your own plugin and you want to see it here? Just [edit this page on GitHub :ref](https://github.com/lektor/lektor-website/edit/master/content/docs/plugins/list/contents.lr), diff --git a/content/docs/templates/navigation/contents.lr b/content/docs/templates/navigation/contents.lr index 80ed391a..fd31ebbe 100644 --- a/content/docs/templates/navigation/contents.lr +++ b/content/docs/templates/navigation/contents.lr @@ -52,7 +52,7 @@ a page. This is easy to accomplish as well: ```html+jinja