[docs] Mention the new data fetching methods on missing places

docs/advanced-features/custom-error-page.md

@@ -54,25 +54,25 @@ If you want to render the built-in error page you can by importing the `Error` c
 
 ```jsx
 import Error from 'next/error'
-import fetch from 'isomorphic-unfetch'
+import fetch from 'node-fetch'
 
-const Page = ({ errorCode, stars }) => {
+export async function getServerSideProps() {
+  const res = await fetch('https://api.github.com/repos/zeit/next.js')
+  const errorCode = res.ok ? false : res.statusCode
+  const json = await res.json()
+
+  return {
+    props: { errorCode, stars: json.stargazers_count },
+  }
+}
+
+export default function Page({ errorCode, stars }) {
   if (errorCode) {
     return <Error statusCode={errorCode} />
   }
 
   return <div>Next stars: {stars}</div>
 }
-
-Page.getInitialProps = async () => {
-  const res = await fetch('https://api.github.com/repos/zeit/next.js')
-  const errorCode = res.statusCode > 200 ? res.statusCode : false
-  const json = await res.json()
-
-  return { errorCode, stars: json.stargazers_count }
-}
-
-export default Page
 ```
 
 The `Error` component also takes `title` as a property if you want to pass in a text message along with a `statusCode`.

docs/api-reference/data-fetching/getInitialProps.md

@@ -133,6 +133,13 @@ export default class Page extends React.Component<Props> {
 
 For more information on what to do next, we recommend the following sections:
 
+<div class="card">
+  <a href="/docs/basic-features/data-fetching.md">
+    <b>Data Fetching:</b>
+    <small>Learn more about data fetching in Next.js.</small>
+  </a>
+</div>
+
 <div class="card">
   <a href="/docs/basic-features/pages.md">
     <b>Pages:</b>
@@ -141,8 +148,8 @@ For more information on what to do next, we recommend the following sections:
 </div>
 
 <div class="card">
-  <a href="/docs/basic-features/data-fetching.md">
-    <b>Data Fetching:</b>
-    <small>Learn more about data fetching in Next.js.</small>
+  <a href="/docs/advanced-features/automatic-static-optimization.md">
+    <b>Automatic Static Optimization:</b>
+    <small>Learn about how Nextjs automatically optimizes your pages.</small>
   </a>
 </div>

docs/api-reference/next/router.md

@@ -87,7 +87,7 @@ Router.push(url, as, options)
 - `url` - The URL to navigate to. This is usually the name of a `page`
 - `as` - Optional decorator for the URL that will be shown in the browser. Defaults to `url`
 - `options` - Optional object with the following configuration options:
-  - [`shallow`](/docs/routing/shallow-routing.md): Update the path of the current page without rerunning `getInitialProps`. Defaults to `false`
+  - [`shallow`](/docs/routing/shallow-routing.md): Update the path of the current page without rerunning `getServerSideProps` or `getInitialProps`. Defaults to `false`
 
 > You don't need to use `Router` for external URLs, [window.location](https://developer.mozilla.org/en-US/docs/Web/API/Window/location) is better suited for those cases.
 

docs/faq.md

@@ -46,7 +46,7 @@ description: Get to know more about Next.js with the frequently asked questions.
 
 <details>
   <summary>How do I fetch data?</summary>
-  <p>It's up to you. You can use the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch">fetch API</a> inside your React components, or <a href="/docs/api-reference/data-fetching/getInitialProps.md">getInitialProps</a> for initial data population.</p>
+  <p>It's up to you. You can use the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch">fetch API</a> or <a href="https://swr.now.sh/">SWR</a> inside your React components for remote data fetching; or use our <a href="/docs/basic-features/data-fetching.md">data fetching methods</a> for initial data population.</p>
 </details>
 
 <details>