Skip to content

Commit ad733b8

Browse files
committed
Rename files names back to the original. Fix misbehaving language headers.
1 parent 56fde34 commit ad733b8

40 files changed

+48
-36
lines changed

_layouts/guides-thanks.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
layout: index
3+
---
4+
5+
<div class="container">
6+
<div class="row">
7+
<div class="span10">
8+
{{ content }}
9+
</div>
10+
11+
</div>
12+
</div>

overviews/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: guides-index
33
title: Guides and Overviews
4-
languages: [es, ja]
4+
languages: [es, ja, zh-cn]
55
---
66

77
<div class="page-header-index">

cn/overviews/Thanks.md renamed to zh-cn/overviews/Thanks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
layout: guides-Thanks
3-
language: cn
2+
layout: guides-thanks
3+
language: zh-cn
44
title: 致谢名单
55
---
66

cn/overviews/collections/Arrays.md renamed to zh-cn/overviews/collections/Arrays.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 10
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
在Scala中,[数组](http://www.scala-lang.org/api/2.10.0/scala/Array.html)是一种特殊的collection。一方面,Scala数组与Java数组是一一对应的。即Scala数组Array[Int]可看作Java的Int[],Array[Double]可看作Java的double[],以及Array[String]可看作Java的String[]。但Scala数组比Java数组提供了更多内容。首先,Scala数组是一种泛型。即可以定义一个Array[T],T可以是一种类型参数或抽象类型。其次,Scala数组与Scala序列是兼容的 - 在需要Seq[T]的地方可由Array[T]代替。最后,Scala数组支持所有的序列操作。这里有个实际的例子:

cn/overviews/collections/Equality.md renamed to zh-cn/overviews/collections/Equality.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 13
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Introduction.md renamed to zh-cn/overviews/collections/Introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 1
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
## Martin Odersky和Lex Spoon

cn/overviews/collections/Iterators.md renamed to zh-cn/overviews/collections/Iterators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 15
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
迭代器不是一个容器,更确切的说是逐一访问容器内元素的方法。迭代器it的两个基本操作是next和hasNext。调用it.next()会返回迭代器的下一个元素,并且更新迭代器的状态。在同一个迭代器上再次调用next,会产生一个新元素来覆盖之前返回的元素。如果没有元素可返回,调用next方法会抛出一个NoSuchElementException异常。你可以调用[迭代器]的hasNext方法来查询容器中是否有下一个元素可供返回。

cn/overviews/collections/Maps.md renamed to zh-cn/overviews/collections/Maps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 7
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Sets.md renamed to zh-cn/overviews/collections/Sets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 6
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Strings.md renamed to zh-cn/overviews/collections/Strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 11
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
像数组,字符串不是直接的序列,但是他们可以转换为序列,并且他们也支持所有的在字符串上的序列操作这里有些例子让你可以理解在字符串上操作。

cn/overviews/collections/Views.md renamed to zh-cn/overviews/collections/Views.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 14
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
各种容器类自带一些用于开发新容器的方法。例如map、filter和++。我们将这类方法称为转换器(transformers),喂给它们一个或多个容器,它们就会输入一个新容器。

cn/overviews/collections/Concrete_Immutable_Collection_Classes.md renamed to zh-cn/overviews/collections/concrete-immutable-collection-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 8
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Concrete_Mutable_Collection_Classes.md renamed to zh-cn/overviews/collections/concrete-mutable-collection-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 9
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Conversions_Between_Java_and_Scala_Collections.md renamed to zh-cn/overviews/collections/conversions-between-java-and-scala-collections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 17
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Creating_Collections_From_Scratch.md renamed to zh-cn/overviews/collections/creating-collections-from-scratch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 16
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Migrating_from_Scala_2_7.md renamed to zh-cn/overviews/collections/migrating-from-scala-27.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ disqus: true
77
partof: collections
88
num: 18
99
outof: 18
10-
languages: [cn]
10+
language: zh-cn
1111
---
1212

1313

cn/overviews/collections/Mutable_and_Immutable_Collections.md renamed to zh-cn/overviews/collections/mutable-and-immutable-collections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 2
9-
language: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Performance_Characteristics.md renamed to zh-cn/overviews/collections/performance-characteristics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 12
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/The_sequence_traits.md renamed to zh-cn/overviews/collections/seqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 5
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/collections/Trait_Iterable.md renamed to zh-cn/overviews/collections/trait-iterable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 4
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
自下而上的容器(collection)层次结构具有可迭代的Trait。Trait的所有方法可定义为一个抽象方法,逐个生成容器(collection)元素迭代器。Traversable Trait的foreach方法实现了迭代器的Iterable。下面是具体的实现。

cn/overviews/collections/Trait_Traversable.md renamed to zh-cn/overviews/collections/trait-traversable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: collections
88
num: 3
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Traversable(遍历)是容器(collection)类的最高级别特性,它唯一的抽象操作是foreach:

cn/overviews/core/Implicit-Classes.md renamed to zh-cn/overviews/core/Implicit-Classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 4
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Josh Suereth

cn/overviews/core/The_Scala_Actors_API.md renamed to zh-cn/overviews/core/actors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 7
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Philipp Haller及Stephen Tu

cn/overviews/core/The_Architecture_of_Scala_Collections.md renamed to zh-cn/overviews/core/architecture-of-scala-collections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 6
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Martin Odersky & Lex Spoon

cn/overviews/core/Futures-and-Promises.md renamed to zh-cn/overviews/core/futures.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 5
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Philipp Haller, Aleksandar Prokopec, Heather Miller, Viktor Klang, Roland Kuhn, and Vojin Jovanovic著

cn/overviews/core/The-Scala-Actors-Migration-Guide.md renamed to zh-cn/overviews/core/sctors-migration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 1
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/core/String_Interpolation.md renamed to zh-cn/overviews/core/string-interpolation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 3
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Josh Suereth

cn/overviews/core/Value-Classes-and-Universal-Traits.md renamed to zh-cn/overviews/core/value-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: core
88
num: 2
9-
languages: [cn]
9+
language: zh-cn
1010
---
1111

1212
Mark Harrah

cn/overviews/index.md renamed to zh-cn/overviews/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: guides-index
3-
language: cn
3+
language: zh-cn
44
title: 目录
55
---
66
##[Thanks](Thanks.md)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 5
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212
像正常的顺序集合库那样,Scala的并行集合库包含了大量的由不同并行集合实现的一致的集合操作。并且像顺序集合库那样,scala的并行集合库通过并行集合“模板”实现了大部分操作,从而防止了代码重复。“模板”只需要定义一次就可以通过不同的并行集合被灵活地继承。

cn/overviews/parallel-collections/Concrete_Parallel_Collection_Classes.md renamed to zh-cn/overviews/parallel-collections/concrete-parallel-collections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 2
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212
### 并行数组(Parallel Range)

cn/overviews/parallel-collections/Configuring_Parallel_Collections.md renamed to zh-cn/overviews/parallel-collections/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 7
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/parallel-collections/Parallel_Collection_Conversions.md renamed to zh-cn/overviews/parallel-collections/conversions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 3
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212
### 顺序容器和并行容器之间的转换

cn/overviews/parallel-collections/Concurrent_Tries.md renamed to zh-cn/overviews/parallel-collections/ctries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 4
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212

cn/overviews/parallel-collections/Creating_Custom_Parallel_Collections.md renamed to zh-cn/overviews/parallel-collections/custom-parallel-collections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 6
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212
### 没有组合器的并行容器

cn/overviews/parallel-collections/Measuring_Performance.md renamed to zh-cn/overviews/parallel-collections/performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ disqus: true
66

77
partof: parallel-collections
88
num: 8
9-
language: cn
9+
language: zh-cn
1010
---
1111

1212
### 在JVM上的性能

0 commit comments

Comments
 (0)