Merge pull request #53 from schemaorg/master

Syncing with schema.org

RELEASING.TXT

@@ -55,7 +55,7 @@ Of these,
    when served locally via "dev_appserver ."
    For now, you need to edit this html to remove webschemas.org from heading section.
 
-  * To create .nt, .nq, etc files use scripts/buildreleasefiles.sh   
+  * To create .nt, .nq, etc files use scripts/buildreleasefiles.sh
 
   * README.md should be copied/updated accordingly.  TODO: simplify this file.
 
@@ -143,30 +143,7 @@ final round of sanity-check tests is useful:
 * Run again 'git status', confirm no uncommited files or changes.
 * Run again: './scripts/updateAppEngine.sh' for development/upstream site sync.
 
-3.) Merge release branch into master
-
-3a.) Get changes into master branch on github
-
-Use GitHub Web UI to create a pull request. For example to merge the
-release branch sdo-phobos into master, we set the base branch 'master' and
-compare 'sdo-phobos'. If you get this backwards you should see nothing to do,
-because there ought to be no changes in master that we lack in the later
-sdo-phobos branch.
-
-Note also that if someone else has already (e.g. mistakenly) filed a pull request
-between the same pair of branches, Github will try to recycle that one (including
-their description) instead of give you a new one with proper name, description.
-Workaround is to close that PR (keeping track of any open issue it raises).
-
-Result should be "danbri  wants to merge 205 commits into master from sdo-phobos"
-or similar. Check the Commits and Files changed tabs. If it looks plausible
-(e.g. Showing  55 changed files  with 79,679 additions and 820 deletions.) we
-can proceed with merging.
-
-3b) Get merged changes back into your working colorOpacity
-
-I do 'git checkout master'; 'git pull --all'. You may know of other
-incantations. See also http://xkcd.com/1597/
+3.) Previously: "Merge release branch into master"; now we develop in "master."
 
 4.) Publish from a clean checkout of 'master' branch to schema.org.
 
@@ -175,10 +152,13 @@ or by passing the name of the live appengine ID on the commandline. Currently
 @rvguha (as Steering Group chair) and @danbri (as Community Group chair and
 webmaster / dogsbody) have write access to the corresponding appengine account.
 
- * e.g. run: appcfg.py update . -A schemaorgae
- * inspect console output for something like:
-  * 03:35 PM Completed update of app: schemaorgae, version: 1
- * Count to ten. Check http://schema.org/ and the 'releases' link.
+ * e.g. update schemaorg.yaml then:  appcfg.py update schemaorg.yaml -A schemaorgae
+ * Count to thirty. Log into appengine and you should see a new version.
+ * Send 5% of traffic to this version to catch any errors, then move to 100%.
+
+Note that appengine versions are visible using URLs with this pattern:
+
+http://3-3.schemaorgae.appspot.com/docs/releases.html
 
 5.) Related post-release tasks.
 

data/ext/pending/issue-1156.rdfa

@@ -374,6 +374,7 @@
 <!-- ***** Source Organization ***** -->
 
 <div typeof="http://schema.org/Organization" resource="http://publications.europa.eu/mdr/eli/index.html">
+  <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
   <span property="rdfs:label">ELI</span>
   <span property="rdfs:comment">This entry is derived from the [ELI ontology](http://publications.europa.eu/mdr/eli/index.html) (European Legislation Identifier). ELI is an initiative of some national legislation publishers endorsed by EU countries and Institutions, to identify, describe and link legislation on the web, and is led by the [ELI taskforce](http://eur-lex.europa.eu/eli-register/about.html).</span>
 </div>

data/ext/pending/issue-1389.rdfa

@@ -18,6 +18,7 @@ For more sophisticated markup of speakable sections beyond simple ID references,
 we define a supporting type, [[SpeakableSpecification]]  which is defined to be a possible value of the *speakable* property.
     </span>
     <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/WebPage">WebPage</a></span>
+    <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Article">Article</a></span>
     <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/SpeakableSpecification">SpeakableSpecification</a></span>
     <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
     <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
@@ -36,19 +37,21 @@ we define a supporting type, [[SpeakableSpecification]]  which is defined to be
   <div typeof="rdf:Property" resource="http://schema.org/cssSelector">
     <span>Category: <span property="schema:category">issue-1389</span></span>
     <span class="h" property="rdfs:label">cssSelector</span>
-    <span property="rdfs:comment">A CSS selector.</span>
+    <span property="rdfs:comment">A CSS selector, e.g. of a [[SpeakableSpecification]] or [[WebPageElement]]. In the latter case, multiple matches within a page can constitute a single conceptual "Web page element".</span>
     <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/SpeakableSpecification">SpeakableSpecification</a></span>
-    <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Text">Text</a></span>
+    <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/WebPageElement">WebPageElement</a></span>
+    <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/CssSelectorType">CssSelectorType</a></span>
     <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
     <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1389">#1389</a></span>
   </div>
 
   <div typeof="rdf:Property" resource="http://schema.org/xpath">
     <span>Category: <span property="schema:category">issue-1389</span></span>
     <span class="h" property="rdfs:label">xpath</span>
-    <span property="rdfs:comment">An XPath.</span>
+    <span property="rdfs:comment">An XPath, e.g. of a [[SpeakableSpecification]] or [[WebPageElement]]. In the latter case, multiple matches within a page can constitute a single conceptual "Web page element".</span>
     <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/SpeakableSpecification">SpeakableSpecification</a></span>
-    <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Text">Text</a></span>
+    <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/WebPageElement">WebPageElement</a></span>
+    <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/XPathType">XPathType</a></span>
     <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
     <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1389">#1389</a></span>
   </div>

data/ext/pending/issue-1457-examples.txt

@@ -0,0 +1,140 @@
+TYPES: Event, Schedule, eventSchedule
+
+PRE-MARKUP:
+
+A Tai-Chi class runs throughout 2017. The class occurs weekly, every Wednesday at 7pm.
+
+MICRODATA:
+
+Example is JSON-LD only.
+
+RDFA:
+
+Example is JSON-LD only.
+
+JSON:
+
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org/",
+  "@type": "Event",
+  "url": "http://www.example.org/events/1",
+  "name": "Tai chi Class",
+  "description": "A weekly Tai-Chi class",
+  "duration": "PT60M",
+  "eventSchedule": {
+     "@type": "Schedule",
+     "startDate": "2017-01-01",
+     "endDate": "2017-12-31",
+     "repeatFrequency": "P1W",
+     "byDay": "http://schema.org/Wednesday",
+     "startTime": "19:00",
+     "endTime": "20:00"
+  }
+}
+</script>
+
+TYPES: Event, Schedule, eventSchedule
+
+PRE-MARKUP:
+
+A Meetup takes place on the 1st and 15th of every month between 9-10am
+
+MICRODATA:
+
+Example is JSON-LD only.
+
+RDFA:
+
+Example is JSON-LD only.
+
+JSON:
+
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org/",
+  "@type": "Event",
+  "name": "Example Meetup",
+  "eventSchedule": {
+     "@type": "Schedule",
+     "repeatFrequency": "P1M",
+     "byMonthDay": [1,15],
+     "startTime": "09:00",
+     "endTime": "10:00"
+  }
+}
+</script>
+
+TYPES: Event, Schedule, eventSchedule
+
+PRE-MARKUP:
+
+Starting from 2th December an Event will run daily between 9-10am for 10 occurences.
+
+MICRODATA:
+
+Example is JSON-LD only.
+
+RDFA:
+
+Example is JSON-LD only.
+
+JSON:
+
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "Event",
+  "name": "Count Example",
+  "eventSchedule":
+    {
+      "@type": "Schedule",
+      "startDate": "2016-12-24",
+      "repeatFrequency": "P1D",
+      "repeatCount": 10,
+      “startTime": "09:00",
+      “endTime": "10:00"
+    }
+}
+</script>
+
+TYPES: Event, Schedule, eventSchedule
+
+PRE-MARKUP:
+
+An Event runs twice a day, at 9am-10am and 2pm-3pm but only Monday to Friday
+
+MICRODATA:
+
+Example is JSON-LD only.
+
+RDFA:
+
+Example is JSON-LD only.
+
+JSON:
+
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "Event",
+  "name": "Example",
+  "eventSchedule":
+    [
+     {
+      "@type": "Schedule",
+      "repeatFrequency": "P1D",
+      "byDay": ["http://schema.org/Monday","http://schema.org/Tuesday","http://schema.org/Wednesday","http://schema.org/Thursday","http://schema.org/Friday"]
+      “startTime": "09:00",
+      “endTime": "10:00"
+     },
+     {
+      "@type": "Schedule",
+      "repeatFrequency": "P1D",
+      "byDay": ["http://schema.org/Monday","http://schema.org/Tuesday","http://schema.org/Wednesday","http://schema.org/Thursday","http://schema.org/Friday"]
+      "startTime": "14:00",
+      "endTime": "15:00"
+     }
+    ]
+}
+</script>

data/ext/pending/issue-1457.rdfa

@@ -0,0 +1,109 @@
+<div>
+<!--
+  Schema.org Recurring Events Proposal
+  Issue #1457, https://github.com/schemaorg/schemaorg/issues/1457
+
+  Defines a new type: Schedule which can be associated with an Event
+  A Schedule defines a recurring time period similar to an iCal rrule.
+
+-->
+
+<!-- Classes -->
+
+    <div typeof="rdfs:Class" resource="http://schema.org/Schedule">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">Schedule</span>
+      <span property="rdfs:comment">A schedule defines a repeating time period used to describe a regularly occurring [[Event]]. At a minimum a schedule will specify [[repeatFrequency]] which describes the interval between occurences of the event. Additional information can be provided to specify the schedule more precisely. 
+      This includes identifying the day(s) of the week or month when the recurring event will take place, in addition to its start and end time. Schedules may also
+      have start and end dates to indicate when they are active, e.g. to define a limited calendar of events.</span>
+      <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Intangible">Intangible</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+<!-- Properties -->
+
+
+    <div typeof="rdf:Property" resource="http://schema.org/repeatFrequency">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">repeatFrequency</span>
+      <span property="rdfs:comment">Defines the frequency at which [[Events]] will occur according to a schedule [[Schedule]]. The intervals between
+      events should be defined as a [[Duration]] of time.</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Duration">Duration</a></span>
+      <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Text">Text</a></span>
+      <link property="rdfs:subPropertyOf" href="http://health-lifesci.schema.org/frequency" />
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/repeatCount">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">repeatCount</span>
+      <span property="rdfs:comment">Defines the number of times a recurring [[Event]] will take place</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Integer">Integer</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/byDay">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">byDay</span>
+      <span property="rdfs:comment">Defines the day(s) of the week on which a recurring [[Event]] takes place</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/DayOfWeek">DayOfWeek</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/byMonth">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">byMonth</span>
+      <span property="rdfs:comment">Defines the month(s) of the year on which a recurring [[Event]] takes place. Specified as an [[Integer]] between 1-12. January is 1.</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Integer">Integer</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/byMonthDay">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">byMonthDay</span>
+      <span property="rdfs:comment">Defines the day(s) of the month on which a recurring [[Event]] takes place. Specified as an [[Integer]] between 1-31.</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Integer">Integer</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/exceptDate">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">exceptDate</span>
+      <span property="rdfs:comment">Defines a [[Date]] or [[DateTime]] during which a scheduled [[Event]] will not take place. The property allows exceptions to
+      a [[Schedule]] to be specified. If an exception is specified as a [[DateTime]] then only the event that would have started at that specific date and time
+      should be excluded from the schedule. If an exception is specified as a [[Date]] then any event that is scheduled for that 24 hour period should be
+      excluded from the schedule. This allows a whole day to be excluded from the schedule without having to itemise every scheduled event.</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Schedule</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Date">Date</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/DateTime">DateTime</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/eventSchedule">
+      <span>Category: <span property="schema:category">issue-1457</span></span>
+      <span class="h" property="rdfs:label">eventSchedule</span>
+      <span property="rdfs:comment">Associates an [[Event]] with a [[Schedule]]. There are circumstances where it is preferable to share a schedule for a series of
+      repeating events rather than data on the individual events themselves. For example, a website or application might prefer to publish a schedule for a weekly
+      gym class rather than provide data on every event. A schedule could be processed by applications to add forthcoming events to a calendar. An [[Event]] that
+      is associated with a [[Schedule]] using this property should not have [[startDate]] or [[endDate]] properties. These are instead defined within the associated
+      [[Schedule]], this avoids any ambiguity for clients using the data. The propery might have repeated values to specify different schedules, e.g. for different months
+      or seasons.</span>
+      <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/Schedule">Event</a></span>
+      <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Duration">Schedule</a></span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/1457">#1457</a></span>
+    </div>
+
+</div>