From 6c55d71d1bc32ea78413de88962f144e21f884da Mon Sep 17 00:00:00 2001
From: Jim Bugwadia <jim@nirmata.com>
Date: Thu, 23 May 2019 09:57:50 -0700
Subject: [PATCH 1/3] - update site - add README.md

---
 gh-pages/README.md   | 24 ++++++++++++++++++++++++
 gh-pages/config.toml |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gh-pages/README.md

diff --git a/gh-pages/README.md b/gh-pages/README.md
new file mode 100644
index 0000000000..71a742be86
--- /dev/null
+++ b/gh-pages/README.md
@@ -0,0 +1,24 @@
+# Kyverno Web Site
+
+This folder contains the https://kyverno.io website.
+
+The site is published in the gh_pages branch. To build the site:
+
+1. Clone the Hugo template:
+
+````bash
+cd themes
+ git clone https://github.com/nirmata/github-project-landing-page
+ ````
+
+ 2. Make changes as needed. Then publish using:
+
+````bash
+publish-to-gh-pages.sh
+````
+
+To build and test locally, install and run hugo:
+
+````bash
+hugo server
+````
diff --git a/gh-pages/config.toml b/gh-pages/config.toml
index 6327f00569..0f74deb7f5 100644
--- a/gh-pages/config.toml
+++ b/gh-pages/config.toml
@@ -1,4 +1,4 @@
-baseURL = "https://nirmata.github.io/kyverno/"
+baseURL = "https://kyverno.io/"
 themesDir = "themes"
 theme = "github-project-landing-page"
 title = "Kyverno"

From 30723edc6e112d684062cdff22593314c1bb9b5a Mon Sep 17 00:00:00 2001
From: Jim Bugwadia <jim@nirmata.com>
Date: Thu, 23 May 2019 10:02:58 -0700
Subject: [PATCH 2/3] fix CTA

---
 gh-pages/content/features.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gh-pages/content/features.md b/gh-pages/content/features.md
index 236c96874c..07aacf794c 100644
--- a/gh-pages/content/features.md
+++ b/gh-pages/content/features.md
@@ -19,11 +19,6 @@
 * Test policy changes using kubectl
 
 
-<<<<<<< HEAD
-<p style="margin-top: 30px; margin-left:15px; font-size: 125%;">
-Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/README.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/README.md">try Kyverno in your cluster</a>!
-=======
 <p style="margin-top: 30px; margin-left:15px; font-size: 110%;">
 Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/documentation/writing-policies.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/documentation/installation.md">try Kyverno in your cluster</a>!
->>>>>>> 5ef9b86400eb026bb3fdcda3a4f80f94c938e31f
 </p>
\ No newline at end of file

From 031fe1ea84087a71676311302ed6844f7484af51 Mon Sep 17 00:00:00 2001
From: Jim Bugwadia <jim@nirmata.com>
Date: Thu, 23 May 2019 10:04:49 -0700
Subject: [PATCH 3/3] update theme repo

---
 gh-pages/themes/github-project-landing-page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gh-pages/themes/github-project-landing-page b/gh-pages/themes/github-project-landing-page
index 691c627f3d..7507b5c2da 160000
--- a/gh-pages/themes/github-project-landing-page
+++ b/gh-pages/themes/github-project-landing-page
@@ -1 +1 @@
-Subproject commit 691c627f3d475b1a5f8cba4fb84fd14132ae3695
+Subproject commit 7507b5c2da7823b75185c3a2bd18db6357937143