Merge branch 'canary' into shu/504f

Author: shuding

docs/api-reference/data-fetching/get-server-side-props.md

@@ -43,7 +43,7 @@ The `context` parameter is an object containing the following keys:
 
 ## getServerSideProps return values
 
-The `getServerSideProps` function should return an object with the following **optional** properties:
+The `getServerSideProps` function should return an object with **any one of the following** properties:
 
 ### `props`
 

docs/api-reference/data-fetching/get-static-props.md

@@ -41,7 +41,7 @@ The `context` parameter is an object containing the following keys:
 
 ## getStaticProps return values
 
-The `getStaticProps` function should return an object with the following **optional** properties:
+The `getStaticProps` function should return an object containing either `props`, `redirect`, or `notFound` followed by an **optional** `revalidate` property.
 
 ### `props`