Skip to content

Commit 2c4e3f3

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1-16.10.2017
2 parents faafae4 + 8ae2da8 commit 2c4e3f3

File tree

19 files changed

+86
-59
lines changed

19 files changed

+86
-59
lines changed

‎docs/contributing_to_docs.md‎

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

155155
### Making your dictionary change
156156

157-
**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).**
157+
**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).**
158158

159159
For example, the accept command is at:
160-
https://github.com/livecode/livecode/blob/develop/docs/dictionary/command/accept.lcdoc
160+
https://github.com/livecode/livecode/blob/develop-8.2/docs/dictionary/command/accept.lcdoc
161161

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

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

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

172172
![](images/develop-branch.png)
@@ -239,7 +239,7 @@ and description
239239

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

@@ -407,7 +407,7 @@ Click commit to <branch>
407407

408408
Then click "Submit pull request"
409409

410-
Make sure the target branch is livecode/develop
410+
Make sure the target branch is livecode/develop-8.2
411411

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

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

439-
checkout the `develop` branch
439+
checkout the `develop-8.2` branch
440440

441-
`git checkout develop`
441+
`git checkout develop-8.2`
442442

443443
ensure it is up to date
444444

445-
`git pull upstream develop`
445+
`git pull upstream develop-8.2`
446446

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

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

483-
Ensure the base fork is livecode/livecode, and the base is develop.
483+
Ensure the base fork is livecode/livecode, and the base is develop-8.2.
484484

485485
Click create pull request.
486486

‎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'

‎docs/notes/bugfix-20510.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash on Windows when using revDatabaseTableNames()

0 commit comments

Comments
 (0)