Skip to content

Commit 673c34f

Browse files
committed
2 parents 590f866 + e4aefd6 commit 673c34f

11 files changed

Lines changed: 39 additions & 12 deletions

File tree

content/api_en/include/String.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ println(quoted); // This one has "quotes"
4444
</example>
4545

4646
<description><![CDATA[
47-
A string is a sequence of characters. The class <b>String</b> includes methods for examining individual characters, comparing strings, searching strings, extracting parts of strings, and for converting an entire string uppercase and lowercase. Strings are always defined inside double quotes ("Abc"), and characters are always defined inside single quotes ('A').<br/>
47+
A string is a sequence of characters. The class <b>String</b> includes methods for examining individual characters, comparing strings, searching strings, extracting parts of strings, and for converting an entire string uppercase and lowercase. Strings are always defined inside double quotes (<b>"Abc"</b>), and characters are always defined inside single quotes (<b>'A'</b>).<br/>
4848
<br/>
49-
To compare the contents of two Strings, use the <b>equals()</b> method, as in "if (a.equals(b))", instead of "if (a == b)". A String is an Object, so comparing them with the == operator only compares whether both Strings are stored in the same memory location. Using the <b>equals()</b> method will ensure that the actual contents are compared. (The <a href="http://wiki.processing.org/w/Troubleshooting#Why_don.27t_these_Strings_equal.3F">troubleshooting</a> reference has a longer explanation.)<br />
49+
To compare the contents of two Strings, use the <b>equals()</b> method, as in <b>if (a.equals(b))</b>, instead of <b>if (a == b)</b>. A String is an Object, so comparing them with the <b>==</b> operator only compares whether both Strings are stored in the same memory location. Using the <b>equals()</b> method will ensure that the actual contents are compared. (The <a href="http://wiki.processing.org/w/Troubleshooting#Why_don.27t_these_Strings_equal.3F">troubleshooting</a> reference has a longer explanation.)<br />
5050
<br />
51-
Because a String is defined between quotation marks, to include such marks within the String itself you must use the &#92; (backslash) character. (See the third example above.) This is known as an <em>escape sequence</em>. Other escape sequences include &#92;t for the tab character and &#92;n for new line. Because backslash is the escape character, to include a single backslash within a String, you must use two consecutive backslashes, as in: &#92;&#92;<br/>
51+
Because a String is defined between double quotation marks, to include such marks within the String itself you must use the <b>&#92;</b> (backslash) character. (See the third example above.) This is known as an <em>escape sequence</em>. Other escape sequences include <b>&#92;t</b> for the tab character and <b>&#92;n</b> for new line. Because backslash is the escape character, to include a single backslash within a String, you must use two consecutive backslashes, as in: <b>&#92;&#92;</b><br/>
5252
<br/>
53-
There are more string methods than those linked from this page. Additional documentation is located online in the <a href="http://download.oracle.com/javase/6/docs/api/java/lang/String.html">official Java documentation.</a>.
53+
There are more string methods than those linked from this page. Additional documentation is located online in the <a href="http://download.oracle.com/javase/6/docs/api/java/lang/String.html">official Java documentation</a>.
5454
]]></description>
5555

5656
<syntax></syntax>
@@ -67,7 +67,7 @@ There are more string methods than those linked from this page. Additional docum
6767

6868
<method>
6969
<mname>indexOf()</mname>
70-
<mdescription>Returns the index value of the first occurance of a character within the input string</mdescription>
70+
<mdescription>Returns the index value of the first occurrence of a substring within the input string</mdescription>
7171
</method>
7272

7373
<method>

content/api_en/include/String_indexOf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ println(p1 + ":" + p2 + ":" + p3); // Prints "0:3:2"
2121
</example>
2222

2323
<description><![CDATA[
24-
Tests to see if a substring is embedded in a string and returns the index position of the first occurance of the substring defined in the <b>str</b> parameter. If the <b>str</b> parameter is not found in the string, -1 is returned.
24+
Tests to see if a substring is embedded in a String, and returns the index position of the first occurrence of the substring defined in the <b>str</b> parameter. If the <b>str</b> substring is not found within the String, <b>-1</b> is returned.
2525
]]></description>
2626

2727
<syntax>

content/api_en/randomGaussian.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<example>
1212
<image>randomGaussian_0.png</image>
1313
<code><![CDATA[
14-
for (int y = 0; y < 100; i++) {
14+
for (int y = 0; y < 100; y++) {
1515
float x = randomGaussian() * 15;
1616
line(50, y, 50 + x, y);
1717
}
28.6 KB
Loading
155 KB
Loading
28.8 KB
Loading
186 KB
Loading
176 KB
Loading

content/static/shop/index.html

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,38 @@
33

44
<tr>
55
<td width="625" valign="top">
6-
<h1 class="large-header"><span class="black">Shop.</span> A percentage of sales supports future Processing Development.</h1>
6+
<h1 class="large-header"><span class="black">T-Shirts.</span> 100% of the profits from these shirts fund the Processing Foundation.</h1>
7+
To commemorate the release of Processing 2, <a href="http://wireandtwine.com/processing/">these new tees</a> are available for pre-order
8+
until October 1, 2013. Every shirt is handprinted on American Apparel 100% cotton shirts. Orders begin shipping the second week of October.
9+
Some shirts will remain available, but to make sure you get the size and style you want, order before 1 October. The shirts are printed and distributed
10+
through our partner WIRE &amp; TWINE. Thanks to Kyle McDonald for the short piece of code, to Douglas Repetto for permission to mangle the Dorkbot tagline,
11+
and the Readme festival for the original "strange things" software shirt.<br />
12+
<br />
13+
<a href="http://wireandtwine.com/processing/">More information and order from WIRE &amp; TWINE.</a><br />
14+
<br />
15+
<a href="http://wireandtwine.com/processing/"><img src="/shop/imgs/tshirts2013.jpg" width="625" height="430" /></a>
16+
<a href="http://wireandtwine.com/processing/"><img src="/shop/imgs/tshirts2013-code.jpg" width="625" height="430" /></a>
17+
<a href="http://wireandtwine.com/processing/"><img src="/shop/imgs/tshirts2013-strange.jpg" width="625" height="430" /></a>
718

8-
If you're interested in buying a book about Processing, please consider buying
9-
it here. A percentage of the sales supports future Processing Development.
10-
There's more information about each book on the <a href="../books/">Books page</a>.<br />
19+
<br />
1120
</td>
1221
</tr>
1322
</table>
1423

1524
<br />
1625

1726
<table width="656" border="0">
27+
<tr>
28+
<td width="625" valign="top">
29+
<h1 class="large-header"><span class="black">Books.</span> If you're interested in buying a book about Processing, please consider buying
30+
it here. A percentage of the sales supports future Processing Development. There's more information about each book <a href="/books/">on the Books page</a>.<br />
31+
</td>
32+
</tr>
33+
</table>
34+
35+
<br />
1836

37+
<table width="656" border="0">
1938
<tr>
2039
<td width="300" valign="top">
2140
<table width="300">

download/_downloads.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<p>Earlier releases have been removed because we can only support the current versions of the software. To update old code, read the <a href="http://wiki.processing.org/w/Changes">changes</a> page. Per-release changes can be found in <a href="https://raw.github.com/processing/processing/master/build/shared/revisions.txt">revisions.txt</a>. If you have problems with the current release, please <a href="https://github.com/processing/processing/issues?state=open">file a bug</a> so that we can fix it. Older releases can also be <a href="https://github.com/processing/processing">built from the source</a>. <a href="http://wiki.processing.org/w/FAQ#What.27s_with_the_version_numbers.3F">Read More</a> about the releases and their numbering. Note that <a href="http://wiki.processing.org/w/Android">Android mode</a> no longer works in Processing 1.5, you'll need to use a 2.0 release to do Android development.</p>
9292
</div>
9393

94-
<!-- Pre Releases -->
94+
<!--
9595
<div class="releases">
9696
<h3>Pre-Releases</h3>
9797
<ul>
@@ -125,6 +125,7 @@
125125
</ul>
126126
<p>The 2.0 pre-releases contain significant changes, be sure to <a href="http://wiki.processing.org/w/Changes">read about them</a>. </p>
127127
</div>
128+
-->
128129

129130
<!-- Disclaimer -->
130131
<div class="disclaimer">

0 commit comments

Comments
 (0)