From cf3373ebd9feb8c82f00b25ffb78018490ab23fc Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 13 Sep 2022 17:21:21 +0000
Subject: [PATCH 1/4] Fix missed unresolved conflict

---
 docs/templates.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/templates.md b/docs/templates.md
index 24e98bbc9cb6b..bd3184c283b05 100644
--- a/docs/templates.md
+++ b/docs/templates.md
@@ -225,14 +225,9 @@ resource "kubernetes_pod" "podName" {
 
 ### Delete templates
 
-<<<<<<< HEAD
 You can delete a template using both the coder CLI and UI. Only
 [template admins and owners](./admin/users.md) can delete a template, and the template
 must not have any running workspaces associated to it.
-=======
-You can delete a template using both the Coder CLI and UI. Only
-[template admins and owners](./admin/users.md) can delete a template.
->>>>>>> 0407c2294c5c7321071c17013f2e39bd70568165
 
 Using the CLI, login to Coder and run the following command to delete a template:
 
@@ -322,7 +317,7 @@ We recommend source controlling your templates as you would other code.
 CI is as simple as running `coder templates push` with the appropriate
 credentials.
 
-
 ## Next Steps
+
 - Learn about [Authentication & Secrets](templates/authentication.md)
 - Learn about [Workspaces](workspaces.md)

From 43ca4a4104a41f6a150045594be38e2077a920bc Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 13 Sep 2022 17:28:53 +0000
Subject: [PATCH 2/4] docs: Custom resource icons

---
 docs/templates/resource-metadata.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/templates/resource-metadata.md b/docs/templates/resource-metadata.md
index f33d3c68d93dd..30c5c62ac22e3 100644
--- a/docs/templates/resource-metadata.md
+++ b/docs/templates/resource-metadata.md
@@ -71,6 +71,32 @@ resource "coder_metadata" "hide_serviceaccount" {
 }
 ```
 
+## Hiding custom resource icon
+
+You can use custom icons for your resources using the `icon` attribute. The `icon` attribute needs to be a valid path or URL.
+
+```hcl
+resource "coder_metadata" "resource_with_icon" {
+  count = data.coder_workspace.me.start_count
+  resource_id = kubernetes_service_account.user_data.id
+  icon = "/icon/database.svg"
+  item {
+    key = "name"
+    value = kubernetes_deployment.coder[0].metadata[0].name
+  }
+}
+```
+
+To make easier for you to customize your resource we added some built-in icons:
+
+- Folder `/icon/folder.svg`
+- Memory `/icon/memory.svg`
+- Image `/icon/image.svg`
+- Widgets `/icon/widgets.svg`
+- Database `/icon/database.svg`
+
+We also have other icons related to the IDEs. You can see all the icons [here](https://github.com/coder/coder/tree/main/site/static/icon).
+
 ## Up next
 
 - Learn about [secrets](../secrets.md)

From 78f949502588bcde72c84ece5a92242ccf480672 Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 13 Sep 2022 17:30:00 +0000
Subject: [PATCH 3/4] Fix title

---
 docs/templates/resource-metadata.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/templates/resource-metadata.md b/docs/templates/resource-metadata.md
index 30c5c62ac22e3..d4d5d21197777 100644
--- a/docs/templates/resource-metadata.md
+++ b/docs/templates/resource-metadata.md
@@ -71,7 +71,7 @@ resource "coder_metadata" "hide_serviceaccount" {
 }
 ```
 
-## Hiding custom resource icon
+## Using custom resource icon
 
 You can use custom icons for your resources using the `icon` attribute. The `icon` attribute needs to be a valid path or URL.
 

From e8fbc5550f5fad5af99bdd79159193d51b027c07 Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 13 Sep 2022 17:35:24 -0300
Subject: [PATCH 4/4] Apply suggestions from code review

Co-authored-by: Ben Potter <ben@coder.com>
---
 docs/templates/resource-metadata.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/templates/resource-metadata.md b/docs/templates/resource-metadata.md
index d4d5d21197777..a5870a9925734 100644
--- a/docs/templates/resource-metadata.md
+++ b/docs/templates/resource-metadata.md
@@ -73,7 +73,7 @@ resource "coder_metadata" "hide_serviceaccount" {
 
 ## Using custom resource icon
 
-You can use custom icons for your resources using the `icon` attribute. The `icon` attribute needs to be a valid path or URL.
+To use custom icons on your resources, use the `icon` attribute (must be a valid path or URL):
 
 ```hcl
 resource "coder_metadata" "resource_with_icon" {