From 9552f145e2b370d1ae095d662188070e71823a10 Mon Sep 17 00:00:00 2001
From: Thomas Karpiniec <tk@1.21jiggawatts.net>
Date: Mon, 26 Mar 2018 20:09:52 +1100
Subject: [PATCH] Add copyright footer and update READMEs. Fixes #2

---
 README.md     | 19 +++++++------------
 README.sphinx |  7 +++++++
 docs/conf.py  |  9 +++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 3498012..ef40ccb 100644
--- a/README.md
+++ b/README.md
@@ -8,27 +8,22 @@ To build the documentation see README.sphinx.
 
 Rendered versions are available online:
 
-- User Guide - <https://karp.id.au/social/user/>
-- Admin Guide - <https://karp.id.au/social/admin/>
+- User Guide - <http://thomask.sdf.org/social/en/user/>
+- Admin Guide - <http://thomask.sdf.org/social/en/admin/>
 
 ## License
 
-- Copyright 2016 Thomas Karpiniec <tk@1.21jiggawatts.net>. (If this ever becomes official documentation then obviously copyright will be assigned to the FSF.)
+- Copyright 2018 Thomas Karpiniec <tk@1.21jiggawatts.net>.
 - Copyright 2015 Free Software Foundation, Inc.
 - Copyright 2015 StatusNet, Inc
+- Contributors retain copyright of their work. See git history for details. Thank you:
 
-This documentation is made available under the terms of the Creative Commons Attribution 3.0 Unported license. See <http://creativecommons.org/licenses/by/3.0/> for details.
-
-## Contributors
-
-A huge thank you to everybody who has contributed to these manuals:
-
-Drymer, for the Spanish translation  
+@drymer, for the Spanish translation  
 Scott Bragg @faulteh  
 John Kristensen @jerrykan
 
+This documentation is made available under the terms of the Creative Commons Attribution 3.0 Unported license. See <http://creativecommons.org/licenses/by/3.0/> for details.
+
 ## Acknowledgements
 
 Much of the initial content is copied and adapted from the documentation in the main GNU social project at <https://git.gnu.io/gnu/gnu-social/> under the terms of Creative Commons Attribution 3.0 Unported license.
-
-
diff --git a/README.sphinx b/README.sphinx
index ae72645..f7797f5 100644
--- a/README.sphinx
+++ b/README.sphinx
@@ -20,3 +20,10 @@ The documentation can be generated using the following commands
 
 The documentation should now be available in `_build/` directory under the
 `docs/` directory.
+
+To generate the Spanish translations:
+
+    cd docs/
+    make translations
+
+The Spanish version will be generated in `docs/_build/spanish`.
diff --git a/docs/conf.py b/docs/conf.py
index 22dc9cb..cbbf800 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@ author = u'Various contributors'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.1'
+version = u'0.1.2'
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.1'
+release = u'0.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -118,10 +118,11 @@ html_theme_options = {
 
 html_context = {
     'show_sphinx': False,
-    'show_copyright': False,
+    'show_copyright': True,
     'show_source': False,
     'build_id': subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]),
-    'build_url': 'https://git.gnu.io/tom/social-doc'
+    'build_url': 'https://git.gnu.io/tom/social-doc',
+    'copyright': "2018 Authors in README. Creative Commons CC-BY-3.0"
 }
 
 # Add any paths that contain custom themes here, relative to this directory.