From dd094603f7f0abd3c358441cbd811eb1adc0b3b5 Mon Sep 17 00:00:00 2001
From: Ruth Sears-Blazej <rsears@salesforce.com>
Date: Fri, 29 Mar 2019 15:51:11 -0700
Subject: [PATCH] Edit Prettier doc

---
 docs/_data/sidebar.yml                     |  4 +--
 docs/articles/getting-started/prettier.md  | 42 ++++++++++++++++++++++
 docs/articles/user-guide/using-prettier.md | 39 --------------------
 3 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 docs/articles/getting-started/prettier.md
 delete mode 100644 docs/articles/user-guide/using-prettier.md

diff --git a/docs/_data/sidebar.yml b/docs/_data/sidebar.yml
index 30e55e8de4..45e60ffa1e 100644
--- a/docs/_data/sidebar.yml
+++ b/docs/_data/sidebar.yml
@@ -11,6 +11,8 @@
       url: /articles/getting-started/recommended-extensions
     - title: Settings
       url: /articles/getting-started/settings
+    - title: Prettier Code Formatter
+      url: /articles/getting-started/prettier
     - title: Tips & Tricks
       url: /articles/getting-started/tips-and-tricks
 - title: User Guide
@@ -26,8 +28,6 @@
       url: /articles/user-guide/source-format
     - title: Default Org
       url: /articles/user-guide/default-org
-    - title: Using Prettier
-      url: /articles/user-guide/using-prettier
     - title: Demo Mode
       url: /articles/user-guide/demo-mode
 - title: Apex
diff --git a/docs/articles/getting-started/prettier.md b/docs/articles/getting-started/prettier.md
new file mode 100644
index 0000000000..8445c8cc38
--- /dev/null
+++ b/docs/articles/getting-started/prettier.md
@@ -0,0 +1,42 @@
+---
+title: Set Up the Prettier Code Formatter for Salesforce Projects
+---
+
+Currently, Prettier supports Aura and Lightning Web Components (LWC) as well as standard file formats like `.json`, `.md`, `.html`, and `.js`. Support for Apex is being worked on by the [community](https://github.com/dangmai/prettier-plugin-apex) and should be available soon.
+
+Using Prettier for Aura and LWC requires some configuration.
+
+> NOTE: Prettier support for LWC is coming in the next release of Prettier (version 1.17.0). However, it can be used now by installing the `master` branch as shown in this document.
+
+1. If you don’t already have a `package.json` in your project, run: `npm init`  
+  You can accept all the defaults.
+
+1. Install the latest `master` branch of Prettier by running: `npm i prettier/prettier -D`
+
+1. Create a Prettier configuration file called `.prettierrc`, in the root of your project, with the following content.
+
+   > NOTE: The `"trailingComma": "none"` setting is required for Aura.
+
+   ```json
+   {
+     "trailingComma": "none",
+     "overrides": [
+       {
+         "files": "**/lwc/**/*.html",
+         "options": { "parser": "lwc" }
+       },
+       {
+         "files": "*.{cmp,page,component}",
+         "options": { "parser": "html" }
+       }
+     ]
+   }
+   ```
+
+1. If you’d like to further customize Prettier, add [other config options](https://prettier.io/docs/en/options.html).
+
+1. Install the [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) extension for VS Code.
+
+1. If you want to ensure that all your files are formatted, enable the setting `editor.formatOnSave` in VS Code. For information about configuring your settings, see [User and Workspace Settings](https://code.visualstudio.com/docs/getstarted/settings) in the Visual Studio Code docs.
+
+If you want to format your files each time that you commit changes to your Git repository, [set up a Git hook](https://prettier.io/docs/en/precommit.html).
diff --git a/docs/articles/user-guide/using-prettier.md b/docs/articles/user-guide/using-prettier.md
deleted file mode 100644
index 3b71f28952..0000000000
--- a/docs/articles/user-guide/using-prettier.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Using Prettier in Salesforce Projects
----
-
-Currently, Prettier supports Aura and LWC as well as standard file formats like `json`, `md`, `html`, and `js` files. Support for Apex is being worked on by the [community](https://github.com/dangmai/prettier-plugin-apex) and should be availible soon.
-
-Using Prettier for Aura and LWC requires some configuration.
-
-> NOTE: Prettier support for LWC is coming in the next release of Prettier (version 1.17.0). However, it can be used now by installing the master branch as shown in this document.
-
-1. If you dont already have a `package.json` in your project run `npm init`. You can accept all the defaults.
-
-1. Install prettier by running `npm i prettier/prettier -D`. This will install the latest master branch of prettier.
-
-1. Create a prettier configuration file in the root of your project called `.prettierrc` with the following content.
-
-   > NOTE: The `trailingComma: "none"` setting is required for Aura.
-
-   ```json
-   {
-     "trailingComma": "none",
-     "overrides": [
-       {
-         "files": "**/lwc/**/*.html",
-         "options": { "parser": "lwc" }
-       },
-       {
-         "files": "*.{cmp,page,component}",
-         "options": { "parser": "html" }
-       }
-     ]
-   }
-   ```
-
-1. You can furthar customize prettier using [other config options](https://prettier.io/docs/en/options.html) as you like.
-
-1. Install the [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) Extension for VS Code.
-
-1. If you want to ensure all your files are formatted you can enable the setting `editor.formatOnSave` in VS Code. You may also want to [setup a git hook](https://prettier.io/docs/en/precommit.html) to format before commiting files to your repository.