Skip to content

Commit 63ad89f

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2-16.10.2017
2 parents e7ad6b4 + deed233 commit 63ad89f

File tree

20 files changed

+91
-65
lines changed

20 files changed

+91
-65
lines changed

‎docs/contributing_to_docs.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,19 @@ website, without having to download any software or use the command line.
155155

156156
### Making your dictionary change
157157

158-
**Navigate to the file you want to modify in the [dictionary folder of the develop branch](https://github.com/livecode/livecode/blob/develop/docs/dictionary).**
158+
**Navigate to the file you want to modify in the [dictionary folder of the develop-8.2 branch](https://github.com/livecode/livecode/blob/develop-8.2/docs/dictionary).**
159159

160160
For example, the accept command is at:
161-
https://github.com/livecode/livecode/blob/develop/docs/dictionary/command/accept.lcdoc
161+
https://github.com/livecode/livecode/blob/develop-8.2/docs/dictionary/command/accept.lcdoc
162162

163163
Either go directly to the community docs branch URL
164-
(https://github.com/livecode/livecode/tree/develop) or if you are
165-
on the main LiveCode repository page, select 'develop' from the
164+
(https://github.com/livecode/livecode/tree/develop-8.2) or if you are
165+
on the main LiveCode repository page, select 'develop-8.2' from the
166166
branch dropdown menu:
167167

168168
![](images/branch-dropdown.png)
169169

170-
You should see that the develop branch is selected both in the
170+
You should see that the develop-8.2 branch is selected both in the
171171
label of the dropdown and the url of your browser.
172172

173173
![](images/develop-branch.png)
@@ -240,7 +240,7 @@ and description
240240

241241
>*Note:* Please ensure the pull request has the correct base branch and
242242
comparison branch. The base fork should be `livecode/livecode`, with
243-
base branch `develop`, and the head fork should be
243+
base branch `develop-8.2`, and the head fork should be
244244
`<your user name>/livecode` with compare branch something like `patch-1`
245245
(unless you have renamed it).
246246

@@ -408,7 +408,7 @@ Click commit to <branch>
408408

409409
Then click "Submit pull request"
410410

411-
Make sure the target branch is livecode/develop
411+
Make sure the target branch is livecode/develop-8.2
412412

413413
Check the pull request has appeared in
414414
https://github.com/livecode/livecode/pulls
@@ -437,13 +437,13 @@ make sure your name and email address are set up
437437

438438
`git config --global user.email "<your email address>"`
439439

440-
checkout the `develop` branch
440+
checkout the `develop-8.2` branch
441441

442-
`git checkout develop`
442+
`git checkout develop-8.2`
443443

444444
ensure it is up to date
445445

446-
`git pull upstream develop`
446+
`git pull upstream develop-8.2`
447447

448448
create a new branch for your docs changes, for example
449449

@@ -481,7 +481,7 @@ Navigate to your fork on the Git website, `https://github.com/<your user name>/l
481481
You should see a link to the recently pushed branch, and an invitation to submit a pull request.
482482
Click this.
483483

484-
Ensure the base fork is livecode/livecode, and the base is develop.
484+
Ensure the base fork is livecode/livecode, and the base is develop-8.2.
485485

486486
Click create pull request.
487487

‎docs/dictionary/command/mobileComposeHtmlMail.lcdoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ from disk when the file is needed. Therefore, using
8181
large amounts of data to an e-mail. For example, sending multiple
8282
attachments may be done like this:
8383

84-
put "Hello World!" into tAttachments[1]["data"]
85-
put "text/plain" into tAttachments[1]["type"]
86-
put "Greetings.txt" into tAttachments[1]["name"]
87-
put "Goodbye World!" into tAttachments[2]["data"]
88-
put "text/plain" into tAttachments[2]["type"]
89-
put "Farewell.txt" into tAttachments[2]["name"]
90-
<mobileComposeHtmlMail> tSubject, tTo, tCCs, tBCCs, tBody, tAttachments
84+
put "Hello World!" into tAttachments[1]["data"]
85+
put "text/plain" into tAttachments[1]["type"]
86+
put "Greetings.txt" into tAttachments[1]["name"]
87+
put "Goodbye World!" into tAttachments[2]["data"]
88+
put "text/plain" into tAttachments[2]["type"]
89+
put "Farewell.txt" into tAttachments[2]["name"]
90+
mobileComposeHtmlMail tSubject, tTo, tCCs, tBCCs, tBody, tAttachments
9191

9292
Some devices are not configured with e-mail sending capability. To
9393
determine if the current device is, use the <mobileCanSendMail>

‎docs/dictionary/control_st/on.lcdoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ reaches the <object(glossary)> whose <script> contains the <on>
7979
<execute|executed>.
8080

8181
>*Note:* If you want to declare a handler that is local to the script it
82-
> is contained in then you can use the <private keyword>, please see the
83-
> dictionary entry for the <private keyword> for more information
82+
> is contained in then you can use the <private> keyword, please see the
83+
> dictionary entry for the <private> keyword for more information
8484

8585
References: dispatch (command), exit (control structure),
8686
return (control structure), result (function), commandNames (function),
8787
paramCount (function), the result (function), object (glossary),
8888
handle (glossary), handler (glossary), execute (glossary),
89-
message handler (glossary), private keyword (glossary), pass (glossary),
90-
message path (glossary), control structure (glossary), message (glossary),
89+
message handler (glossary), pass (glossary), message path (glossary),
90+
control structure (glossary), message (glossary),
9191
command (glossary), statement (glossary), end (keyword),
9292
private (keyword), mouseDown (message), openCard (message),
9393
script (property)

‎docs/images/branch-dropdown.png‎

-16 KB
Loading

‎docs/images/develop-branch.png‎

19.7 KB
Loading

‎docs/images/open-pull-request.png‎

1.17 KB
Loading

‎docs/images/pull-request-target.png‎

1021 Bytes
Loading

‎docs/notes/bugfix-13992.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fixed bug causing crash on mouse enter

‎docs/notes/bugfix-20503.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix quote key not working with Turkish keyboard layout on Mac

‎docs/notes/bugfix-20507.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure Y is respected in 'read from socket X for Y'

0 commit comments

Comments
 (0)