This is an automated email from the ASF dual-hosted git repository.
cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-site.git
The following commit(s) were added to refs/heads/master by this push:
new 889e4a1 [site] Fix code example layout bug in configuration page
889e4a1 is described below
commit 889e4a1759f65dfbef2e887d10fb10438ae2dee6
Author: Claude Brisson <[email protected]>
AuthorDate: Sat May 30 15:31:23 2020 +0200
[site] Fix code example layout bug in configuration page
---
src/content/engine/2.1/configuration.mdtext | 6 +++---
src/content/engine/2.2/configuration.mdtext | 18 ++++++++----------
src/content/engine/devel/configuration.mdtext | 18 ++++++++----------
3 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/content/engine/2.1/configuration.mdtext
b/src/content/engine/2.1/configuration.mdtext
index 3fcb1a1..da626c4 100644
--- a/src/content/engine/2.1/configuration.mdtext
+++ b/src/content/engine/2.1/configuration.mdtext
@@ -245,9 +245,9 @@ The following resource management configuration keys only
apply to the default R
> Since 2.0, inside a macro, the rendering of null arguments uses the local
> reference literal. For instance, the following VTL code
>
-> :::velocity
-> #macro( display $foo ) $foo #end
-> #display( $null )
+> :::velocity
+> #macro( display $foo ) $foo #end
+> #display( $null )
>
> will display `$foo`. To revert to the 1.x behavior, since 2.1, you can set
> this property to true. The previous code will then display `$null`.
diff --git a/src/content/engine/2.2/configuration.mdtext
b/src/content/engine/2.2/configuration.mdtext
index 18c375a..ad49f7a 100644
--- a/src/content/engine/2.2/configuration.mdtext
+++ b/src/content/engine/2.2/configuration.mdtext
@@ -267,19 +267,17 @@ The following resource management configuration keys only
apply to the default R
>
> 1. Since 2.0, inside a macro, the rendering of null arguments uses the local
> reference literal. For instance, the following VTL code
>
-> :::velocity
-> #macro( display $foo ) $foo #end
-> #display( $bar ) ## where $bar is null
->
+> :::velocity
+> #macro( display $foo ) $foo #end
+> #display( $bar ) ## where $bar is null
> will display `$foo`. When B.C. mode is enabled, Velocity will mimic the 1.x
> behavior which is to render `$bar`.
>
> 2. Since 2.0, missing arguments which don't have an explicit default value
> are considered null inside the macro. The following code
->
-> :::velocity
-> #macro( display $foo ) $foo #end
-> #set( $foo = 'hello' )
-> #display()
->
+>
+> :::velocity
+> #macro( display $foo ) $foo #end
+> #set( $foo = 'hello' )
+> #display()
> will display `$foo`. When B.C. mode is enabled, Velocity will mimic the 1.x
> behavior which is to use the global context value, that is render `hello`.
**`velocimacro.body_reference = false`**
diff --git a/src/content/engine/devel/configuration.mdtext
b/src/content/engine/devel/configuration.mdtext
index 18c375a..ad49f7a 100644
--- a/src/content/engine/devel/configuration.mdtext
+++ b/src/content/engine/devel/configuration.mdtext
@@ -267,19 +267,17 @@ The following resource management configuration keys only
apply to the default R
>
> 1. Since 2.0, inside a macro, the rendering of null arguments uses the local
> reference literal. For instance, the following VTL code
>
-> :::velocity
-> #macro( display $foo ) $foo #end
-> #display( $bar ) ## where $bar is null
->
+> :::velocity
+> #macro( display $foo ) $foo #end
+> #display( $bar ) ## where $bar is null
> will display `$foo`. When B.C. mode is enabled, Velocity will mimic the 1.x
> behavior which is to render `$bar`.
>
> 2. Since 2.0, missing arguments which don't have an explicit default value
> are considered null inside the macro. The following code
->
-> :::velocity
-> #macro( display $foo ) $foo #end
-> #set( $foo = 'hello' )
-> #display()
->
+>
+> :::velocity
+> #macro( display $foo ) $foo #end
+> #set( $foo = 'hello' )
+> #display()
> will display `$foo`. When B.C. mode is enabled, Velocity will mimic the 1.x
> behavior which is to use the global context value, that is render `hello`.
**`velocimacro.body_reference = false`**
