Bläddra i källkod

Merge pull request #763 from Stargator/fix-numbering

Double indent code blocks to resolve list numbering
Stuart Kent 9 år sedan
förälder
incheckning
9c7bb87c04
2 ändrade filer med 123 tillägg och 109 borttagningar
  1. 76
    68
      docs/INSTALLATION.md
  2. 47
    41
      docs/TESTS.md

+ 76
- 68
docs/INSTALLATION.md Visa fil

24
 
24
 
25
 1. If you have not installed Chocolatey, do so now:
25
 1. If you have not installed Chocolatey, do so now:
26
 
26
 
27
-   ```batchfile
28
-   C:\Windows\system32> @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
29
-   ```
27
+     ```batchfile
28
+     C:\Windows\system32> @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
29
+     ```
30
+
30
 2.  Install the JDK:
31
 2.  Install the JDK:
31
 
32
 
32
-   ```batchfile
33
-   C:\Windows\system32> choco install jdk8
34
-   ...
35
-   C:\Windows\system32> refreshenv
36
-   ...
37
-   ```
33
+     ```batchfile
34
+     C:\Windows\system32> choco install jdk8
35
+     ...
36
+     C:\Windows\system32> refreshenv
37
+     ...
38
+     ```
38
 3.  Install Gradle:
39
 3.  Install Gradle:
39
 
40
 
40
-   ```batchfile
41
-   C:\Windows\system32>choco install gradle
42
-   ...
43
-   ```
41
+     ```batchfile
42
+     C:\Windows\system32>choco install gradle
43
+     ...
44
+     ```
44
 
45
 
45
 We recommend closing the administrative command prompt and opening a new command prompt -- you do not require administrator privileges to practice Exercism exercises.
46
 We recommend closing the administrative command prompt and opening a new command prompt -- you do not require administrator privileges to practice Exercism exercises.
46
 
47
 
58
 
59
 
59
 1. If you haven't installed [Homebrew](http://brew.sh), yet, do so now:
60
 1. If you haven't installed [Homebrew](http://brew.sh), yet, do so now:
60
 
61
 
61
-   ```sh
62
-   $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
63
-   ```
62
+     ```sh
63
+     $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
64
+     ```
65
+
64
 2. Tap the [Homebrew Cask](https://caskroom.github.io/) — this allows us to install pre-built binaries like the JDK.
66
 2. Tap the [Homebrew Cask](https://caskroom.github.io/) — this allows us to install pre-built binaries like the JDK.
65
 
67
 
66
-   ```
67
-   $ brew tap caskroom/cask
68
-   ```
68
+     ```
69
+     $ brew tap caskroom/cask
70
+     ```
71
+
69
 3.  Install the JDK:
72
 3.  Install the JDK:
70
 
73
 
71
-   ```
72
-   $ brew cask install java
73
-   ```
74
+     ```
75
+     $ brew cask install java
76
+     ```
77
+
74
 4.  Install Gradle:
78
 4.  Install Gradle:
75
 
79
 
76
-   ```
77
-   $ brew install gradle
78
-   ```
80
+     ```
81
+     $ brew install gradle
82
+     ```
79
 
83
 
80
 You now are ready to get started with the Java track of Exercism!
84
 You now are ready to get started with the Java track of Exercism!
81
 
85
 
98
 
102
 
99
 1. Install the JDK:
103
 1. Install the JDK:
100
 
104
 
101
-   ```sh
102
-   $ sudo apt-get update
103
-   $ sudo apt-get install python-software-properties
104
-   $ sudo add-apt-repository ppa:webupd8team/java
105
-   $ sudo apt-get update
106
-   $ sudo apt-get install oracle-java8-installer
107
-   $ sudo apt install oracle-java8-set-default
108
-   ```
105
+     ```sh
106
+     $ sudo apt-get update
107
+     $ sudo apt-get install python-software-properties
108
+     $ sudo add-apt-repository ppa:webupd8team/java
109
+     $ sudo apt-get update
110
+     $ sudo apt-get install oracle-java8-installer
111
+     $ sudo apt install oracle-java8-set-default
112
+     ```
113
+
109
 2. Install Gradle:
114
 2. Install Gradle:
110
 
115
 
111
-   ```sh
112
-   $ sudo add-apt-repository ppa:cwchien/gradle
113
-   $ sudo apt-get update
114
-   $ sudo apt-get install gradle
115
-   ```
116
+     ```sh
117
+     $ sudo add-apt-repository ppa:cwchien/gradle
118
+     $ sudo apt-get update
119
+     $ sudo apt-get install gradle
120
+     ```
116
 
121
 
117
 You now are ready to get started with the Java track of Exercism!
122
 You now are ready to get started with the Java track of Exercism!
118
 
123
 
128
 
133
 
129
 1. Install the JDK:
134
 1. Install the JDK:
130
 
135
 
131
-   ```sh
132
-   $ sudo dnf install java-1.8.0-openjdk-devel
133
-   ```
136
+     ```sh
137
+     $ sudo dnf install java-1.8.0-openjdk-devel
138
+     ```
139
+
134
 2. Install Gradle:
140
 2. Install Gradle:
135
 
141
 
136
-   ```sh
137
-   $ sudo dnf install gradle
138
-   ```
142
+     ```sh
143
+     $ sudo dnf install gradle
144
+     ```
139
 
145
 
140
 
146
 
141
 You now are ready to get started with the Java track of Exercism!
147
 You now are ready to get started with the Java track of Exercism!
183
    1. Download "**Binary only distribution**" from the [Gradle download page](https://gradle.org/gradle-download/).
189
    1. Download "**Binary only distribution**" from the [Gradle download page](https://gradle.org/gradle-download/).
184
    2. Unpack Gradle:
190
    2. Unpack Gradle:
185
 
191
 
186
-      ```sh
187
-      $ mkdir ~/tools
188
-      $ cd ~/tools
189
-      $ unzip ~/Downloads/gradle-*-bin.zip
190
-      $ cd gradle*
191
-      ```
192
+     ```sh
193
+     $ mkdir ~/tools
194
+     $ cd ~/tools
195
+     $ unzip ~/Downloads/gradle-*-bin.zip
196
+     $ cd gradle*
197
+     ```
198
+
192
    3. Configure Gradle and add it to the path:
199
    3. Configure Gradle and add it to the path:
193
 
200
 
194
-      ```sh
195
-      $ cat << DONE >> ~/.bashrc
196
-      export GRADLE_HOME=`pwd`
197
-      export PATH=\$PATH:\$GRADLE_HOME/bin
198
-     DONE
199
-     ```
201
+     ```sh
202
+     $ cat << DONE >> ~/.bashrc
203
+     export GRADLE_HOME=`pwd`
204
+     export PATH=\$PATH:\$GRADLE_HOME/bin
205
+    DONE
206
+    ```
200
 
207
 
201
 
208
 
202
 You now are ready to get started with the Java track of Exercism!
209
 You now are ready to get started with the Java track of Exercism!
216
    1. Download "**Binary only distribution**" from the [Gradle download page](https://gradle.org/gradle-download/).
223
    1. Download "**Binary only distribution**" from the [Gradle download page](https://gradle.org/gradle-download/).
217
    2. Unpack Gradle:
224
    2. Unpack Gradle:
218
 
225
 
219
-      ```sh
220
-      $ mkdir ~/tools
221
-      $ cd ~/tools
222
-      $ unzip ~/Downloads/gradle-*-bin.zip
223
-      $ cd gradle*
224
-      ```
226
+     ```sh
227
+     $ mkdir ~/tools
228
+     $ cd ~/tools
229
+     $ unzip ~/Downloads/gradle-*-bin.zip
230
+     $ cd gradle*
231
+     ```
232
+
225
    3. Configure Gradle and add it to the path:
233
    3. Configure Gradle and add it to the path:
226
 
234
 
227
-      ```sh
228
-      $ cat << DONE >> ~/.bashrc
229
-      export GRADLE_HOME=`pwd`
230
-      export PATH=\$PATH:\$GRADLE_HOME/bin
231
-     DONE
232
-     ```
235
+     ```sh
236
+     $ cat << DONE >> ~/.bashrc
237
+     export GRADLE_HOME=`pwd`
238
+     export PATH=\$PATH:\$GRADLE_HOME/bin
239
+    DONE
240
+    ```
233
 
241
 
234
 You now are ready to get started with the Java track of Exercism!
242
 You now are ready to get started with the Java track of Exercism!
235
 
243
 

+ 47
- 41
docs/TESTS.md Visa fil

13
 1. Open a Command Prompt.
13
 1. Open a Command Prompt.
14
 2. Get the first exercise:
14
 2. Get the first exercise:
15
 
15
 
16
-   ```batchfile
17
-   C:\Users\JohnDoe>exercism fetch java
18
-   
19
-   Not Submitted:     1 problem
20
-   java (Hello World) C:\Users\JohnDoe\exercism\java\hello-world
21
-   
22
-   New:               1 problem
23
-   java (Hello World) C:\Users\JohnDoe\exercism\java\hello-world
24
-   
25
-   unchanged: 0, updated: 0, new: 1
26
-   
16
+     ```batchfile
17
+     C:\Users\JohnDoe>exercism fetch java
18
+
19
+     Not Submitted:     1 problem
20
+     java (Hello World) C:\Users\JohnDoe\exercism\java\hello-world
21
+
22
+     New:               1 problem
23
+     java (Hello World) C:\Users\JohnDoe\exercism\java\hello-world
24
+
25
+     unchanged: 0, updated: 0, new: 1
27
    ```
26
    ```
27
+
28
 3. Change directory into the exercism:
28
 3. Change directory into the exercism:
29
 
29
 
30
-   ```batchfile
31
-   C:\Users\JohnDoe>cd C:\Users\JohnDoe\exercism\java\hello-world
32
-   ```
30
+     ```batchfile
31
+     C:\Users\JohnDoe>cd C:\Users\JohnDoe\exercism\java\hello-world
32
+     ```
33
    
33
    
34
 4. Run the tests:
34
 4. Run the tests:
35
 
35
 
36
-   ```batchfile
37
-   C:\Users\JohnDoe>gradle test
38
-   ```
36
+     ```batchfile
37
+     C:\Users\JohnDoe>gradle test
38
+     ```
39
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
39
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
40
+
40
 5. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
41
 5. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
41
 
42
 
42
 
43
 
50
 
51
 
51
 1. In the terminal window, get the first exercise:
52
 1. In the terminal window, get the first exercise:
52
 
53
 
53
-   ```
54
-   $ exercism fetch java
54
+     ```
55
+     $ exercism fetch java
55
 
56
 
56
-   New:                 1 problem
57
-   Java (Etl) /Users/johndoe/exercism/java/hello-world
57
+     New:                 1 problem
58
+     Java (Etl) /Users/johndoe/exercism/java/hello-world
58
 
59
 
59
-   unchanged: 0, updated: 0, new: 1
60
+     unchanged: 0, updated: 0, new: 1
61
+    ```
60
 
62
 
61
-  ```
62
 2. Change directory into the exercise:
63
 2. Change directory into the exercise:
63
 
64
 
64
-   ```
65
-   $ cd /Users/johndoe/exercism/java/hello-world
66
-   ```
65
+     ```
66
+     $ cd /Users/johndoe/exercism/java/hello-world
67
+     ```
68
+
67
 3. Run the tests:
69
 3. Run the tests:
68
 
70
 
69
-  ```
70
-  $ gradle test
71
-  ```
71
+    ```
72
+    $ gradle test
73
+    ```
72
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
74
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
75
+
73
 4. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
76
 4. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
74
 
77
 
75
 Good luck!  Have fun!
78
 Good luck!  Have fun!
82
 
85
 
83
 1. In the terminal window, get the first exercise:
86
 1. In the terminal window, get the first exercise:
84
 
87
 
85
-   ```
86
-   $ exercism fetch java
88
+     ```
89
+     $ exercism fetch java
87
 
90
 
88
-   New:                 1 problem
89
-   Java (Etl) /home/johndoe/exercism/java/hello-world
91
+     New:                 1 problem
92
+     Java (Etl) /home/johndoe/exercism/java/hello-world
90
 
93
 
91
-   unchanged: 0, updated: 0, new: 1
94
+     unchanged: 0, updated: 0, new: 1
95
+
96
+    ```
92
 
97
 
93
-  ```
94
 2. Change directory into the exercise:
98
 2. Change directory into the exercise:
95
 
99
 
96
-   ```
97
-   $ cd /home/johndoe/exercism/java/hello-world
98
-   ```
100
+     ```
101
+     $ cd /home/johndoe/exercism/java/hello-world
102
+     ```
103
+
99
 3. Run the tests:
104
 3. Run the tests:
100
 
105
 
101
-  ```
102
-  $ gradle test
103
-  ```
106
+    ```
107
+    $ gradle test
108
+    ```
104
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
109
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
110
+
105
 4. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
111
 4. Solve the exercise.  Find and work through the `TUTORIAL.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md)).
106
 
112
 
107
 Good luck!  Have fun!
113
 Good luck!  Have fun!