Skip to content

Commit

Permalink
Updating General Section and Index
Browse files Browse the repository at this point in the history
  • Loading branch information
envycontent committed May 23, 2016
1 parent d6a57b9 commit b8df871
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 62 deletions.
13 changes: 6 additions & 7 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
Oxford Talks
############

.. Note:: Some new features have just been released!
.. Note:: Some small changes have been made in the latest release of the software!

.. toctree::
:maxdepth: 1
:caption: User Guide

Explore Oxford Talks (new) <user/talk-users/explore-talks>
Collect talks you are interested in (new) <user/talk-users/make-a-list>
Copy talks to your own calendar (new) <user/talk-users/add-to-your-calendar>
Get an up-to-date feed in your calendar (new) <user/talk-users/feed-in-your-calendar>
Set up email reminders (new) <user/talk-users/email-reminders>
Explore Oxford Talks <user/talk-users/explore-talks>
Collect talks you are interested in <user/talk-users/make-a-list>
Copy talks to your own calendar <user/talk-users/add-to-your-calendar>
Get an up-to-date feed in your calendar <user/talk-users/feed-in-your-calendar>
Set up email reminders <user/talk-users/email-reminders>

.. toctree::
:maxdepth: 1
Expand All @@ -27,7 +27,6 @@ Oxford Talks
user/general/log-in
user/general/terms
user/general/organisers
user/general/differences

.. toctree::
:maxdepth: 1
Expand Down
48 changes: 0 additions & 48 deletions docs/source/user/general/differences.rst

This file was deleted.

18 changes: 11 additions & 7 deletions docs/source/user/general/terms.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.. Note:: |upcoming|

Glossary of Terms used by Oxford Talks
======================================

Expand All @@ -8,20 +6,26 @@ 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
----
Collection (List)
-----------------

A Collection comprises talks owned and organized by other people, already added to Oxford Talks, and usually belonging to a variety of different series. For example, a collection of 'Talks about Science and Art' could include talks from the Department of Chemistry and the Department of History.

Note that it might not always be necessary to make a manual collection - talks can be assigned to the two categories below (Organising Department and Topic) allowing us to create automatic listings. You can also add an entire series or a department to a collection, if you do this then all talks belonging to that series or department will appear in the collection automatically.

Anyone with a University Single Sign On username and password can compile a Collection.

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.
In an earlier version of the software Collections were called Lists.

Organizing Department
Organising 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.
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 Collection.

Talks Organiser
---------------
Expand Down

0 comments on commit b8df871

Please sign in to comment.