Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
vlazzarini committed Oct 26, 2016
2 parents 273a39e + 95b6974 commit 3e99a3b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion manual.xml
Expand Up @@ -32,7 +32,7 @@
<!ENTITY oviewrealtimelinux SYSTEM "overview/realtimelinux.xml">
<!ENTITY oviewrealtimewindows SYSTEM "overview/realtimewindows.xml">
<!ENTITY oviewrealtimemac SYSTEM "overview/realtimemac.xml">
<!ENTITY oviewrealtimemac SYSTEM "overview/realtimejack.xml">
<!ENTITY oviewrealtimejack SYSTEM "overview/realtimejack.xml">
<!ENTITY oviewoptimizinglatency SYSTEM "overview/optimizinglatency.xml">
<!ENTITY oviewfunctional SYSTEM "overview/functional.xml">

Expand Down
5 changes: 4 additions & 1 deletion overview/realtimejack.xml
Expand Up @@ -112,4 +112,7 @@ csound6:output2 (playback right)</screen>
followed by the jack port name is used. The options
-+jack_midi_inportname= and -+jack_midi_outportname= can be
used to rename Csound's MIDI IO ports.
</para>
</para>

</section>

3 changes: 1 addition & 2 deletions score/statemnt.xml
Expand Up @@ -62,8 +62,7 @@

<para>
Comments are denoted by semicolon (;), double slash (//) or the
character c and last ntil a newline. Also C-style comments /*
character c and last until a newline. Also C-style comments /*
... */ are allowed.
</para>

</section>
4 changes: 2 additions & 2 deletions scoregens/C.xml
Expand Up @@ -15,7 +15,7 @@
<refsect1>
<title>Description</title>
<para>
This statement switches automaticcarrying of missing arguments on or off.
This statement switches automatic carrying of missing arguments on or off.
</para>
</refsect1>

Expand All @@ -27,7 +27,7 @@
<refsect1>
<title>Performance</title>
<para>
<emphasis>p1</emphasis> -- Specifies weter to switch off (value
<emphasis>p1</emphasis> -- Specifies wether to switch off (value
0) or on (non-zero).
</para>

Expand Down
2 changes: 1 addition & 1 deletion scoregens/top.xml
Expand Up @@ -15,7 +15,7 @@
</para></listitem>
<listitem><para>
<link linkend="C"><citetitle>C</citetitle></link> - Control
automaiccarry of p-args
automatic carry of p-args
</para></listitem>
<listitem><para>
<link linkend="e"><citetitle>e</citetitle></link> - Marks the end of the last section of the score
Expand Down

0 comments on commit 3e99a3b

Please sign in to comment.