fix bug

YuChengKai · YuChengKai · commit 31f70c2edf5c · 2018-07-23T23:37:21.000+08:00
diff --git a/JS/JS-ch.md b/JS/JS-ch.md
@@ -126,6 +126,24 @@ let a = {
 }
 ```
 
+当然你也可以重写 `Symbol.toPrimitive` ，该方法在转基本类型时调用优先级最高。
+
+```js
+let a = {
+  valueOf() {
+    return 0;
+  },
+  toString() {
+    return '1';
+  },
+  [Symbol.toPrimitive]() {
+    return 2;
+  }
+}
+1 + a // => 3
+'1' + a // => '12'
+```
+
 ## 四则运算符
 
 只有当加法运算时，其中一方是字符串类型，就会把另一个也转为字符串类型。其他运算只要其中一方是数字，那么另一方就转为数字。并且加法运算会触发三种类型转换：将值转换为原始值，转换为数字，转换为字符串。
@@ -153,8 +171,6 @@ let a = {
 
 上图中的 `toPrimitive` 就是对象转基本类型。
 
-一般推荐使用 `===` 判断两个值，但是你如果想知道一个值是不是 `null` ，你可以通过 `xx == null` 来比较。
-
 这里来解析一道题目 `[] == ![] // -> true` ，下面是这个表达式为何为 `true` 的步骤
 
 ```js
@@ -1471,16 +1487,16 @@ parseFloat((0.1 + 0.2).toFixed(10))
 
 ## 字符简写
 
-| 简写 |            作用            |
-| :--: | :------------------------: |
-|  \w  | 匹配字母数字或下划线或汉字 |
-|  \W  |         和上面相反         |
-|  \s  |      匹配任意的空白符      |
-|  \S  |         和上面相反         |
-|  \d  |          匹配数字          |
-|  \D  |         和上面相反         |
-|  \b  |    匹配单词的开始或结束    |
-|  \B  |         和上面相反         |
+| 简写 |         作用         |
+| :--: | :------------------: |
+|  \w  | 匹配字母数字或下划线 |
+|  \W  |      和上面相反      |
+|  \s  |   匹配任意的空白符   |
+|  \S  |      和上面相反      |
+|  \d  |       匹配数字       |
+|  \D  |      和上面相反      |
+|  \b  | 匹配单词的开始或结束 |
+|  \B  |      和上面相反      |
 
 # V8 下的垃圾回收机制
 
diff --git a/JS/JS-en.md b/JS/JS-en.md
@@ -1389,7 +1389,7 @@ parseFloat((0.1 + 0.2).toFixed(10))
 
 | shorthand |            Effect            |
 | :--: | :------------------------: |
-|  \w  | alphanumeric characters, underline character or Chinese characters |
+|  \w  | alphanumeric characters, underline character |
 |  \W  |         the opposite of the above         |
 |  \s  |      any blank character      |
 |  \S  |         the opposite of the above         |
diff --git a/Network/Network-zh.md b/Network/Network-zh.md
@@ -450,7 +450,7 @@ HTTP 2.0 中所有加强性能的核心点在于此。在之前的 HTTP 版本
 
 ## 服务端 Push
 
-在 HTTP 2.0 中，服务端可以在客户端不请求的情况下主动推送资源。
+在 HTTP 2.0 中，服务端可以在客户端某个请求后，主动推送其他资源。
 
 可以想象以下情况，某些资源客户端是一定会请求的，这时就可以采取服务端 push 的技术，提前给客户端推送必要的资源，这样就可以相对减少一点延迟时间。当然在浏览器兼容的情况下你也可以使用 prefetch 。
 
diff --git a/Network/Network_en.md b/Network/Network_en.md
@@ -96,7 +96,7 @@ When talking about the header of TCP, these fields are significant:
 
 ## State machine
 
-  HTTP is stateless, so TCP which is based on HTTP is also stateless. It seems like that TCP links two ends, client and server, but it is actually that both these two ends maintain the state together:
+HTTP is stateless, so TCP which is under the HTTP is also stateless. It seems like that TCP links two ends, client and server, but it is actually that both these two ends maintain the state together:
 ![](https://user-gold-cdn.xitu.io/2018/5/1/1631bef9e3c60035?w=1280&h=965&f=png&s=101432)
 
 The state machine of TCP is very complicated, and it is closely related to the handshake of opening and closing a connection. Now we'll talk something about these two kinds of handshake.
@@ -450,7 +450,9 @@ In HTTP 2.0, the header of the transport is encoded using the HPACK compression
 
 ## Server push
 
-In HTTP/2, the server can push resources to the client without the client having to request. Imagine that, something in the server is necessary to the client, so the server can push the associated resources ahead of time to reduce the delay time. By the way, we can also use `pre-fetch` if the client is compatible.
+In HTTP/2, the server can actively push other resources after a request from the client.
+
+Imagine that, something in the server is necessary to the client, so the server can push the associated resources ahead of time to reduce the delay time. By the way, we can also use `pre-fetch` if the client is compatible.
 
 ## QUIC
 
diff --git a/log-zh.md b/log-zh.md
@@ -0,0 +1,7 @@
+## 2018-07-23 
+
+- 对象转基本类型中增加 `Symbol.toPrimitive` 的描述
+- 修正正则简写中对 `\w` 错误的描述
+- 修改网络模块中的翻译错误
+- 删除判断 `null` 的语句
+- 修改服务端推送中的内容，使描述更加严谨
