Merge branch 'master' of github.com:adamhrv/megapixels_dev

4 files changed, 14 insertions, 18 deletions

diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
index 738759ab..b86dac22 100644
--- a/site/public/about/faq/index.html
+++ b/site/public/about/faq/index.html
@@ -29,12 +29,11 @@
   <section><h1>FAQs</h1>
 <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><p>[ page under development ]</p>
 </section>
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index e2e646da..3fc33969 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -30,11 +30,10 @@
 <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><p>(TEMPORARY PAGE)</p>
 <ul>
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index f6915d66..2e1b3349 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -30,11 +30,10 @@
 <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><p>(TEMPORARY PAGE)</p>
 <p>A summary of our privacy policy is as follows:</p>
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index b86eae88..58e49b78 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -30,11 +30,10 @@
 <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><p>(TEMPORARY PAGE)</p>
 <p>(FPO: this is only example text)</p>