tidying up; adding substitution with note about future changes - this…

… should be fairly quick to change
ox-it · Sep 16, 2015 · 55c11f7 · 55c11f7
1 parent 1941245
commit 55c11f7
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 56 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -48,6 +48,12 @@
 # The master toctree document.
 master_doc = 'index'
 
+rst_epilog = """
+.. |upcoming| replace:: The features described in this section will be available in a few weeks time.
+"""
+
+
+
 # General information about the project.
 project = u'talks.ox'
 copyright = u'2015, Mobile Oxford Team, Software Solutions, IT Services, University of Oxford'

diff --git a/docs/source/developer.rst b/docs/source/developer.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -7,6 +7,8 @@
 Oxford Talks
 ############
 
+.. Note:: Some of the features described in the documentation are not available yet. They will be released in a few weeks.
+
 .. toctree::
    :maxdepth: 1
    :caption: User Guide

diff --git a/docs/source/user/general/differences.rst b/docs/source/user/general/differences.rst
@@ -1,3 +1,5 @@
+.. Note:: |upcoming|
+
 Moving from the Old Oxford Talks to the New
 ===========================================
 

diff --git a/docs/source/user/general/terms.rst b/docs/source/user/general/terms.rst
@@ -1,3 +1,5 @@
+.. Note:: |upcoming|
+
 Glossary of Terms used by Oxford Talks
 ======================================
 

diff --git a/docs/source/user/talk-editors/people-details.rst b/docs/source/user/talk-editors/people-details.rst
@@ -1,3 +1,6 @@
+
+
+
 Change speaker / host / organiser details
 =========================================
 
@@ -6,9 +9,7 @@ Speaker, host and organiser details can be changed using the Person edit form
 Be careful!
 -----------
 
-.. warning::
-
-Any Talks Editor can change the details of any person appearing in Oxford Talks as a speaker, host or organiser. When you edit their name or affiliation, the changes will **trickle down to every talk this person has been assigned to** - including past talks.  If someone has moved department or been promoted, it is perfectly OK to create a new person entry for them in their new role.
+.. warning:: Any Talks Editor can change the details of any person appearing in Oxford Talks as a speaker, host or organiser. When you edit their name or affiliation, the changes will **trickle down to every talk this person has been assigned to** - including past talks.  If someone has moved department or been promoted, it is perfectly OK to create a new person entry for them in their new role.
 
 Find the person
 ---------------
@@ -52,4 +53,4 @@ Person Edit form
 Deleting
 --------
 
-If you need to delete a person, please :doc:`contact the Oxford Talks Administration <contact>`.
+If you need to delete a person, please :doc:`contact the Oxford Talks Administration <../general/contact>`.
diff --git a/docs/source/user/talk-editors/publicizing-your-talk.rst b/docs/source/user/talk-editors/publicizing-your-talk.rst
@@ -1,3 +1,6 @@
+
+
+
 Publicising your talk
 =====================
 
@@ -70,6 +73,8 @@ Keywords in the talk abstract will be used for searching, so please add the abst
 Public lists
 ------------
 
+.. Note:: |upcoming|
+
 As well as topic and department listings, there may be some more *ad hoc* listings you would like your talk to be included in.  You can set up a Public List to collect together talks relevant to a particular theme, enterprise or project within the University - Athena Swan is a good example. 
 
 * Follow the instructions in the User Guide - :doc:`Collect talks you are interested in <../talk-users/make-a-list>` - to create and publish a list

diff --git a/docs/source/user/talk-editors/share-editing.rst b/docs/source/user/talk-editors/share-editing.rst
@@ -1,3 +1,6 @@
+
+
+
 Sharing editing
 ===============
 
@@ -29,6 +32,8 @@ You can adjust this in the **Other Editors** field of the individual talk.
 Lists
 -----
 
+.. Note:: |upcoming|
+
 Once you have signed an editor up to your list they will see it on their **Manage Lists** page and will find the list available in the dropdown box on each talk and series page.
 
 .. image:: images/share-editing/lists.png

diff --git a/docs/source/user/talk-editors/shared-public-lists.rst b/docs/source/user/talk-editors/shared-public-lists.rst
diff --git a/docs/source/user/talk-users/add-to-your-calendar.rst b/docs/source/user/talk-users/add-to-your-calendar.rst
@@ -1,3 +1,6 @@
+.. Note:: |upcoming| 
+
+
 Copy talks to your own calendar
 ===============================
 
@@ -18,7 +21,7 @@ Find the Add to Calendar link
 * For a single talk, click on the **calendar icon** next to any talk
 
 .. image:: images/add-to-your-calendar/306f6c30-18aa-46b9-b32c-a4a1703b6d55.png
-   :alt: 
+   :alt:
    :height: 195px
    :width: 614px
    :align: center
@@ -42,7 +45,7 @@ Using Internet Explorer and Outlook (PC)
 * Click **Open**
 
 .. image:: images/add-to-your-calendar/a76b304c-99bd-41f3-a3a6-8e8196a54840.png
-   :alt: 
+   :alt:
    :height: 379px
    :width: 600px
    :align: center
@@ -66,7 +69,7 @@ Using Safari and Calendar (Mac)
 * If you choose to add the talk to your Nexus calendar, you may get this message
 
 .. image:: images/add-to-your-calendar/dbfadfa7-5d03-4c94-b499-59a1d773259c.png
-   :alt: 
+   :alt:
    :height: 290px
    :width: 567px
    :align: center
@@ -91,7 +94,7 @@ Using Chrome and Google Calendar
 * In Google Calendar, choose **Import calendar** from the options for **Other calendars**
 
 .. image:: images/add-to-your-calendar/09b5c8b5-2f97-4050-99c4-93004870fab0.png
-   :alt: 
+   :alt:
    :height: 378px
    :width: 614px
    :align: center
@@ -102,7 +105,7 @@ Using Chrome and Google Calendar
 #. Click import to add your talk(s) to your chosen calendar
 
 .. image:: images/add-to-your-calendar/b36986a4-a369-4e8b-a1a7-0f065b34c676.png
-   :alt: 
+   :alt:
    :height: 328px
    :width: 588px
    :align: center
@@ -114,4 +117,4 @@ Further Information
 There are also guides on how to:
 
 * :doc:`Subscribe to a continuously updated feed of events <feed-in-your-calendar>`
-* :doc:`Set up reminders in your calendar <email-reminders>`
+* :doc:`Set up reminders in your calendar <email-reminders>`
diff --git a/docs/source/user/talk-users/browse.rst b/docs/source/user/talk-users/browse.rst
diff --git a/docs/source/user/talk-users/email-reminders.rst b/docs/source/user/talk-users/email-reminders.rst
@@ -1,3 +1,6 @@
+.. Note:: |upcoming| 
+
+
 Set up email reminders
 ======================
 

diff --git a/docs/source/user/talk-users/explore-talks.rst b/docs/source/user/talk-users/explore-talks.rst
@@ -1,3 +1,6 @@
+.. Note:: |upcoming| 
+
+
 Explore Oxford Talks
 ====================
 
@@ -49,10 +52,10 @@ To see all upcoming talks happening in your department
 Find a seminar series
 ---------------------
 
-If you are interested in a particular seminar series, or meetings of a society: 
+If you are interested in a particular seminar series, or meetings of a society:
 
 * Use the **Series** box in the filter panel if you know the name of the series you are interested in
-* Alternatively, browse the full list of series from the **View all** panel 
+* Alternatively, browse the full list of series from the **View all** panel
 
 .. image:: images/explore-talks/find-a-seminar-series.png
    :alt: Find a seminar series
@@ -79,14 +82,14 @@ It's also possible to find talks on a on a particular topic - you don't need to
 
 **Topics**
 
-Talks Editors are also beginning to tag talks with a huge range of topics (based on the Library of Congress subject headings). Ways to browse talks by topic will be delivered in the next phases of development. 
+Talks Editors are also beginning to tag talks with a huge range of topics (based on the Library of Congress subject headings). Ways to browse talks by topic will be delivered in the next phases of development.
 
 Meanwhile:
 
 * To find talks in a particular subject area use the **Search** box to type your search term
 
 .. image:: images/explore-talks/1eeac054-56b9-461b-81e7-a0299f31b32b.png
-   :alt: 
+   :alt:
    :height: 339px
    :width: 552px
    :align: center
@@ -95,14 +98,14 @@ Meanwhile:
 * All the topics assigned to a talk or series are clickable, so you can explore a topic further from an individual talk
 
 .. image:: images/explore-talks/204ed603-33b8-48b4-9ff3-c84675a70818.png
-   :alt: 
+   :alt:
    :height: 501px
    :width: 487px
    :align: center
 
 
 .. image:: images/explore-talks/88fe1021-88ef-4e74-8082-b0fa4e6684bd.png
-   :alt: 
+   :alt:
    :height: 286px
    :width: 548px
    :align: center
@@ -116,4 +119,3 @@ There are further guides on:
 * :doc:`Making your own collected list of talks <make-a-list>`
 * :doc:`Copying talks to your calendar <add-to-your-calendar>`
 * :doc:`Getting a feed of talks into your calendar <feed-in-your-calendar>`
-
diff --git a/docs/source/user/talk-users/feed-in-your-calendar.rst b/docs/source/user/talk-users/feed-in-your-calendar.rst
@@ -1,3 +1,6 @@
+.. Note:: |upcoming| 
+
+
 Get an up-to-date feed in your own calendar
 ===========================================
 
@@ -9,7 +12,7 @@ Get the feed URL
 ----------------
 
 * Find the series you would like to subscribe to
-* Right click on the **add to your calendar** button to copy the feed to URL to your clipboard (the **Copy Shortcut** or **Copy Link Address** option) 
+* Right click on the **add to your calendar** button to copy the feed to URL to your clipboard (the **Copy Shortcut** or **Copy Link Address** option)
 
 .. image:: images/feed-in-your-calendar/get-the-feed-url.png
    :alt: Get the feed URL
@@ -32,21 +35,21 @@ Outlook
    :align: center
 
 
-* Paste the URL into the **New Internet Calendar Subscription** box 
+* Paste the URL into the **New Internet Calendar Subscription** box
 * Click **OK**
 
 .. image:: images/feed-in-your-calendar/259b158e-511c-4d98-a0d9-aa04f7f2a2bc.png
-   :alt: 
+   :alt:
    :height: 206px
    :width: 440px
    :align: center
 
 
-* The calendar takes the last part of the web address as its name (for example: aed697e6-1a92-473d-a686-f77487689e0b.ics) 
+* The calendar takes the last part of the web address as its name (for example: aed697e6-1a92-473d-a686-f77487689e0b.ics)
 * To change the name click **Advanced ...**
 
 .. image:: images/feed-in-your-calendar/05c12bfe-f11a-4fed-ac29-69a32b196c1b.png
-   :alt: 
+   :alt:
    :height: 245px
    :width: 452px
    :align: center
@@ -56,7 +59,7 @@ Outlook
 #. Click **OK**
 
 .. image:: images/feed-in-your-calendar/2ff94965-ef90-4a28-9727-4fc7c5c024d1.png
-   :alt: 
+   :alt:
    :height: 387px
    :width: 600px
    :align: center
@@ -66,7 +69,7 @@ Outlook
 * The calendar will open as a new calendar in Outlook
 
 .. image:: images/feed-in-your-calendar/bace9430-3270-44c4-b3e5-fb1f5b5422f5.png
-   :alt: 
+   :alt:
    :height: 227px
    :width: 425px
    :align: center
@@ -91,7 +94,7 @@ Calendar (Mac)
 * Click **Subscribe**
 
 .. image:: images/feed-in-your-calendar/6c7df1e8-27fb-43f8-977a-bb481c49e3ca.png
-   :alt: 
+   :alt:
    :height: 194px
    :width: 594px
    :align: center
@@ -106,7 +109,7 @@ You will be asked to confirm the settings:
 
 
 .. image:: images/feed-in-your-calendar/18e90ec9-3a2d-4f0a-b12a-6c55535cc4cf.png
-   :alt: 
+   :alt:
    :height: 371px
    :width: 586px
    :align: center
@@ -116,7 +119,7 @@ You will be asked to confirm the settings:
 * The little wireless symbol reminds you that it is a subscription to a calendar feed
 
 .. image:: images/feed-in-your-calendar/7a0d4fa3-d429-4a44-a059-b61a512c7e74.png
-   :alt: 
+   :alt:
    :height: 239px
    :width: 362px
    :align: center
@@ -136,11 +139,11 @@ Google Calendar
    :align: center
 
 
-* Paste the feed URL into the **URL** box 
+* Paste the feed URL into the **URL** box
 * Click **Add Calendar**
 
 .. image:: images/feed-in-your-calendar/654d4252-95f3-4336-b485-b3266858bed5.png
-   :alt: 
+   :alt:
    :height: 272px
    :width: 593px
    :align: center
@@ -150,7 +153,7 @@ Google Calendar
 #. Click the calendar's drop-down list and select **Calendar settings** to change the name of the calendar to something more readable
 
 .. image:: images/feed-in-your-calendar/d1a25472-216a-4056-bf0d-c2c1fac769cd.png
-   :alt: 
+   :alt:
    :height: 318px
    :width: 517px
    :align: center
@@ -159,4 +162,4 @@ Google Calendar
 Further Information
 -------------------
 
-If you are using Google Calendar, look at the :doc:`Get email reminders <email-reminders>` section to see how to set these up.
+If you are using Google Calendar, look at the :doc:`Get email reminders <email-reminders>` section to see how to set these up.