From c50886ce03c8f1c7c565c2a9b09b6440af6a4adf Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 29 Dec 2014 11:02:55 +0100
Subject: [PATCH] Fix scope inheritance documentation

Issue: SPR-12570
---
 src/reference/docbook/beans.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml
index 73764d81cf..c164c1440b 100644
--- a/src/reference/docbook/beans.xml
+++ b/src/reference/docbook/beans.xml
@@ -885,17 +885,16 @@ List userList = service.getUsernameList();
       child bean class must be compatible with the parent, that is, it must
       accept the parent's property values.</para>
 
-    <para>A child bean definition inherits constructor argument values, property
-      values, and method overrides from the parent, with the option to add new
-      values. Any initialization method, destroy method, and/or
+    <para>A child bean definition inherits scope, constructor argument values,
+      property values, and method overrides from the parent, with the option to
+      add new values. Any scope, initialization method, destroy method, and/or
       <literal>static</literal> factory method settings that you specify will
       override the corresponding parent settings.</para>
 
     <para>The remaining settings are <emphasis>always</emphasis> taken from the
       child definition: <emphasis>depends on</emphasis>, <emphasis>autowire
       mode</emphasis>, <emphasis>dependency check</emphasis>,
-      <emphasis>singleton</emphasis>, <emphasis>scope</emphasis>, <emphasis>lazy
-      init</emphasis>.</para>
+      <emphasis>singleton</emphasis>, <emphasis>lazy init</emphasis>.</para>
 
     <para>The preceding example explicitly marks the parent bean definition as
       abstract by using the <literal>abstract</literal> attribute. If the parent