From 1c5f6c729c4ba982152cef336bdda73a9b9bb2c7 Mon Sep 17 00:00:00 2001
From: kinarashah <kinarahs@usc.edu>
Date: Wed, 6 Jun 2018 12:23:26 -0700
Subject: [PATCH] task: adding certs

---
 .../rancher/v2.x/en/tasks/projects/_index.md  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/content/rancher/v2.x/en/tasks/projects/_index.md b/content/rancher/v2.x/en/tasks/projects/_index.md
index 43214fef9d8..a6d211c47d2 100644
--- a/content/rancher/v2.x/en/tasks/projects/_index.md
+++ b/content/rancher/v2.x/en/tasks/projects/_index.md
@@ -3,4 +3,62 @@ title: Projects
 weight: 3650
 draft: true
 ---
+<<<<<<< HEAD
 _Projects_ are a new feature in Rancher that allows you to group namespaces. Users can be added as members to the project, and the project owner can assign roles to each member to control their project access.
+=======
+Coming Soon
+
+## Creating a Project
+
+Coming Soon
+
+## Switching Projects
+
+Coming Soon
+
+## Adding / Managing Project Members
+
+Coming Soon
+
+## Adding SSL Certificates
+
+SSL certificates can be added at both, Project and Namespace level. A project scoped certificate will be available in all its namespaces. 
+
+1. Select the project you want to add Certificates in UI under Global dropdown. 
+2. Under Resources dropdown, select Certificates.
+3. Click on Add Certificate option and give it a name. 
+4. If you don't want the certificate to be available in all namespaces, Select the **Available to a single namespace** option. 
+	- Choose the desired namespace. You can also add a new namespace by clicking on Add to a new namespace on the top of the namespace bar.
+5. Copy-paste or use the **Read From File** option to upload your Private Key and Certificates. 
+
+Note: Certificates are just kubernetes Secrets of type TLS, so their names shouldn't be same as any existing secret or private registry. 
+
+## Adding Configuration Maps
+
+Coming Soon
+
+## Enabling Project Logging
+
+Coming Soon
+
+## Adding Project Alerts
+
+Coming Soon
+
+## Using Private Registries
+
+Coming Soon
+
+## Adding a Secret
+
+Coming Soon
+
+## Launching a Catalog App
+
+Coming Soon
+
+## Creating a Pod Security Policy
+
+Coming Soon
+
+>>>>>>> task: adding certs