From 02e6ca8714c4b42c61ca1f92f2f4a81c9696147f Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 8 Jan 2018 00:03:34 -0500
Subject: [PATCH] Revert 1.x-beta change

---
 .travis/publish-site.sh | 2 +-
 build.sbt               | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis/publish-site.sh b/.travis/publish-site.sh
index 012b763c8..4dda3d4bf 100755
--- a/.travis/publish-site.sh
+++ b/.travis/publish-site.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "1.x-beta" && "${TRAVIS_REPO_SLUG}" == "sbt/website" ]]; then
+if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "1.x" && "${TRAVIS_REPO_SLUG}" == "sbt/website" ]]; then
   openssl version
   echo -e "Host github.com\n\tStrictHostKeyChecking no\nIdentityFile ~/.ssh/deploy_rsa\n" >> ~/.ssh/config
   openssl aes-256-cbc -K $encrypted_e29f8a2ff2bf_key -iv $encrypted_e29f8a2ff2bf_iv -in .travis/deploy_rsa.enc -out .travis/deploy_rsa -d
diff --git a/build.sbt b/build.sbt
index b990454dd..30d05b1ae 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,11 +15,10 @@ lazy val root = (project in file("."))
     siteSubdirName in Pamflet := s"""$targetSbtBinaryVersion/docs""",
     tutorialSubDirName := s"""$targetSbtBinaryVersion/tutorial""",
     // Redirects
-    // redirectSettings,
-    // SiteHelpers.addMappingsToSiteDir(mappings in Redirect, siteSubdirName in Pamflet),
-    // redirectTutorialSettings,
-    // SiteHelpers.addMappingsToSiteDir(mappings in RedirectTutorial, tutorialSubDirName),
-
+    redirectSettings,
+    SiteHelpers.addMappingsToSiteDir(mappings in Redirect, siteSubdirName in Pamflet),
+    redirectTutorialSettings,
+    SiteHelpers.addMappingsToSiteDir(mappings in RedirectTutorial, tutorialSubDirName),
     // GitHub Pages. See project/Docs.scala
     customGhPagesSettings,
     // NOTE - PDF settings must be done externally like this because pdf generation generically looks