From 98bc202ced45b207b8f7c2393ce1bbe43e943fde Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Tue, 15 May 2018 11:14:44 +0200 Subject: [PATCH] Bz 53020: fix editorial errors --- manual/Tasks/import.html | 10 +++++----- manual/Tasks/include.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html index cb5f4fbe2..8a3f982ac 100644 --- a/manual/Tasks/import.html +++ b/manual/Tasks/import.html @@ -200,21 +200,21 @@ directory common inside the jar file common.jar.

The short version: Use import if you intend to override a target, otherwise use include.

-

When using import the imported targets are available by up to two names. Their +

When import is used, the imported targets are available by up to two names: their "normal" name without any prefix and potentially with a prefixed name (the value of the as attribute or the imported project's name attribute, if any).

-

When using include the included targets are only available in the prefixed form.

+

When include is used, the included targets are only available in the prefixed form.

-

When using import, the imported target's depends attribute remains +

When import is used, the imported target's depends attribute remains unchanged, i.e. it uses "normal" names and allows you to override targets in the dependency list.

-

When using include, the included targets cannot be overridden and +

When include is used, the included targets cannot be overridden and their depends attributes are rewritten so that prefixed names are used. This allows writers of the included file to control which target is invoked as part of the dependencies.

-

It is possible to include the same file more than once by using different prefixes, +

It is possible to include the same file more than once by using different prefixes; it is not possible to import the same file more than once.

Examples

diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html index 09f9d565b..55256070a 100644 --- a/manual/Tasks/include.html +++ b/manual/Tasks/include.html @@ -195,21 +195,21 @@ directory common inside the jar file common.jar.

The short version: Use import if you intend to override a target, otherwise use include.

-

When using import the imported targets are available by up to two names. Their +

When import is used, the imported targets are available by up to two names: their "normal" name without any prefix and potentially with a prefixed name (the value of the as attribute or the imported project's name attribute, if any).

-

When using include the included targets are only available in the prefixed form.

+

When include is used, the included targets are only available in the prefixed form.

-

When using import, the imported target's depends attribute remains +

When import is used, the imported target's depends attribute remains unchanged, i.e. it uses "normal" names and allows you to override targets in the dependency list.

-

When using include, the included targets cannot be overridden and +

When include is used, the included targets cannot be overridden and their depends attributes are rewritten so that prefixed names are used. This allows writers of the included file to control which target is invoked as part of the dependencies.

-

It is possible to include the same file more than once by using different prefixes, +

It is possible to include the same file more than once by using different prefixes; it is not possible to import the same file more than once.

Examples