From ebdb0382740b4f94d660a55f365e3aa4e00b63ca Mon Sep 17 00:00:00 2001
From: GaryO <garyo@darkstarsystems.com>
Date: Wed, 16 Sep 2020 17:25:13 -0400
Subject: [PATCH 1/2] Note that props can be accessed in template directly

In "Usage with Templates" the doc shows how props of the object returned from `setup` can be used directly in the template, but I didn't find anywhere else in the composition-api doc where it says that props can also be used directly. This seemed like as good a place as any to add that, since that's where I was looking for it first :-).
---
 src/guide/composition-api-setup.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/guide/composition-api-setup.md b/src/guide/composition-api-setup.md
index 775141589f..61ad19c9f2 100644
--- a/src/guide/composition-api-setup.md
+++ b/src/guide/composition-api-setup.md
@@ -99,19 +99,19 @@ In other words, you **will not have access** to the following component options:
 
 ## Usage with Templates
 
-If `setup` returns an object, the properties on the object can be accessed in the component's template:
+If `setup` returns an object, the properties on the object can be accessed in the component's template, as can the properties of the `props` passed in to `setup`:
 
 ```vue-html
 <!-- MyBook.vue -->
 <template>
-  <div>{{ readersNumber }} {{ book.title }}</div>
+  <div>{{ props.collectionName }}: {{ readersNumber }} {{ book.title }}</div>
 </template>
 
 <script>
   import { ref, reactive } from 'vue'
 
   export default {
-    setup() {
+    setup(props) {
       const readersNumber = ref(0)
       const book = reactive({ title: 'Vue 3 Guide' })
 

From 8f14617a13106e31a906d358842d0087b94e0203 Mon Sep 17 00:00:00 2001
From: Natalia Tepluhina <tarya.se@gmail.com>
Date: Fri, 18 Sep 2020 06:24:25 +0300
Subject: [PATCH 2/2] Update src/guide/composition-api-setup.md

---
 src/guide/composition-api-setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/guide/composition-api-setup.md b/src/guide/composition-api-setup.md
index 61ad19c9f2..9fe12fa674 100644
--- a/src/guide/composition-api-setup.md
+++ b/src/guide/composition-api-setup.md
@@ -99,7 +99,7 @@ In other words, you **will not have access** to the following component options:
 
 ## Usage with Templates
 
-If `setup` returns an object, the properties on the object can be accessed in the component's template, as can the properties of the `props` passed in to `setup`:
+If `setup` returns an object, the properties on the object can be accessed in the component's template, as well as the properties of the `props` passed into `setup`:
 
 ```vue-html
 <!-- MyBook.vue -->