From c85e70020368081bbff49e8a0715d95cac2dd933 Mon Sep 17 00:00:00 2001
From: Brian (bex) Exelbierd <bex@pobox.com>
Date: Sep 24 2017 15:08:50 +0000
Subject: Add Branching instructions and branch F27


---

diff --git a/README.md b/README.md
index a142901..9ec68cb 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,57 @@ Publishing uses two repos:
 
 7. Verify your changes have gone live at [docs.fedoraproject.org](https://docs.fedoraproject.org) and see if they look good.  The production site is refreshed once per hour so this may take some time.
 
+### Branching New Releaess
+
+In each content repository (i.e. https://pagure.io/fedora-docs/install-guide):
+
+1. Go to the master branch
+    ````
+    $ git checkout master
+    ````
+
+2. Branch for the new release, Fedora 27 in this example:
+    ````
+    $ git checkout -b f27
+    ````
+
+3. Update the entities file to reflect the correct version numbers
+    ````
+    $ vi en-US/entities.adoc
+    ````
+
+4. Commit your changes and push to the upstream repository
+    ````
+    $ git add en-US/entities.adoc
+    $ git commit -m "Branching for F27"
+    $ git push upstream f27
+    ````
+
+5. Return to the master branch
+    ````
+    $ git checkout master
+    ````
+
+6. Update the _distro_map.yml file to add the new version
+    ````
+    $ vi _distro_map.yml
+    ````
+
+7. Commit your changes and push to the upstream repository
+    ````
+    $ git add _distro_map.yml
+    $ git commit -m "Branching for F27 - updating _distro_map.yml"
+    $ git push upstream master
+    ````
+
+In this repo, the builder repository:
+
+1. Edit the _distro_map.yml to reflect the addition of the new version.  See the fXX-en-US lines:
+
+2. Edit builder.sh to add the new branch to the BRANCHES variable
+
+3. Edit build.sh to add a new variable to hold the list of content repositories for the new branch.  See f26_BOOKS for an example.
+
 ## Project Plan
 
 Add new features
diff --git a/_distro_map.yml b/_distro_map.yml
index fa5766e..588ab23 100644
--- a/_distro_map.yml
+++ b/_distro_map.yml
@@ -9,6 +9,9 @@ fedora:
     master-en-US:
       name: Rawhide
       dir: rawhide
+    f27-en-US:
+      name: 27
+      dir: f27
     f26-en-US:
       name: 26
       dir: f26
diff --git a/builder.sh b/builder.sh
index c3ca20c..f5334f0 100755
--- a/builder.sh
+++ b/builder.sh
@@ -10,6 +10,7 @@
 # * Write a reset script to clean up the repo
 
 BRANCHES="master
+f27
 f26"
 
 master_BOOKS="install-guide
@@ -21,6 +22,10 @@ f26_BOOKS="install-guide
 system-administrators-guide
 release-notes"
 
+f27_BOOKS="install-guide
+system-administrators-guide
+release-notes"
+
 # Nonbooks
 # Note: Does not support preprocessors, such as the one used by fedora-budget
 # You must manually update _distro_map.yml and index-main.html