Merge https://github.com/SynBioDex/SBOL-specification

SynBioDex · Apr 29, 2016 · dd1083b · dd1083b
2 parents 63a6582 + 185a7cb
commit dd1083b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/apdx-validation.tex b/apdx-validation.tex
@@ -14,6 +14,7 @@ \section{Validation Rules}
 are consistency rules that SBOL data are RECOMMENDED to adhere to as a best practice.  To help highlight these differences, we use the
 following symbols next to the rule numbers:
 
+
 \twozeroone{
 \begin{description}
 \item[\hspace*{6.5pt}\vSymbol\vsp] A \vSymbolName indicates a strong

diff --git a/model.tex b/model.tex
@@ -428,6 +428,7 @@ \subsubsection*{The \sbolheading{sequenceConstraints} property}
 \subsubsection*{Serialization}
 The serialization of a \sbol{ComponentDefinition} MUST have the form below. 
 The \sbol{components},  \sbol{sequenceConstraints},  \sbol{sequenceAnnotations}, and \sbol{sequences} properties of a \sbol{ComponentDefinition} contain or reference objects belonging to the appropriate SBOL classes as their values, while the \sbolmult{types:CD}{types} and \sbolmult{roles:CD}{roles} properties contain \sbol{URI}s that identify ontology terms as their values. 
+
 As shown below, each of these objects and \sbol{URI}s are serialized as part of an implicit set of SBOL properties with singular rather then plural names. 
 In particular, each object is serialized as an RDF/XML node nested within a property, while each \sbol{URI} (except the \sbol{identity}) is serialized as an \external{rdf:resource} on a property.
 

diff --git a/practices.tex b/practices.tex
@@ -111,4 +111,3 @@ \subsection{Recommended Ontologies for External Terms}
   ...
 </rdf:RDF>
 \end{lstlisting}
-
diff --git a/sbol2.tex b/sbol2.tex
@@ -1,3 +1,4 @@
+
 \documentclass[finalspec]{sbmlpkgspec}
 %% \documentclass[draftspec]{sbmlpkgspec}
 \usepackage{microtype}
@@ -334,4 +335,4 @@ \section{...}
 % * <[email protected]> 2015-06-03T17:34:31.200Z:
 %
 % 
-%
+%
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,3 @@ \subsection{Recommended Ontologies for External Terms}
		...
		</rdf:RDF>
		\end{lstlisting}