gatsbyjs · gatsbybot · Mar 28, 2020
diff --git a/docs/contributing/blog-contributions.md b/docs/contributing/blog-contributions.md
@@ -0,0 +1,55 @@
+---
+title: Blog Contributions
+---
+
+If you'd like to contribute a post to the Gatsby blog, please review the process and guidelines outlined below and submit your idea for the post to our [Gatsby blog proposal form](https://airtable.com/shr3449954866i3iF)
+
+## Blog proposal submission process
+
+1. Complete and submit the [Gatsby blog proposal form](https://airtable.com/shr3449954866i3iF).
+2. A Gatsby team member will review your proposal and let you know if the proposal has been accepted within the next week or so.
+   - **If the post is accepted:** A Gatsby team member will work with you on a timeline for submitting and reviewing a draft of your blog post and set a tentative publishing date.
+   - **If the post is not accepted:** We’ll let you know if there are any alternative offers we can make (e.g. offer to retweet if you publish the piece elsewhere, suggest submitting it as an addition to a Gatsby doc, etc.). We’ll also do our best to explain why your proposal was not accepted and encourage you to revise your proposal based on that feedback and resubmit. Please don’t be discouraged from submitting another post in the future!
+
+If you have any questions about the process or your submission, please email [[email protected]](mailto:[email protected]).
+
+## Content guidelines for submitting a blog post proposal
+
+As a Gatsby community member, you have unique insight into the ins and outs of learning Gatsby, building with Gatsby, and contributing to Gatsby’s open source community. Contributing to the Gatsby blog is a great way to share your experiences and insights. Here are some guidelines for what kind of content is and isn’t a good fit for the Gatsby blog.
+
+Things we’re looking for in Gatsby blog content:
+
+- Information to help others overcome challenges you’ve faced while working with Gatsby
+- Stories about how Gatsby helped you overcome different challenges on work and personal projects
+- Gatsby case studies
+- Showcasing a tool, fix, or other content you or someone else have contributed to Gatsby’s open source community
+- Showcasing a tool, fix, or other content someone else has contributed to Gatsby’s open source community
+- Clear and thoughtful explanations of technical details or complex concepts related to React, GraphQL, web and application development, open-source contribution, Gatsby core, and other Gatsby-adjacent subject matter
+- Guidance and resources for learning React, GraphQL, HTML/CSS, web development, best practices, accessibility, SEO, Gatsby, different tool and CMS integrations, and other Gatsby-adjacent subject matter.
+- Other topics that you think would be valuable to people learning about or working with Gatsby
+
+Things we’d like to avoid on the Gatsby blog:
+
+- **Docs content.** Some content is better found in the Gatsby docs guides and tutorials, as it can be found in a section for related content and not buried under pages of other paginated blog posts.
+- **Promotional content.** Please don’t submit content to the Gatsby blog solely for the purpose of promoting a product, yourself, or link-building.
+  - **Here’s what you can do instead:** If you have a product or project you want to share on the Gatsby blog, focus on practical information, and make sure there’s a clear relationship with Gatsby or Gatsby-adjacent topics. You could write a step by step guide to using your product with Gatsby. You could write a case study highlighting the direct impact Gatsby had on your awesome project and offer helpful tips for others to recreate your success.
+- **Content that doesn’t seem to have a clear benefit for Gatsby users and/or the Gatsby community.** For example, if you’re writing about a use-case or integration that’s extremely niche or unique to specific conditions that are really uncommon outside of your organization, the Gatsby blog might not be the best place for your content. Likewise, if your blog post doesn’t seem to have any direct relationship with Gatsby (or an interesting indirect relationship with Gatsby), then it may be more appropriate for a personal blog or another community blog.
+
+**Please note** that these are guidelines, not rules. If you think your blog post belongs on the Gatsby blog, we absolutely encourage you to submit it. While we reserve the right to decide what is and isn’t appropriate for the Gatsby blog, we also value and encourage your creativity and your contributions.
+<<<<<<< HEAD:docs/contributing/blog-and-website-contributions.md
+
+## Making changes to the website
+
+If you want to make changes, improvements, or add new functionality to the website, you don't have to set up the full Gatsby repo to contribute. You can spin up your own instance of the Gatsby website with these steps:
+
+- Clone [the Gatsby repo](https://github.com/gatsbyjs/gatsby/) and navigate to `/www`
+- Run `yarn` to install all of the website's dependencies.
+- Run `npm run develop` to preview the site at `http://localhost:8000/`.
+
+> Note: If you are experiencing issues on a Linux machine, run `sudo apt install libvips-dev`, to install a native dependency. You can also reference [Gatsby guide on Linux](/docs/gatsby-on-linux/) for other Linux-specific requirements.
+
+Now you can make and preview your changes before raising a Pull Request!
+
+For full repo setup instructions, visit the [code contributions](/contributing/code-contributions/) page.
+=======
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097:docs/contributing/blog-contributions.md
diff --git a/docs/contributing/community.md b/docs/contributing/community.md
@@ -33,7 +33,11 @@ Gatsby コミュニティーはあなたの貢献を歓迎しています。貢
 
 Gatsby ニュースレターにサインアップし、 Gatsby コミュニティーの最新情報を購読してください！ニュースレターでは新機能やティップス、ちょっとしたテクニック、そしてほかの人々が何を作っているのかが確認できます。
 
+<<<<<<< HEAD
 [サインアップはこちら](/newsletter/)
+=======
+<EmailCaptureForm signupMessage="Want to keep up with the latest tips &amp; tricks? Subscribe to our newsletter!" />
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 ### Twitter
 

diff --git a/docs/contributing/how-to-open-a-pull-request.md b/docs/contributing/how-to-open-a-pull-request.md
@@ -89,7 +89,11 @@ Gatsby エコシステム内の様々な部分への貢献については、そ
 
 ### Blog posts
 
+<<<<<<< HEAD
 Gatsby ブログに投稿をする場合、記事を投稿する前に、記事のアイデアについて Gatsby チームから承認される必要があります。アイデアの提案方法や、ローカルでブログを走らせる方法など、詳しい説明は[ブログとウェブサイトへの貢献](/contributing/blog-and-website-contributions/)をご覧ください。
+=======
+For the Gatsby blog, it's necessary to run your content idea by the Gatsby team before submitting it. For more information, refer to the page on [blog contributions](/contributing/blog-contributions/), including how to propose an idea and setting up the blog to run locally.
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 ## レビュー・提案によるフォローアップ
 

diff --git a/docs/contributing/translation/index.md b/docs/contributing/translation/index.md
@@ -14,6 +14,7 @@ Gatsbyjs.org のコンテンツを複数の言語に翻訳する継続的な取
 
 現在、以下の言語が翻訳されています。
 
+<<<<<<< HEAD
 - [アラビア語](https://github.com/gatsbyjs/gatsby-ar)
 - [ベンガル語](https://github.com/gatsbyjs/gatsby-bn)
 - [ドイツ語](https://github.com/gatsbyjs/gatsby-de)
@@ -34,6 +35,9 @@ Gatsbyjs.org のコンテンツを複数の言語に翻訳する継続的な取
 - [ベトナム語](https://github.com/gatsbyjs/gatsby-vi)
 - [簡体字中国語](https://github.com/gatsbyjs/gatsby-zh-Hans)
 - [繁体字中国語](https://github.com/gatsbyjs/gatsby-zh-Hant)
+=======
+<LangList />
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 > ヒント: 新しい翻訳リポジトリーが作成されたら、PR で自由にここへ追加してください!
 

diff --git a/docs/contributing/translation/style-guide.md b/docs/contributing/translation/style-guide.md
@@ -6,19 +6,57 @@ title: 翻訳スタイルガイド
 
 いかなる言語の翻訳でも、Gatsby プロジェクト全体のゴール、およびバリューとして次のガイドラインに沿ってください。**技術レベル、経験レベル問わず、Gatsby を学ぶすべての人に対して友好的なコミュニティを提供すること。どんなコントリビューターも安心して貢献できる環境であること。** 翻訳されたドキュメントやチュートリアルは[これらのバリュー](/blog/2019-04-19-gatsby-why-we-write/)を守りつつ、**品質の高い文法**、正確な情報、統一された構成や目的を保つことを目指しましょう。ガイドラインに関して質問があるばあい、Gatsby チームに気軽に[お声がけ](/contributing/how-to-contribute/#not-sure-how-to-start-contributing)ください。
 
+<<<<<<< HEAD
 ### 用語集
+=======
+## Glossary
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 スタイルガイドには[用語集](https://github.com/gatsbyjs/gatsby-i18n-source/blob/master/style-guide.md#glossary)が用意されています。翻訳をする上で共通の単語は、用語集を参考にしてください。翻訳する際に便利な単語に関しては原文の[用語集](/docs/glossary/)を参考にすると良いでしょう。
 
+<<<<<<< HEAD
 ### 共通スタイルガイド
+=======
+## Universal style guide
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 以下のルールは各言語のスタイルガイドのベースとして、すべての言語の翻訳スタイルガイドで適用しましょう。
 
+<<<<<<< HEAD
 #### 原文に忠実に
+=======
+### Keep the meaning of the source
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 原文がわかりにくかったり、タイポがあったとしても、基本的に原文に忠実に訳してください。もし、原文に間違いがあり、それが修正可能であれば、[Gatsby 本家のリポジトリ](https://github.com/gatsbyjs/gatsby)に Issue や Pull Request を立ててください。そうすれば、全ての翻訳版がその修正の恩恵を受けることができます。
 
+<<<<<<< HEAD
 ### コードブロック内のテキスト
+=======
+### Use soft line wraps
+
+Use soft line wraps for paragraphs:
+
+✅ DO:
+
+```md
+No intuito de promover um ambiente aberto e acolhedor, nós, como contribuidores e mantenedores, nos comprometemos em tornar a participação em nossos projetos e em nossa comunidade o mais livre de assédio para todos, independentemente da idade, corpo, tamanho, deficiência, etnia, identidade ou expressão de gênero, nível de experiência, nacionalidade, aparência, raça, religião ou identidade e orientação sexual.
+```
+
+❌ DON'T:
+
+```md
+No intuito de promover um ambiente aberto e acolhedor, nós, como contribuidores e mantenedores,
+nos comprometemos em tornar a participação em nossos projetos e em nossa comunidade o mais livre
+de assédio para todos, independentemente da idade, corpo, tamanho, deficiência, etnia, identidade
+ou expressão de gênero, nível de experiência, nacionalidade, aparência, raça, religião ou identidade
+e orientação sexual.
+```
+
+Using soft line wraps ensures that paragraphs are always matched with the original source paragraphs when syncing, and prevents weird errors with mismatched lines.
+
+### Text in code blocks
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 コードブロック内に関しては、基本的にコメント以外を翻訳しないでください。任意で文字列リテラルの中身を翻訳することはできますが、コード自体はそのままにしてください！
 
@@ -62,7 +100,11 @@ export default () => (
 )
 ```
 
+<<<<<<< HEAD
 #### 内部リンク
+=======
+### Internal links
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 サイト内部の別のページにリンクする文章は翻訳して構いません。しかし、リンク先の URL は原文と同じ URL を使うので、そのままにしておいてください。
 
@@ -78,7 +120,11 @@ export default () => (
 - [開発環境のセットアップ](/tutorial/開発環境のセットアップ)
 ```
 
+<<<<<<< HEAD
 ### 外部リンク
+=======
+### External links
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 
 もし外部リンクが[MDN]や[Wikipedia]のような記事の場合であって、かつ十分なクオリティの日本語版が存在する場合は、翻訳版へのリンクを貼りましょう。
 

diff --git a/docs/docs/adding-comments.md b/docs/docs/adding-comments.md
@@ -10,7 +10,10 @@ Gatsby でブログを動かしていて、いくつかのコンテンツを追
 - [Commento](https://commento.io)
 - [Facebook Comments](https://www.npmjs.com/package/react-facebook)
 - [Staticman](https://staticman.net)
+<<<<<<< HEAD
 - [JustComments](https://just-comments.com) \([Gatsby の公式プラグイン](https://www.gatsbyjs.org/packages/gatsby-plugin-just-comments/)\)
+=======
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
 - [TalkYard](https://www.talkyard.io)
 - [Gitalk](https://gitalk.github.io)
 

diff --git a/docs/docs/data-storage-redux.md b/docs/docs/data-storage-redux.md
@@ -1,9 +1,63 @@
 ---
 title: Data Storage (Redux)
-issue: https://github.com/gatsbyjs/gatsby/issues/21068
 ---
 
-This is a stub. Help our community expand it.
+During Gatsby's bootstrap & build phases, the state is stored and manipulated using the [Redux](https://redux.js.org/) library. The key purpose of using Redux in Gatsby internals is to centralize all of the state logic. Reviewing the Gatsby [reducers](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby/src/redux/reducers) and [actions](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby/src/redux/actions) folders gives a comprehensive picture of what state manipulations are possible.
 
+<<<<<<< HEAD
 Please use the [Gatsby Style Guide](/contributing/gatsby-style-guide/) to ensure your
 Pull Request gets accepted.
+=======
+## Store
+
+The namespaces in Gatsby's Redux store are a great overview of the Gatsby internals, here are a few:
+
+- **[Nodes](/docs/node-interface/)** - All data that’s added to Gatsby is modeled using nodes. Nodes are most commonly added by Source plugins such as `gatsby-source-filesystem`.
+- **[Schema](/docs/schema-generation/)** - GraphQL [schema](/docs/glossary#schema) [inferred](/docs/glossary#inference) from Nodes, available for querying by page and static queries.
+- **[Pages](/docs/gatsby-internals-terminology/#page)** - A `Map` of page paths to page objects. Objects made via [Page Creation](/docs/page-creation) contain information needed to render a page such as component file path, page query and context.
+- **[Components](/docs/gatsby-internals-terminology/#component)** - A `Map` of component file paths to page objects.
+- **[Static Query Components](/docs/static-vs-normal-queries/#keeping-track-of-site-queries-during-build-in-redux-stores)** - A `Map` of any components detected with a [static query](/docs/static-query/).
+- **Jobs** - Long-running and CPU-intensive processes, generally started as a side-effect to a GraphQL query. Gatsby doesn’t finish its process until all jobs are ended.
+- **Webpack** - Config for the [Webpack](/docs/webpack-and-ssr/) bundler which handles code optimization and splitting of delivered javascript bundles.
+
+The Gatsby [redux index file](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby/src/redux/index.ts) has two key exports, `store` and `emitter`. Throughout the bootstrap and build phases, `store` is used to get the current state and dispatch actions, while `emitter` is used to register listeners for particular actions. The store is also made available to Gatsby users through the [Node APIs](/docs/node-apis/).
+
+## Actions
+
+Actions dispatched in the store cause state changes through the reducers and also trigger listeners registered for that action on a [mitt](https://www.npmjs.com/package/mitt) `emitter`. While the `subscribe` Redux store method is typically used to connect a web framework like React, Gatsby only uses the `subscribe` method to connect the `emitter`.
+
+The [Gatsby actions](/docs/actions/) are all either internal, public or restricted. The public actions, and a context relevant subset of the restricted actions, are available to users through the [Node APIs](/docs/node-apis/).
+
+### Example action journey for `createRedirect`
+
+Gatsby actions have a similar journey through defining, exposing and dispatching. This section follows the [createRedirect](/docs/actions/#createRedirect) public action:
+
+- **Reducer case** - The redirects reducer will catch actions with a type `CREATE_REDIRECT` and make the necessary state manipulation.
+
+- **Side effect** - An `emitter` listener is registered for the `CREATE_REDIRECT` action type.
+
+- **Action creator** - An action creator, `createRedirect`, is defined in the public actions file. The action has a payload, the information needed to complete the action, and a type, the string that identifies this particular action.
+
+- **Expose bound action creator** - `createRedirect` is one of the public actions made available to all of the [Node APIs](/docs/node-apis/). A collection of public actions and the restricted actions available to the called API are bound to the Redux store dispatch. The bound action collection is then passed when calling the user's API function.
+
+- **Dispatch** - Here is an example of the `createRedirect` call that a Gatsby user could make with the [createPages](/docs/node-apis/#createPages) API in their project's [gatsby-node.js](/docs/api-files-gatsby-node/) file:
+
+```javascript:title=gatsby-node.js
+module.exports = {
+  createPages: ({ actions }) => {
+    const { createRedirect } = actions
+    createRedirect({
+      fromPath: "/legacy-path",
+      toPath: "/current-path",
+    })
+  },
+}
+```
+
+By walking through an action scenario in detail, you can hopefully understand more about Gatsby's internals using Redux.
+
+## Additional resources
+
+- [Behind the Scenes: What Makes Gatsby Great](/blog/2019-04-02-behind-the-scenes-what-makes-gatsby-great/)
+- [Gatsby Magic](/docs/gatsby-magic/)
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
diff --git a/docs/docs/deploying-to-aws-amplify.md b/docs/docs/deploying-to-aws-amplify.md
@@ -25,7 +25,11 @@ AWS Amplify はクライアントのライブラリー、CLI ツールチェー
 1. デフォルトのビルド設定を承認します。サービスロールを持つフロントエンドでバックエンドリソースを反映する権限を Amplify Console に与えます。これによりコンソールは、コードをコミットするごとにバックエンドとフロントエンドの両方の変更を察知し、更新を行います。もし、サービスロールがなければ誘導に従い 1 つ作成し、作成したらコンソールに戻り、ドロップダウンから作成したサービスロールを選択します。
    ![Gatsby Amplify2](./images/amplify-build-settings.gif)
 
+<<<<<<< HEAD
 1. 変更内容を吟味し、**Save and deploy** を選択します。Amplify Console はリポジトリーからコードを pull して、バックエンドとフロントエンドの変更をビルドし、ビルド成果物を `https://master.unique-id.amplifyapp.com` にデプロイします。おまけ：様々なデバイスでレイアウトの問題を見つけるためのアプリのスクリーンショット 🔥
+=======
+1. Review your changes and then choose **Save and deploy**. The Amplify Console will pull code from your repository, build changes to the backend and frontend, and deploy your build artifacts at `https://master.unique-id.amplifyapp.com`. Bonus: Screenshots of your app on different devices to find layout issues 🔥
+>>>>>>> 8ff6bb09c23261662f47e79a041a92855d517097
    ![Gatsby Amplify2](./images/amplify-gatsby-deploy.gif)
 
 ## 参考資料：