tidying up and rewriting general section

docs/source/index.rst

@@ -21,11 +21,11 @@ Oxford Talks
     :maxdepth: 1
     :caption: General Information
 
+    user/general/contact
     user/general/log-in
     user/general/terms
     user/general/organisers
     user/general/differences
-    user/general/contact
 
 .. toctree::
     :maxdepth: 1

docs/source/user/general/differences.rst

@@ -1,56 +1,46 @@
-Migrating between the Old Oxford Talks and the New
-===================================================
+Moving from the Old Oxford Talks to the New
+===========================================
 
-Oxford Talks is about to be updated with its first phase - the editing interface, currently called New Talks.
+Phase 1 of Oxford Talks  - the editing interface, currently called New Talks - has been running for two terms. Phase 2 will be released in the next few weeks and will provide ways to browse and find talks, make collections of talks of interest to you, and add talks information to your own calendar.
+
+This will mean that we will no longer need the Old Oxford Talks, and, in due course, it will be retired. When this happens http://new.talks.ox.ac.uk will take over the http://talks.ox.ac.uk web address.
 
 Series and Lists
 ----------------
 
-In Old Talks everything is a list.
-
-In New Talks we make a distinction between: 
+In New Talks we have:
 
 * **series** which is where a talk 'belongs' when you create it - for instance a seminar series or a conference - things you organise yourself, like your Departmental Friday Seminars, or regular Club meetings.
-* **list** which is a collection of talks owned and organised by other people (e.g. All the Talks in a Department or Interesting Talks about Goldfish)
-
-Editing Interface
------------------
-
-* **series** of talks will now be created and edited in the new editing interface - New Talks (http://new.talks.ox.ac.uk).
+* **list** which is a collection of talks owned and organised by other people (e.g. Talks about Science and Art)
 
-* **lists** of talks should still be pulled together in the Old Talks website (http://talks.ox.ac.uk).
+You have to compile lists manually and log in occasionally to keep them up-to-date. However, new talks aims to reduce that workload with a couple of automatic listings - Departments and Topics. Provided talks are tagged with a topic and an organizing department, they should appear in these listings automatically.
 
-.. Note:: You will need to :doc:`apply to be a Talks Editor <sign-up>` to use the new editing interface.
-
-Updating Series and Talks
+My Personal List of Talks
 -------------------------
 
-All upcoming series and talks have been migrated to the New Talks editing interface (http://new.talks.ox.ac.uk) so that you can edit them there.
-
-If you change something in New Talks it should get pushed to the Old Talks website (http://talks.ox.ac.uk). 
+It should now be easy to re-create this list in the new system.
 
-.. Note:: This only works one way. If you change something on the old Talks website it won't get pushed to the new interface.
+Unfortunately, email reminders are not available in this phase, but you will be able to copy or feed lists of talks into your own personal calendar.
 
-Series that didn't get migrated over
-------------------------------------
+Talks Editors
+-------------
 
-If a series didn't have any upcoming talks we didn't migrate it. 
+As well as series of talks, you can now make lists of existing talks.
 
-If the series is still current you can:
+You should be able to see your talks by department and topic as well, so you may find that you don't need to maintain as many lists (for example:- if you currently maintain a collected list of all seminar series in your department, you probably won't need to do this any longer, you can use the inbuilt filter by department instead)
 
-1. Either - create a brand new series in New Talks - this will appear on the Old Talks website
-2. Or - ask us to migrate the old series - just :doc:`contact us <contact>` with the Old Oxford Talks web address of the series
+.. Note:: You will need to :doc:`apply to be a Talks Editor <../talk-editors/sign-up>` to use the new editing interface.
 
-.. Note:: The second option will keep that series connected to any other collected lists in Old Talks, with the first option you will have to add your new series to any collected lists and retire your old series
+Embedding in Websites
+---------------------
 
-I can't see my List in the New Talks!
--------------------------------------
+Once we retire the old Oxford Talks, the templates you use to embed talks on your own website will no longer work.
 
-Is it a collected list? If so it won't appear in the New Talks editing interface as, for the moment, we are still using the Old Talks website to make collections, set up reminders etc.
+Do, therefore, look at the new :doc:`Oxford Talks API <../../http_api/summary>` and the example :ref:`Talks Widget <widget:widget-index>` as alternative options. The API is already in use in a number of departments. Please contact us for advice if you are stuck.
 
-Is it a seminar series or conference or similar? Get :doc:`in touch with us <contact>` and we'll ensure that you get a series set up and that it pushes to the corresponding series on the Old Talks website if that is what you want.
+Sending out Email Digests
+-------------------------
 
-I've changed something on the Old Talks site but I don't see it on New Talks!
------------------------------------------------------------------------------
+You can get a plain text version of individual talks, series, department listings, topic listings and collected lists to cut and paste into an email or Word document.
 
-This is correct. If you want to edit or add, please do that in the New Talks editing interface and allow New Talks to push the information to the Old Talks website. 
+At present, you won't be able to define a date range for the listing, so there may be a bit of deletion to do.

docs/source/user/general/terms.rst

@@ -1,3 +1,32 @@
-****************
-Series and Lists
-****************
+Glossary of Terms used by Oxford Talks
+======================================
+
+Series
+------
+
+A Series is where a talk 'belongs' when you create it - for instance it may be part of a seminar series or a conference. We recommend that you only enter details about talks you organize yourself, like your Departmental Friday Seminars, or your Club meetings. You have to  :doc:`be a Talks Editor <../talk-editors/sign-up>` to be able to create a Series.
+
+List
+----
+
+A List is a collection of talks owned and organized by other people, already added to Oxford Talks, and usually belonging to a variety of different series. For example, a list of 'Talks about Science and Art' could include talks from the Department of Chemistry and the Department of History. Note that, although it is possible to collect talks into a List, it might not always be necessary to do this manually - talks can be assigned to the two categories below (Organizing Department and Topic) allowing us to create automatic listings. Anyone with a University Single Sign On username and password can compile a List.
+
+Organizing Department
+---------------------
+
+Many talks and series of talks are organized by a University department or unit. When a talk is added, it can be tagged with the department (or sub-unit within that department). This makes it simple to pull out all a department's (or even a Division's) talks.
+
+Topic
+-----
+
+Although talks may be organized by a single department, they are often relevant to students and researchers in other departments right across the University. Tagging by Topic means that lists of talks on various subject areas can be pulled out automatically. We have used the Library of Congress Subject Headings for our topic choices, which means that the options for potential listings by topic are quite substantial - but if none of the available topics quite fits the bill, there is always the option to create a List.
+
+Talks Organiser
+---------------
+
+A Talks Organiser is the main point of contact for a talk or a series of talks. They are usually involved in setting up speakers, booking rooms and doing all the juggling involved in the day to day administration of seminars and lectures.
+
+Talks Editor
+------------
+
+A Talks Editor is someone who has been given the rights to add and edit talks, and series of talks in Oxford Talks. You have to :doc:`apply to be a Talks Editor <../talk-editors/sign-up>` (a relatively simple process). A Talks Editor is sometimes the same as the Talks Organiser - but not always.