editing about pages

5 files changed, 15 insertions, 60 deletions

diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
deleted file mode 100644
index f82a09a0..00000000
--- a/site/content/pages/about/disclaimer.md
+++ /dev/null
@@ -1,41 +0,0 @@
-------------
-
-status: published
-title: Disclaimer
-desc: MegaPixels Disclaimer
-slug: disclaimer
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
- 
-------------
-
-# Disclaimer
-
-<section class="about-menu">
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
-<li><a class="current" href="/about/disclaimer/">Disclaimer</a></li>
-<li><a href="/about/terms/">Terms and Conditions</a></li>
-<li><a href="/about/privacy/">Privacy Policy</a></li>
-</ul>
-</section>
-
-(TEMPORARY PAGE)
-
-Last updated: December 04, 2018
-
-The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.
-
-MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.
-
-In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice. 
-
-## External links disclaimer
-
-MegaPixels.cc website may contain links to external websites that are not provided or maintained by or in any way affiliated with MegaPixels.cc
-
-Please note that the MegaPixels.cc does not guarantee the accuracy, relevance, timeliness, or completeness of any information on these external websites.
diff --git a/site/content/pages/about/faq.md b/site/content/pages/about/faq.md
index cec53813..a0422d10 100644
--- a/site/content/pages/about/faq.md
+++ b/site/content/pages/about/faq.md
@@ -3,7 +3,7 @@
 status: published
 title: MegaPixels Press and News
 desc: MegaPixels Press and News
-slug: press
+slug: faqs
 cssclass: about
 published: 2018-12-04
 updated: 2018-12-04
@@ -15,12 +15,11 @@ authors: Adam Harvey
 
 <section class="about-menu">
 <ul>
-    <li><a href="/about/">About</a></li>
-    <li><a href="/about/press/">Press</a></li>
-    <li><a class="current" href="/about/credits/">Credits</a></li>
-    <li><a href="/about/disclaimer/">Disclaimer</a></li>
-    <li><a href="/about/terms/">Terms and Conditions</a></li>
-    <li><a href="/about/privacy/">Privacy Policy</a></li>
+<li><a href="/about/">About</a></li>
+<li><a class="current" href="/about/faq/">FAQs</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 47e1af52..a0780d64 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
-<li><a href="/about/disclaimer/">Disclaimer</a></li>
-<li><a href="/about/terms/">Terms and Conditions</a></li>
-<li><a href="/about/privacy/">Privacy Policy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index e36daf2a..48598623 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -16,11 +16,10 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
-<li><a href="/about/disclaimer/">Disclaimer</a></li>
-<li><a href="/about/terms/">Terms and Conditions</a></li>
-<li><a class="current" href="/about/privacy/">Privacy Policy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>
 
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 7ae6dac7..e03bafaa 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -17,11 +17,10 @@ authors: Adam Harvey
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
-<li><a href="/about/disclaimer/">Disclaimer</a></li>
-<li><a class="current" href="/about/terms/">Terms and Conditions</a></li>
-<li><a href="/about/privacy/">Privacy Policy</a></li>
+<li><a class="current" href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section>