I don't know why I didn't commit this stuff before.

diff --git a/2015/givingguide.html b/2015/givingguide.html
index 037e26b4aa55ffd17ae09d99267a997bb40d0ccd..7deb046acf14c05478c7577dc19cfd92845ccd76 100755 (executable)
--- a/2015/givingguide.html
+++ b/2015/givingguide.html
@@ -52,7 +52,7 @@
                 </div>
 
                 <div class="intro_wrapper">
                 </div>
 
                 <div class="intro_wrapper">

-                    <h2>(zak)Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>
+                    <h2>Are you giving your loved ones tech gifts they can use freely, or gifts which put someone else in control?</h2>

                     <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
                         than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
                         counterparts.
                     <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
                         than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
                         counterparts.


@@ -716,8 +716,6 @@
                     </div>
                     <!-- end licenses-->
 
                     </div>
                     <!-- end licenses-->
 

-
-

                     <!--footer-->
                     <footer>
                         <div class="footer_wrapper">
                     <!--footer-->
                     <footer>
                         <div class="footer_wrapper">


@@ -728,7 +726,7 @@
                             </div>
 
                             <div class="copyright">
                             </div>
 
                             <div class="copyright">

-                                <p>Copyright © 2004-2014
+                                <p>Copyright © 2004-2015

                                     <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                                         Free Software Foundation
                                     </a>, Inc.
                                     <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                                         Free Software Foundation
                                     </a>, Inc.

diff --git a/README.md b/README.md
index 592a7bcab0c70e5db38b597ba5a45a5efaa323d2..f737ec45174dcb849a0a71449ac22bdf28d02812 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 # FSF Holiday Giving Guide README
 
 # FSF Holiday Giving Guide README
 

+## Deployment
+The git repo holding this site has one branch -- master. As of 2015, development is done in a directory within the branch, which isn't served to the public. The tech team has the power to change which directory the live site is pulling from.
+

 ## Adding images
 Make sure that, for side-by-side comparisons, both images are a similar height
 
 ## Adding images
 Make sure that, for side-by-side comparisons, both images are a similar height
 

-
-## Hacking
-
+## Developing using Python

 The guide is a simple static web page.  To view it in your browser,
 run `make` at the root of the source tree, then visit
 `localhost:8000`.  The `Makefile` relies on Python for starting the
 The guide is a simple static web page.  To view it in your browser,
 run `make` at the root of the source tree, then visit
 `localhost:8000`.  The `Makefile` relies on Python for starting the