Skip to content

Commit 3db0402

Browse files
authored
Merge pull request rage#66 from Nurou/master
proofreading exercises & general
2 parents 991855e + fa4fbdb commit 3db0402

12 files changed

Lines changed: 264 additions & 255 deletions

data/faq.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hidden: false
55
information_page: true
66
---
77

8-
Here's some of the most frequently asked questions. If you can't find the answer for your question, you should ask it through one of the [support channels](/support-and-assistance).
8+
Here are some of the most frequently asked questions. If you can't find an answer for your question, you should ask it through one of the [support channels](/support-and-assistance).
99

1010
<table-of-contents></table-of-contents>
1111

@@ -17,57 +17,56 @@ If you can't make it work, ask on the [support channels](/support-and-assistance
1717

1818
### NetBeans freezes when the feedback window opens
1919

20-
This problem shouldn't be present in the newer version of the plugin. You can download it at `Help` &rarr; `Check for updates` and following the instructions.
20+
This problem shouldn't be present in the newer version of the plugin. You can download it by going on `Help` &rarr; `Check for updates` and following the instructions.
2121

2222
### I think one of the programming exercises has a bug
2323

24-
Please make sure the bug is not in your code. You may ask for help to spot a possible bug from one of the course's [support channels](/support-and-assistance). You can also test if there's an update to the exercise in NetBeans by selecting `TMC` &rarr; `Download` or update exercises from NetBeans' navigation bar. If you still believe there to be an error, notify course assistants through the [support channels](/support-and-assistance).
24+
Please make sure the bug is not in your code. You may ask for help to spot a possible bug from one of the course's [support channels](/support-and-assistance). You can also test if there's an update to the exercise in NetBeans by selecting `TMC` &rarr; `Download` or update exercises from NetBeans' navigation bar. If you still believe there to be an error, please notify the course assistants through the [support channels](/support-and-assistance).
2525

2626
### I found an error in the material
2727

28-
Please contact course assistants through the [support channels](/support-and-assistance).
29-
30-
If you are able to fix the error yourself, for example if it's a typing error, you can open a pull request in the course material's Github repository: https://github.com/rage/java-programming.
28+
Please contact the course assistants through the [support channels](/support-and-assistance).
3129

30+
If you are able to fix the error yourself, such as a typo, you can open a pull request in the course material's Github repository: https://github.com/rage/java-programming.
3231

3332
### How can I download the next part's exercises?
3433

35-
The TMC addon for NetBeans will suggest downloading the next part's exercises once you have gained 25% or more of the last part's programming exercise points.
34+
The TMC add-on for NetBeans will suggest you to download the next part's exercises once you've gained 25% or more of the previous part's exercise points.
3635

3736
### Doing the exercises and returning them is slow on macOS
3837

39-
Follow these instructions to fix the issue: https://materiaalit.github.io/tmc-asennus/macos-verkkoongelma/. The instructions are in Finnish but the images should be of assistance until the instructions are translated.
38+
Follow these instructions to fix the issue: https://materiaalit.github.io/tmc-asennus/macos-verkkoongelma/. The instructions are in Finnish, but you can seek guidance from the images until the instructions are translated.
4039

41-
If it doesn't help, try changing the proxy setting on NetBeans to "no proxy".
40+
If these haven't helped, try changing the proxy setting on NetBeans to "no proxy".
4241

4342
### The installer of NetBeans is not opening on macOS
4443

45-
Try clicking the installer with the right button of the mouse and then choose "Open".
44+
Try right clicking on the installer and then choose "Open".
4645

4746
### The tests of part 12 are not working on my Mac
4847

4948
Check these instructions: [macOS instructions](/macos-ohjeet).
5049

5150
### While running the tests, I get an error about JAVA_HOME
5251

53-
Follow these instructions: [https://materiaalit.github.io/tmc-asennus/java\_home\_not\_found/](https://materiaalit.github.io/tmc-asennus/java_home_not_found/). The instructions are in Finnish but the images should be of assistance until the instructions are translated.
52+
Follow these instructions: [https://materiaalit.github.io/tmc-asennus/java_home_not_found/](https://materiaalit.github.io/tmc-asennus/java_home_not_found/). The instructions are in Finnish, but you can seek guidance from the images until the instructions are translated.
5453

5554
### While running the tests, I get an error about "Permission denied"
5655

57-
Open the Terminal and run the command `chmod +x /path/to/mvn`, where `/path/to/mvn` is the path that ends with `mvn` from the error message. If you require assistance, ask through one of the [support channels](/support-and-assistance).
56+
Open the Terminal and run the command `chmod +x /path/to/mvn`, where `/path/to/mvn` is the path that ends with `mvn` from the error message. If you require assistance, you may seek it through one of the [support channels](/support-and-assistance).
5857

5958
### NetBeans or its installer doesn't open, or looks odd when opening
6059

6160
Make sure you have Java Development Kit (JDK) version 11 installed. The environment used on this course doesn't work properly with other versions of Java. If you have a problem with this, try removing the other versions of Java on your computer, and then [clear the old settings](/remove-netbeans-settings).
6261

6362
### The buttons to run and to send to the server on NetBeans are gray
6463

65-
This usually indicates either passed deadline or wrong course being selected in `TMC` &rarr; `Settings`.
64+
This usually indicates either a passed deadline or a wrong course being selected in `TMC` &rarr; `Settings`.
6665

6766
### I want to apply for study right through the programming MOOC. Is this the right course?
6867

6968
No, you cannot apply for the study right based on this course.
7069

7170
### The next part should be opened today but I cannot access it
7271

73-
There is no guarantee on the exact time a course part will become available. Usually the material has been released around midday, but the release time may vary greatly. Thank you for your patience!
72+
There is no guarantee on the exact time a course part will become available. The material has usually been released around midday, but the release time may vary greatly. Thank you for your patience!

data/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ information_page: true
66
banner: true
77
---
88

9-
Welcome to University of Helsinki’s free massive open online course (MOOC) on programming! This is an updated version of our popular course Object-Oriented Programming with Java.
9+
Welcome to the University of Helsinki’s free massive open online course (MOOC) on programming! This is an updated version of our popular course Object-Oriented Programming with Java.
1010

11-
During this course you will learn all the basics of computer programming, algorithms and object-oriented programming using the Java programming language. The course includes comprehensive course materials and plenty of programming exercises, each tested using our automatic testing service Test My Code.
11+
During this course, you will learn the basics of computer programming, along with algorithms and object-oriented programming through the Java programming language. The course includes comprehensive materials and plenty of programming exercises - all of which are tested using our automatic testing service Test My Code.
1212

1313
Anyone can join - no previous programming knowledge is required.
1414

15-
Unlike many programming courses found online, ours is completely unabridged: the course’s scope and material are identical to our own CS1 programming courses, Introduction to Programming and Advanced Programming.
15+
Unlike many programming courses found online, ours is completely unabridged; the course’s scope and material are identical to our CS1 Introduction to Programming and Advanced Programming courses.
1616

17-
This is the first course in our computer science learning track and we use industry strength tools from day one. Therefore the course is about programming in a real integrated development environment (IDE) and not in the browser or an educational IDE.
17+
This is the first course in our computer science learning track, and we use industry-grade tooling from day one. As such, the course is about programming in a real integrated development environment (IDE) instead of a browser or an educational IDE.
1818

19-
The course does not require a separate registration, so you can just dive in to the first part of the course [here](/part-1).
19+
The course does not require separate registration. You can simply dive into the first part of the course found over [here](/part-1).
2020

21-
## Course contents
21+
## Course Contents
2222

23-
The course is split up into two individual courses, Java Programming I and Java Programming II. Each course consists of seven parts, and each part has its own exercise set. Completing a single part takes approximately 5-20 hours, and we recommend reserving at least 10 hours per part depending on your previous skills with computers.
23+
The course is split up into two individual courses: Java Programming I and Java Programming II. Each course consists of seven parts, each with its own exercise set. Completing a single part takes approximately 5-20 hours, and we recommend reserving at least 10 hours per part, depending on prior skills with computers.
2424

25-
## Release schedule
25+
## Release Schedule
2626

27-
Below you can find the release schedule for each part of the course.
27+
The release schedule for each part of the course can be seen below.
2828

2929
<table>
3030
<thead>

0 commit comments

Comments
 (0)