Skip to content

Commit

Permalink
Merge branch 'master' into 847-add-templates
Browse files Browse the repository at this point in the history
  • Loading branch information
katrinleinweber authored Jun 26, 2017
2 parents 766bf6c + 15ea048 commit 22c8273
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We are grateful for any help in making Exercism better!
This guide covers several common scenarios pertaining to **improving the language tracks**
themselves. There are other guides about contributing to other parts of the Exercism ecosystem.

* [The Command-Line Client](https://github.com/exercism/cli/blob/master/CONTRIBUTING.md)
* [The Command-Line Client](https://github.com/exercism/cli/blob/master/README.md)
* [The Website](https://github.com/exercism/exercism.io/blob/master/CONTRIBUTING.md)
* [The Exercises API](https://github.com/exercism/x-api/blob/master/CONTRIBUTING.md) (used by both the command-line client and the website)

Expand Down
4 changes: 2 additions & 2 deletions bin/transfer_blurb_to_description.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby

# This is a temporary file which exists to support the x-common issue #767
# [Make description.md self contained.](# https://github.com/exercism/x-common/issues/767)
# This is a temporary file which exists to support the problem-specifications issue #767
# [Make description.md self contained.](# https://github.com/exercism/problem-specifications/issues/767)
#
# The exercise description given in description.md should be complete and self
# contained, and not require the addition of the blurb to make sense.
Expand Down
4 changes: 2 additions & 2 deletions exercises/binary-search/canonical-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"It should be replaced with the respective expression that is idiomatic",
"for the language that implements the tests.",

"Following https://github.com/exercism/x-common/issues/234 the exercise",
"Following https://github.com/exercism/problem-specifications/issues/234 the exercise",
"should NOT include checking whether the array is sorted as it defeats",
"the point of the binary search.",

"The exercise should utilize an array-like (i.e. constant-time indexed)",
"data structure and not a linked list. If something like an array is not",
"usually used in the language the problem should not be implemented.",
"See https://github.com/exercism/x-common/issues/244 for details."
"See https://github.com/exercism/problem-specifications/issues/244 for details."
],
"cases": [
{
Expand Down
2 changes: 1 addition & 1 deletion exercises/binary/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated**
Your track should implement "all-your-base" instead.
https://github.com/exercism/x-common/issues/279
https://github.com/exercism/problem-specifications/issues/279
2 changes: 1 addition & 1 deletion exercises/counter/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated.**
It was decided that Exercism should focus on exercises with provided test suites, rather than the reverse ("write the test suite").
https://github.com/exercism/x-common/issues/80
https://github.com/exercism/problem-specifications/issues/80
2 changes: 1 addition & 1 deletion exercises/counter/description.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**NOTE: This exercise has been deprecated.**

Please see the discussion in https://github.com/exercism/x-common/issues/80
Please see the discussion in https://github.com/exercism/problem-specifications/issues/80
for more context.

--------
Expand Down
2 changes: 1 addition & 1 deletion exercises/hexadecimal/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated**
Your track should implement "all-your-base" instead.
https://github.com/exercism/x-common/issues/279
https://github.com/exercism/problem-specifications/issues/279
2 changes: 1 addition & 1 deletion exercises/nucleotide-codons/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated**
Your track should implement protein-translation instead.
https://github.com/exercism/x-common/issues/268
https://github.com/exercism/problem-specifications/issues/268
2 changes: 1 addition & 1 deletion exercises/octal/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated**
Your track should implement "all-your-base" instead.
https://github.com/exercism/x-common/issues/279
https://github.com/exercism/problem-specifications/issues/279
2 changes: 1 addition & 1 deletion exercises/point-mutations/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated.**
Your track should implement hamming instead.
https://github.com/exercism/x-common/issues/184
https://github.com/exercism/problem-specifications/issues/184
4 changes: 2 additions & 2 deletions exercises/secret-handshake/canonical-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"exercise": "secret-handshake",
"version": "1.1.0",
"comments": [
" In a discussion in https://github.com/exercism/x-common/pull/794 and ",
" https://github.com/exercism/x-common/issues/335 it has been decided to ",
" In a discussion in https://github.com/exercism/problem-specifications/pull/794 and ",
" https://github.com/exercism/problem-specifications/issues/335 it has been decided to ",
" only include numbers between 0 and 31 (00000 to 11111) in the canonical ",
" test data. ",
" ",
Expand Down
2 changes: 1 addition & 1 deletion exercises/spiral-matrix/description.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Given the size, return a square matrix of numbers in spiral order.

The matrix should be filled with natural numbers, starting from 1
in the top-left corner, increasing in a inward, clockwise spiral order,
in the top-left corner, increasing in an inward, clockwise spiral order,
like these examples:

###### Spiral matrix of size 3
Expand Down
2 changes: 1 addition & 1 deletion exercises/triangle/canonical-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
" They're degenerate triangles with all three vertices collinear. ",
" (In contrast, we will test (0, 0, 0, Illegal), as it is a point) ",
" The tests assert properities of the triangle are true or false. ",
" See: https://github.com/exercism/x-common/issues/379 for disscussion ",
" See: https://github.com/exercism/problem-specifications/issues/379 for disscussion ",
" of this approach ",
" How you handle invalid triangles is up to you. These tests suggest a ",
" triangle is returned, but all of its properties are false. But you ",
Expand Down
2 changes: 1 addition & 1 deletion exercises/trinary/.deprecated
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
**NOTE: This exercise has been deprecated**
Your track should implement "all-your-base" instead.
https://github.com/exercism/x-common/issues/279
https://github.com/exercism/problem-specifications/issues/279
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "x-common",
"name": "problem-specifications",
"version": "1.0.0",
"description": "Shared metadata for exercism exercises.",
"main": "index.js",
"repository": "[email protected]:exercism/x-common.git",
"repository": "[email protected]:exercism/problem-specifications.git",
"author": "Tejas Bubane <[email protected]>",
"license": "MIT",
"dependencies": {
Expand Down

0 comments on commit 22c8273

Please sign in to comment.