From b6e9ad3b8d5b0c742f4362f48c1e9988f6a8e87e Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Sun, 19 Apr 2015 11:18:51 +0800
Subject: [PATCH 01/88] Create a copy of the English version.

---
 zh-cn/tmux-cn.html.markdown | 251 ++++++++++++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 zh-cn/tmux-cn.html.markdown

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
new file mode 100644
index 00000000..c11da5fc
--- /dev/null
+++ b/zh-cn/tmux-cn.html.markdown
@@ -0,0 +1,251 @@
+---
+category: tool
+tool: tmux
+contributors:
+    - ["mdln", "https://github.com/mdln"]
+filename: LearnTmux.txt
+---
+
+
+[tmux](http://tmux.sourceforge.net)
+is a terminal multiplexer: it enables a number of terminals
+to be created, accessed, and controlled from a single screen. tmux
+may be detached from a screen and continue running in the background
+then later reattached.
+
+
+```
+
+  tmux [command]     # Run a command
+                     # 'tmux' with no commands will create a new session
+
+    new              # Create a new session
+     -s "Session"    # Create named session
+     -n "Window"     # Create named Window
+     -c "/dir"       # Start in target directory
+
+    attach           # Attach last/available session
+     -t "#"          # Attach target session
+     -d              # Detach the session from other instances
+
+    ls               # List open sessions
+     -a              # List all open sessions
+
+    lsw              # List windows
+     -a              # List all windows
+     -s              # List all windows in session
+
+    lsp              # List panes
+     -a              # List all panes
+     -s              # List all panes in session
+     -t              # List app panes in target
+
+    kill-window      # Kill current window
+     -t "#"          # Kill target window
+     -a              # Kill all windows
+     -a -t "#"       # Kill all windows but the target
+
+    kill-session     # Kill current session
+     -t "#"          # Kill target session
+     -a              # Kill all sessions
+     -a -t "#"       # Kill all sessions but the target
+
+```
+
+
+### Key Bindings
+
+The method of controlling an attached tmux session is via key
+combinations called 'Prefix' keys.
+
+```
+----------------------------------------------------------------------
+  (C-b) = Ctrl + b    # 'Prefix' combination required to use keybinds
+
+  (M-1) = Meta + 1 -or- Alt + 1
+----------------------------------------------------------------------
+
+  ?                  # List all key bindings
+  :                  # Enter the tmux command prompt
+  r                  # Force redraw of the attached client
+  c                  # Create a new window
+
+  !                  # Break the current pane out of the window.
+  %                  # Split the current pane into two, left and right
+  "                  # Split the current pane into two, top and bottom
+
+  n                  # Change to the next window
+  p                  # Change to the previous window
+  {                  # Swap the current pane with the previous pane
+  }                  # Swap the current pane with the next pane
+
+  s                  # Select a new session for the attached client
+                     interactively
+  w                  # Choose the current window interactively
+  0 to 9             # Select windows 0 to 9
+
+  d                  # Detach the current client
+  D                  # Choose a client to detach
+
+  &                  # Kill the current window
+  x                  # Kill the current pane
+
+  Up, Down           # Change to the pane above, below, left, or right
+  Left, Right
+
+  M-1 to M-5         # Arrange panes:
+                       # 1) even-horizontal
+                       # 2) even-vertical
+                       # 3) main-horizontal
+                       # 4) main-vertical
+                       # 5) tiled
+
+  C-Up, C-Down       # Resize the current pane in steps of one cell
+  C-Left, C-Right
+
+  M-Up, M-Down       # Resize the current pane in steps of five cells
+  M-Left, M-Right
+
+```
+
+
+### Configuring ~/.tmux.conf
+
+tmux.conf can be used to set options automatically on start up, much
+like how .vimrc or init.el are used.
+
+```
+# Example tmux.conf
+# 2014.10
+
+
+### General
+###########################################################################
+
+# Enable UTF-8
+setw -g utf8 on
+set-option -g status-utf8 on
+
+# Scrollback/History limit
+set -g history-limit 2048
+
+# Index Start
+set -g base-index 1
+
+# Mouse
+set-option -g mouse-select-pane on
+
+# Force reload of config file
+unbind r
+bind r source-file ~/.tmux.conf
+
+
+### Keybinds
+###########################################################################
+
+# Unbind C-b as the default prefix
+unbind C-b
+
+# Set new default prefix
+set-option -g prefix `
+
+# Return to previous window when prefix is pressed twice
+bind C-a last-window
+bind ` last-window
+
+# Allow swapping C-a and ` using F11/F12
+bind F11 set-option -g prefix C-a
+bind F12 set-option -g prefix `
+
+# Keybind preference
+setw -g mode-keys vi
+set-option -g status-keys vi
+
+# Moving between panes with vim movement keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# Window Cycle/Swap
+bind e previous-window
+bind f next-window
+bind E swap-window -t -1
+bind F swap-window -t +1
+
+# Easy split pane commands
+bind = split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# Activate inner-most session (when nesting tmux) to send commands
+bind a send-prefix
+
+
+### Theme
+###########################################################################
+
+# Statusbar Color Palatte
+set-option -g status-justify left
+set-option -g status-bg black
+set-option -g status-fg white
+set-option -g status-left-length 40
+set-option -g status-right-length 80
+
+# Pane Border Color Palette
+set-option -g pane-active-border-fg green
+set-option -g pane-active-border-bg black
+set-option -g pane-border-fg white
+set-option -g pane-border-bg black
+
+# Message Color Palette
+set-option -g message-fg black
+set-option -g message-bg green
+
+# Window Status Color Palette
+setw -g window-status-bg black
+setw -g window-status-current-fg green
+setw -g window-status-bell-attr default
+setw -g window-status-bell-fg red
+setw -g window-status-content-attr default
+setw -g window-status-content-fg yellow
+setw -g window-status-activity-attr default
+setw -g window-status-activity-fg yellow
+
+
+### UI
+###########################################################################
+
+# Notification
+setw -g monitor-activity on
+set -g visual-activity on
+set-option -g bell-action any
+set-option -g visual-bell off
+
+# Automatically set window titles
+set-option -g set-titles on
+set-option -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name,active (or not)
+
+# Statusbar Adjustments
+set -g status-left "#[fg=red] #H#[fg=green]:#[fg=white]#S#[fg=green] |#[default]"
+
+# Show performance counters in statusbar
+# Requires https://github.com/thewtex/tmux-mem-cpu-load/
+set -g status-interval 4
+set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] | #[fg=cyan]%H:%M #[default]"
+
+```
+
+
+### References
+
+[Tmux | Home](http://tmux.sourceforge.net)
+
+[Tmux Manual page](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
+
+[Gentoo Wiki](http://wiki.gentoo.org/wiki/Tmux)
+
+[Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux)
+
+[Display CPU/MEM % in statusbar](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)

From da12b4d6f592aaf7bce4de6d78c75877cdcc968c Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Sun, 19 Apr 2015 11:42:22 +0800
Subject: [PATCH 02/88] Translate the majority into Chinese.

---
 zh-cn/tmux-cn.html.markdown | 184 ++++++++++++++++++------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index c11da5fc..184daca1 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -1,9 +1,12 @@
 ---
 category: tool
 tool: tmux
+filename: LearnTmux-cn.txt
 contributors:
     - ["mdln", "https://github.com/mdln"]
-filename: LearnTmux.txt
+translators:
+    - ["Arnie97", "https://github.com/Arnie97"]
+lang: zh-cn
 ---
 
 
@@ -16,194 +19,191 @@ then later reattached.
 
 ```
 
-  tmux [command]     # Run a command
-                     # 'tmux' with no commands will create a new session
+  tmux [command]     # 运行一条命令
+                     # 如果忽略 'tmux' 之后的命令，将会建立一个新的会话
 
-    new              # Create a new session
-     -s "Session"    # Create named session
-     -n "Window"     # Create named Window
-     -c "/dir"       # Start in target directory
+    new              # 创建一个新的会话
+     -s "Session"    # 创建一个named会话
+     -n "Window"     # 创建一个named窗口
+     -c "/dir"       # 在指定的工作目录中启动会话
 
-    attach           # Attach last/available session
-     -t "#"          # Attach target session
-     -d              # Detach the session from other instances
+    attach           # 连接到上一次的会话（如果可用）
+     -t "#"          # 连接到指定的会话
+     -d              # 断开其他客户端的会话
 
-    ls               # List open sessions
-     -a              # List all open sessions
+    ls               # 列出打开的会话
+     -a              # 列出所有打开的会话
 
-    lsw              # List windows
-     -a              # List all windows
-     -s              # List all windows in session
+    lsw              # 列出窗口
+     -a              # 列出所有窗口
+     -s              # 列出会话中的所有窗口
 
-    lsp              # List panes
-     -a              # List all panes
-     -s              # List all panes in session
+    lsp              # 列出窗格
+     -a              # 列出所有窗格
+     -s              # 列出会话中的所有窗格
      -t              # List app panes in target
 
-    kill-window      # Kill current window
-     -t "#"          # Kill target window
-     -a              # Kill all windows
-     -a -t "#"       # Kill all windows but the target
+    kill-window      # 关闭当前窗口
+     -t "#"          # 关闭指定的窗口
+     -a              # 关闭所有窗口
+     -a -t "#"       # 关闭除指定窗口以外的所有窗口
 
-    kill-session     # Kill current session
-     -t "#"          # Kill target session
-     -a              # Kill all sessions
-     -a -t "#"       # Kill all sessions but the target
+    kill-session     # 关闭当前会话
+     -t "#"          # 关闭指定的会话
+     -a              # 关闭所有会话
+     -a -t "#"       # 关闭除指定会话以外的所有会话
 
 ```
 
 
-### Key Bindings
+## 快捷键
 
-The method of controlling an attached tmux session is via key
-combinations called 'Prefix' keys.
+# 通过“前缀”快捷键，可以控制一个已经连入的tmux会话。
 
 ```
 ----------------------------------------------------------------------
-  (C-b) = Ctrl + b    # 'Prefix' combination required to use keybinds
+  (C-b) = Ctrl + b    # 在使用下列快捷键之前，需要按这个“前缀”快捷键
 
-  (M-1) = Meta + 1 -or- Alt + 1
+  (M-1) = Meta + 1 或 Alt + 1
 ----------------------------------------------------------------------
 
-  ?                  # List all key bindings
-  :                  # Enter the tmux command prompt
-  r                  # Force redraw of the attached client
-  c                  # Create a new window
+  ?                  # 列出所有快捷键
+  :                  # 进入tmux的命令提示符
+  r                  # 强制重绘 the attached client
+  c                  # 创建一个新窗口
 
   !                  # Break the current pane out of the window.
-  %                  # Split the current pane into two, left and right
-  "                  # Split the current pane into two, top and bottom
+  %                  # 将当前窗格分为左右两半
+  "                  # 将当前窗格分为上下两半
 
-  n                  # Change to the next window
-  p                  # Change to the previous window
-  {                  # Swap the current pane with the previous pane
-  }                  # Swap the current pane with the next pane
+  n                  # 切换到下一个窗口
+  p                  # 切换到上一个窗口
+  {                  # 将当前窗格与上一个窗格交换
+  }                  # 将当前窗格与下一个窗格交换
 
-  s                  # Select a new session for the attached client
-                     interactively
-  w                  # Choose the current window interactively
-  0 to 9             # Select windows 0 to 9
+  s                  # 在交互式界面中，选择并连接至另一个会话
+  w                  # 在交互式界面中，选择并激活一个窗口
+  0 至 9             # 选择 0 到 9 号窗口
 
-  d                  # Detach the current client
-  D                  # Choose a client to detach
+  d                  # 断开当前客户端
+  D                  # 选择并断开一个客户端
 
-  &                  # Kill the current window
-  x                  # Kill the current pane
+  &                  # 关闭当前窗口
+  x                  # 关闭当前窗格
 
-  Up, Down           # Change to the pane above, below, left, or right
+  Up, Down           # 将焦点移动至相邻的窗格
   Left, Right
 
-  M-1 to M-5         # Arrange panes:
+  M-1 到 M-5         # 排列窗格：
                        # 1) even-horizontal
                        # 2) even-vertical
                        # 3) main-horizontal
                        # 4) main-vertical
                        # 5) tiled
 
-  C-Up, C-Down       # Resize the current pane in steps of one cell
+  C-Up, C-Down       # 改变当前窗格的大小，每按一次增减一个单位
   C-Left, C-Right
 
-  M-Up, M-Down       # Resize the current pane in steps of five cells
+  M-Up, M-Down       # 改变当前窗格的大小，每按一次增减五个单位
   M-Left, M-Right
 
 ```
 
 
-### Configuring ~/.tmux.conf
+### 配置 ~/.tmux.conf
 
-tmux.conf can be used to set options automatically on start up, much
-like how .vimrc or init.el are used.
+tmux.conf 可以在 tmux 启动时自动设置选项，类似于 .vimrc 或 init.el 的用法。
 
 ```
-# Example tmux.conf
+# tmux.conf 示例
 # 2014.10
 
 
-### General
+### 通用设置
 ###########################################################################
 
-# Enable UTF-8
+# 启用 UTF-8 编码
 setw -g utf8 on
 set-option -g status-utf8 on
 
-# Scrollback/History limit
+# 命令回滚/历史数量限制
 set -g history-limit 2048
 
 # Index Start
 set -g base-index 1
 
-# Mouse
+# 启用鼠标
 set-option -g mouse-select-pane on
 
-# Force reload of config file
+# 重新加载配置文件
 unbind r
 bind r source-file ~/.tmux.conf
 
 
-### Keybinds
+### 快捷键设置
 ###########################################################################
 
-# Unbind C-b as the default prefix
+# 取消默认的前缀键 C-b
 unbind C-b
 
-# Set new default prefix
+# 设置新的前缀键
 set-option -g prefix `
 
-# Return to previous window when prefix is pressed twice
+# 再次按下前缀键时，回到之前的窗口
 bind C-a last-window
 bind ` last-window
 
-# Allow swapping C-a and ` using F11/F12
+# 按下F11/F12，可以选择不同的前缀键
 bind F11 set-option -g prefix C-a
 bind F12 set-option -g prefix `
 
-# Keybind preference
+# Vim 风格的快捷键绑定
 setw -g mode-keys vi
 set-option -g status-keys vi
 
-# Moving between panes with vim movement keys
+# 使用 vim 风格的按键在窗格间移动
 bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
-# Window Cycle/Swap
+# 循环切换不同的窗口
 bind e previous-window
 bind f next-window
 bind E swap-window -t -1
 bind F swap-window -t +1
 
-# Easy split pane commands
+# 较易于使用的窗格分割快捷键
 bind = split-window -h
 bind - split-window -v
 unbind '"'
 unbind %
 
-# Activate inner-most session (when nesting tmux) to send commands
+# 在嵌套使用 tmux 的情况下，激活最内层的会话，以便向其发送命令
 bind a send-prefix
 
 
-### Theme
+### 外观主题
 ###########################################################################
 
-# Statusbar Color Palatte
+# 状态栏颜色
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg white
 set-option -g status-left-length 40
 set-option -g status-right-length 80
 
-# Pane Border Color Palette
-set-option -g pane-active-border-fg green
-set-option -g pane-active-border-bg black
-set-option -g pane-border-fg white
-set-option -g pane-border-bg black
+# 窗格边框颜色
+set-option -g 窗格-active-border-fg green
+set-option -g 窗格-active-border-bg black
+set-option -g 窗格-border-fg white
+set-option -g 窗格-border-bg black
 
-# Message Color Palette
+# 消息框颜色
 set-option -g message-fg black
 set-option -g message-bg green
 
-# Window Status Color Palette
+# 窗口状态栏颜色
 setw -g window-status-bg black
 setw -g window-status-current-fg green
 setw -g window-status-bell-attr default
@@ -214,38 +214,38 @@ setw -g window-status-activity-attr default
 setw -g window-status-activity-fg yellow
 
 
-### UI
+### 用户界面
 ###########################################################################
 
-# Notification
+# 通知方式
 setw -g monitor-activity on
 set -g visual-activity on
 set-option -g bell-action any
 set-option -g visual-bell off
 
-# Automatically set window titles
+# 自动设置窗口标题
 set-option -g set-titles on
-set-option -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name,active (or not)
+set-option -g set-titles-string '#H:#S.#I.#P #W #T' # 窗口编号,程序名称,是否活动
 
-# Statusbar Adjustments
+# 调整状态栏
 set -g status-left "#[fg=red] #H#[fg=green]:#[fg=white]#S#[fg=green] |#[default]"
 
-# Show performance counters in statusbar
-# Requires https://github.com/thewtex/tmux-mem-cpu-load/
+# 在状态栏中显示性能计数器
+# 需要用到 https://github.com/thewtex/tmux-mem-cpu-load
 set -g status-interval 4
 set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] | #[fg=cyan]%H:%M #[default]"
 
 ```
 
 
-### References
+### 参考资料
 
-[Tmux | Home](http://tmux.sourceforge.net)
+[Tmux 主页](http://tmux.sourceforge.net)
 
-[Tmux Manual page](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
+[Tmux 手册](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
 
 [Gentoo Wiki](http://wiki.gentoo.org/wiki/Tmux)
 
 [Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux)
 
-[Display CPU/MEM % in statusbar](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
+[如何在 tmux 状态栏中显示 CPU / 内存占用百分比](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)

From 8aa98bd572bf4a0e1e52ead5a5ee192fc2101df6 Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Thu, 28 May 2015 15:54:49 +0800
Subject: [PATCH 03/88] Minor improvements.

---
 zh-cn/tmux-cn.html.markdown | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 184daca1..00bf35f3 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -10,21 +10,19 @@ lang: zh-cn
 ---
 
 
-[tmux](http://tmux.sourceforge.net)
-is a terminal multiplexer: it enables a number of terminals
-to be created, accessed, and controlled from a single screen. tmux
-may be detached from a screen and continue running in the background
-then later reattached.
-
+[tmux](http://tmux.sourceforge.net)是一款终端复用工具。
+在它的帮助下，你可以在同一个控制台上建立、访问并控制多个终端。
+你可以断开与一个tmux终端的连接，此时程序将在后台运行，
+当你需要时，可以随时重新连接到这个终端。
 
 ```
 
   tmux [command]     # 运行一条命令
-                     # 如果忽略 'tmux' 之后的命令，将会建立一个新的会话
+                     # 如果单独使用 'tmux' 而不指定某个命令，将会建立一个新的会话
 
     new              # 创建一个新的会话
-     -s "Session"    # 创建一个named会话
-     -n "Window"     # 创建一个named窗口
+     -s "Session"    # 创建一个会话，并命名为“Session”
+     -n "Window"     # 创建一个窗口，并命名为“Window”
      -c "/dir"       # 在指定的工作目录中启动会话
 
     attach           # 连接到上一次的会话（如果可用）
@@ -56,9 +54,9 @@ then later reattached.
 ```
 
 
-## 快捷键
+### 快捷键
 
-# 通过“前缀”快捷键，可以控制一个已经连入的tmux会话。
+通过“前缀”快捷键，可以控制一个已经连入的tmux会话。
 
 ```
 ----------------------------------------------------------------------
@@ -69,7 +67,7 @@ then later reattached.
 
   ?                  # 列出所有快捷键
   :                  # 进入tmux的命令提示符
-  r                  # 强制重绘 the attached client
+  r                  # 强制重绘当前客户端
   c                  # 创建一个新窗口
 
   !                  # Break the current pane out of the window.
@@ -194,10 +192,10 @@ set-option -g status-left-length 40
 set-option -g status-right-length 80
 
 # 窗格边框颜色
-set-option -g 窗格-active-border-fg green
-set-option -g 窗格-active-border-bg black
-set-option -g 窗格-border-fg white
-set-option -g 窗格-border-bg black
+set-option -g pane-active-border-fg green
+set-option -g pane-active-border-bg black
+set-option -g pane-border-fg white
+set-option -g pane-border-bg black
 
 # 消息框颜色
 set-option -g message-fg black

From a9febbeb223269f4cfa88287aeb13b0688537504 Mon Sep 17 00:00:00 2001
From: JustBlah <justbeblah@gmail.com>
Date: Thu, 24 Sep 2015 17:11:45 +0300
Subject: [PATCH 04/88] +Translation, *Russian auto-translate text fixed

+ Added more English to Russian translation
* Auto translated Russian text changed to have more sense and readability
---
 ru-ru/objective-c-ru.html.markdown | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ru-ru/objective-c-ru.html.markdown b/ru-ru/objective-c-ru.html.markdown
index ddff2e5c..7209b3bb 100644
--- a/ru-ru/objective-c-ru.html.markdown
+++ b/ru-ru/objective-c-ru.html.markdown
@@ -381,20 +381,20 @@ if ([myClass respondsToSelector:selectorVar]) { // Проверяет содер
     NSLog(@"MyClass не содержит метод: %@", NSStringFromSelector(selectedVar));
 }
 
-// Имплементируйте методы в файле МойКласс.m:
+// Имплементируйте методы в файле MyClass.m:
 @implementation MyClass {
     long distance; // Переменная экземпляра с закрытым (private) доступом
     NSNumber height;
 }
 
-// To access a public variable from the interface file, use '_' followed by variable name:
-_count = 5; // References "int count" from MyClass interface
-// Access variables defined in implementation file:
-distance = 18; // References "long distance" from MyClass implementation
-// To use @property variable in implementation, use @synthesize to create accessor variable:
-@synthesize roString = _roString; // _roString available now in @implementation
+// Для доступа к public переменной, объявленной в интерфейсе используйте '_' перед названием переменной:
+_count = 5; // Ссылается на "int count" из интерфейса MyClass
+// Получение доступа к переменной, объявленной в имлементации происходит следующим образом:
+distance = 18; // Ссылается на "long distance" из имлементации MyClass
+// Для использования в иплементации переменной, объявленной в интерфейсе с помощью @property, следует использовать @synthesize для создания переменной аксессора:
+@synthesize roString = _roString; // Теперь _roString доступна в @implementation (имплементации интерфейса)
 
-// Called before calling any class methods or instantiating any objects
+// Вызывается в первую очередь, перед вызовом других медотов класса или инициализации других объектов
 + (void)initialize 
 {
     if (self == [MyClass class]) {
@@ -505,10 +505,10 @@ distance = 18; // References "long distance" from MyClass implementation
 
 @end
 
-// Теперь, если мы хотели создать грузовой объект, мы должны вместо создания подкласса класса Car, как это будет
-// изменять функциональность Car чтобы вести себя подобно грузовику. Но давайте посмотрим, если мы хотим только добавить
-// функциональность в существующий Car. Хороший пример должен быть чистить автомобиль. Итак мы создадим
-// категорию для добавления его очистительных методов:
+// Теперь, если мы хотим создать объект Truck - грузовик, мы должны создать подкласс класса Car, что
+// изменит функционал Car и позволит вести себя подобно грузовику. Но что если мы хотим только добавить
+// определенный функционал в уже существующий класс Car? Например - чистка автомобиля. Мы просто создадим
+// категорию, которая добавит несколько методов для чистки автомобиля в класс Car:
 // @interface ИмяФайла: Car+Clean.h (ИмяБазовогоКласса+ИмяКатегории.h)
 #import "Car.h" // Убедитесь в том, что базовый класс импортирован для расширения.
 
@@ -794,7 +794,7 @@ MyClass *arcMyClass = [[MyClass alloc] init];
 // weakVar-свойство автоматически примет значение nil,
 // во избежание падения приложения
 @property (strong) MyClass *strongVar; // 'strong' принимает право на владение
-// объектом. Гарантирует, что объект останится в памяти для использования
+// объектом. Гарантирует, что объект останется в памяти для использования
 
 // Для обычных переменных (не объявленных с помощью @property), используйте
 // следующий способ:

From 652285e9dfe2df2dbbc61b49abdc0ca22bf435f6 Mon Sep 17 00:00:00 2001
From: JustBlah <justbeblah@gmail.com>
Date: Thu, 24 Sep 2015 17:23:49 +0300
Subject: [PATCH 05/88] Multiline commentary split

Long commentary was split into two strings
---
 ru-ru/objective-c-ru.html.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ru-ru/objective-c-ru.html.markdown b/ru-ru/objective-c-ru.html.markdown
index 7209b3bb..bebd36d3 100644
--- a/ru-ru/objective-c-ru.html.markdown
+++ b/ru-ru/objective-c-ru.html.markdown
@@ -391,7 +391,8 @@ if ([myClass respondsToSelector:selectorVar]) { // Проверяет содер
 _count = 5; // Ссылается на "int count" из интерфейса MyClass
 // Получение доступа к переменной, объявленной в имлементации происходит следующим образом:
 distance = 18; // Ссылается на "long distance" из имлементации MyClass
-// Для использования в иплементации переменной, объявленной в интерфейсе с помощью @property, следует использовать @synthesize для создания переменной аксессора:
+// Для использования в иплементации переменной, объявленной в интерфейсе с помощью @property,
+// следует использовать @synthesize для создания переменной аксессора:
 @synthesize roString = _roString; // Теперь _roString доступна в @implementation (имплементации интерфейса)
 
 // Вызывается в первую очередь, перед вызовом других медотов класса или инициализации других объектов

From 05559e8620d478b891c47d541dea978f661a8f3a Mon Sep 17 00:00:00 2001
From: Ale46 <ale467@gmail.com>
Date: Fri, 2 Oct 2015 18:41:55 +0200
Subject: [PATCH 06/88] [python/it] Translated python to Italian

---
 it-it/python-it.html.markdown | 647 ++++++++++++++++++++++++++++++++++
 1 file changed, 647 insertions(+)
 create mode 100644 it-it/python-it.html.markdown

diff --git a/it-it/python-it.html.markdown b/it-it/python-it.html.markdown
new file mode 100644
index 00000000..49bbab08
--- /dev/null
+++ b/it-it/python-it.html.markdown
@@ -0,0 +1,647 @@
+---
+language: python
+contributors:
+    - ["Louie Dinh", "http://ldinh.ca"]
+    - ["Amin Bandali", "http://aminbandali.com"]
+    - ["Andre Polykanine", "https://github.com/Oire"]
+filename: learnpython.py
+translators:
+    - ["Ale46", "http://github.com/Ale46/"]
+lang: it-it
+---
+Python è stato creato da Guido Van Rossum agli inizi degli anni 90. Oggi è uno dei più popolari
+linguaggi esistenti. Mi sono innamorato di Python per la sua chiarezza sintattica. E' sostanzialmente
+pseudocodice eseguibile.
+
+Feedback sono altamente apprezzati! Potete contattarmi su [@louiedinh](http://twitter.com/louiedinh) oppure [at] [google's email service]
+
+Nota: Questo articolo è valido solamente per Python 2.7, ma dovrebbe andar bene anche per
+Python 2.x. Per Python 3.x, dai un'occhiata a [Python 3 tutorial](http://learnxinyminutes.com/docs/python3/).
+
+```python
+
+# I commenti su una sola linea iniziano con un cancelletto
+
+""" Più stringhe possono essere scritte
+    usando tre ", e sono spesso usate
+    come commenti
+"""
+
+####################################################
+## 1. Tipi di dati primitivi ed Operatori
+####################################################
+
+# Hai i numeri
+3  # => 3
+
+# La matematica è quello che vi aspettereste
+1 + 1  # => 2
+8 - 1  # => 7
+10 * 2  # => 20
+35 / 5  # => 7
+
+# La divisione è un po' complicata. E' una divisione fra interi in cui viene 
+# restituito in automatico il risultato intero.
+5 / 2  # => 2
+
+# Per le divisioni con la virgbola abbiamo bisogno di parlare delle variabili floats.
+2.0     # Questo è un float
+11.0 / 4.0  # => 2.75 ahhh...molto meglio
+
+# Il risultato di una divisione fra interi troncati positivi e negativi
+5 // 3     # => 1
+5.0 // 3.0 # => 1.0 # funziona anche per i floats
+-5 // 3  # => -2
+-5.0 // 3.0 # => -2.0
+
+# Operazione Modulo
+7 % 3 # => 1
+
+# Elevamento a potenza (x alla y-esima potenza)
+2**4 # => 16
+
+# Forzare le precedenze con le parentesi
+(1 + 3) * 2  # => 8
+
+# Operatori Booleani
+# Nota "and" e "or" sono case-sensitive
+True and False #=> False
+False or True #=> True
+
+# Note sull'uso di operatori Bool con interi
+0 and 2 #=> 0
+-5 or 0 #=> -5
+0 == False #=> True
+2 == True #=> False
+1 == True #=> True
+
+# nega con not
+not True  # => False
+not False  # => True
+
+# Uguaglianza è ==
+1 == 1  # => True
+2 == 1  # => False
+
+# Disuguaglianza è !=
+1 != 1  # => False
+2 != 1  # => True
+
+# Altri confronti
+1 < 10  # => True
+1 > 10  # => False
+2 <= 2  # => True
+2 >= 2  # => True
+
+# I confronti possono essere concatenati!
+1 < 2 < 3  # => True
+2 < 3 < 2  # => False
+
+# Le stringhe sono create con " o '
+"Questa è una stringa."
+'Anche questa è una stringa.'
+
+# Anche le stringhe possono essere sommate!
+"Ciao " + "mondo!"  # => Ciao mondo!"
+# Le stringhe possono essere sommate anche senza '+'
+"Ciao " "mondo!"  # => Ciao mondo!"
+
+# ... oppure moltiplicate
+"Hello" * 3  # => "HelloHelloHello"
+
+# Una stringa può essere considerata come una lista di caratteri
+"Questa è una stringa"[0]  # => 'Q'
+
+# % può essere usato per formattare le stringhe, in questo modo:
+"%s possono essere %s" % ("le stringhe", "interpolate")
+
+# Un nuovo modo per fomattare le stringhe è il metodo format.
+# Questo metodo è quello consigliato
+"{0} possono essere {1}".format("le stringhe", "formattate")
+# Puoi usare della parole chiave se non vuoi contare
+"{nome} vuole mangiare {cibo}".format(nome="Bob", cibo="lasagna")
+
+# None è un oggetto
+None  # => None
+
+# Non usare il simbolo di uguaglianza "==" per comparare oggetti a None
+# Usa "is" invece
+"etc" is None  # => False
+None is None  # => True
+
+# L'operatore 'is' testa l'identità di un oggetto. Questo non è
+# molto utile quando non hai a che fare con valori primitivi, ma lo è
+# quando hai a che fare con oggetti.
+
+# None, 0, e stringhe/liste vuote sono tutte considerate a False.
+# Tutti gli altri valori sono True
+bool(0)  # => False
+bool("")  # => False
+
+
+####################################################
+## 2. Variabili e Collections
+####################################################
+
+# Python ha una funzione di stampa
+print "Sono Python. Piacere di conoscerti!"
+
+# Non c'è bisogno di dichiarare una variabile per assegnarle un valore
+una_variabile = 5    # Convenzionalmente si usa caratteri_minuscoli_con_underscores
+una_variabile  # => 5
+
+# Accedendo ad una variabile non precedentemente assegnata genera un'eccezione.
+# Dai un'occhiata al Control Flow per imparare di più su come gestire le eccezioni.
+un_altra_variabile  # Genera un errore di nome
+
+# if può essere usato come un'espressione
+"yahoo!" if 3 > 2 else 2  # => "yahoo!"
+
+# Liste immagazzinano sequenze
+li = []
+# Puoi partire con una lista pre-riempita
+altra_li = [4, 5, 6]
+
+# Aggiungi cose alla fine di una lista con append
+li.append(1)    # li ora è [1]
+li.append(2)    # li ora è [1, 2]
+li.append(4)    # li ora è [1, 2, 4]
+li.append(3)    # li ora è [1, 2, 4, 3]
+# Rimuovi dalla fine della lista con pop
+li.pop()        # => 3 e li ora è [1, 2, 4]
+# Rimettiamolo a posto
+li.append(3)    # li ora è [1, 2, 4, 3] di nuovo.
+
+# Accedi ad una lista come faresti con un array
+li[0]  # => 1
+# Assegna nuovo valore agli indici che sono già stati inizializzati con =
+li[0] = 42
+li[0]  # => 42
+li[0] = 1  # Nota: è resettato al valore iniziale
+# Guarda l'ultimo elemento
+li[-1]  # => 3
+
+# Guardare al di fuori dei limiti è un IndexError
+li[4]  # Genera IndexError
+
+# Puoi guardare gli intervalli con la sintassi slice (a fetta).
+# (E' un intervallo chiuso/aperto per voi tipi matematici.)
+li[1:3]  # => [2, 4]
+# Ometti l'inizio
+li[2:]  # => [4, 3]
+# Ometti la fine
+li[:3]  # => [1, 2, 4]
+# Seleziona ogni seconda voce
+li[::2]   # =>[1, 4]
+# Copia al contrario della lista
+li[::-1]   # => [3, 4, 2, 1]
+# Usa combinazioni per fare slices avanzate
+# li[inizio:fine:passo]
+
+# Rimuovi arbitrariamente elementi da una lista con "del"
+del li[2]   # li è ora [1, 2, 3]
+# Puoi sommare le liste
+li + altra_li   # => [1, 2, 3, 4, 5, 6]
+# Nota: i valori per li ed _altri_li non sono modificati.
+
+# Concatena liste con "extend()"
+li.extend(altra_li)   # Ora li è [1, 2, 3, 4, 5, 6]
+
+# Controlla l'esistenza di un valore in una lista con "in"
+1 in li   # => True
+
+# Esamina la lunghezza con "len()"
+len(li)   # => 6
+
+
+# Tuple sono come le liste ma immutabili.
+tup = (1, 2, 3)
+tup[0]   # => 1
+tup[0] = 3  # Genera un TypeError
+
+# Puoi fare tutte queste cose da lista anche sulle tuple
+len(tup)   # => 3
+tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
+tup[:2]   # => (1, 2)
+2 in tup   # => True
+
+# Puoi scompattare le tuple (o liste) in variabili
+a, b, c = (1, 2, 3)     # a è ora 1, b è ora 2 and c è ora 3
+# Le tuple sono create di default se non usi le parentesi
+d, e, f = 4, 5, 6
+# Guarda come è facile scambiare due valori
+e, d = d, e     # d è ora 5 ed e è ora 4
+
+
+# Dizionari immagazzinano mappature
+empty_dict = {}
+# Questo è un dizionario pre-riempito
+filled_dict = {"uno": 1, "due": 2, "tre": 3}
+
+# Accedi ai valori con []
+filled_dict["uno"]   # => 1
+
+# Ottieni tutte le chiavi come una lista con "keys()"
+filled_dict.keys()   # => ["tre", "due", "uno"]
+# Nota - Nei dizionari l'ordine delle chiavi non è garantito.
+# Il tuo risultato potrebbe non essere uguale a questo.
+
+# Ottieni tutt i valori come una lista con "values()"
+filled_dict.values()   # => [3, 2, 1]
+# Nota - Come sopra riguardo l'ordinamento delle chiavi.
+
+# Controlla l'esistenza delle chiavi in un dizionario con "in"
+"uno" in filled_dict   # => True
+1 in filled_dict   # => False
+
+# Cercando una chiave non esistente è un KeyError
+filled_dict["quattro"]   # KeyError
+
+# Usa il metodo "get()" per evitare KeyError
+filled_dict.get("uno")   # => 1
+filled_dict.get("quattro")   # => None
+# Il metodo get supporta un argomento di default quando il valore è mancante
+filled_dict.get("uno", 4)   # => 1
+filled_dict.get("quattro", 4)   # => 4
+# nota che filled_dict.get("quattro") è ancora => None
+# (get non imposta il valore nel dizionario)
+
+# imposta il valore di una chiave con una sintassi simile alle liste
+filled_dict["quattro"] = 4  # ora, filled_dict["quattro"] => 4
+
+# "setdefault()" aggiunge al dizionario solo se la chiave data non è presente
+filled_dict.setdefault("five", 5)  # filled_dict["five"] è impostato a 5
+filled_dict.setdefault("five", 6)  # filled_dict["five"] è ancora 5
+
+
+# Sets immagazzina ... sets (che sono come le liste, ma non possono contenere doppioni)
+empty_set = set()
+# Inizializza un "set()" con un po' di valori
+some_set = set([1, 2, 2, 3, 4])   # some_set è ora set([1, 2, 3, 4])
+
+# l'ordine non è garantito, anche se a volta può sembrare ordinato
+another_set = set([4, 3, 2, 2, 1])  # another_set è ora set([1, 2, 3, 4])
+
+# Da Python 2.7, {} può essere usato per dichiarare un set
+filled_set = {1, 2, 2, 3, 4}   # => {1, 2, 3, 4}
+
+# Aggiungere elementi ad un set
+filled_set.add(5)   # filled_set è ora {1, 2, 3, 4, 5}
+
+# Fai interazioni su un set con &
+other_set = {3, 4, 5, 6}
+filled_set & other_set   # => {3, 4, 5}
+
+# Fai unioni su set con |
+filled_set | other_set   # => {1, 2, 3, 4, 5, 6}
+
+# Fai differenze su set con -
+{1, 2, 3, 4} - {2, 3, 5}   # => {1, 4}
+
+# Controlla l'esistenza in un set con in
+2 in filled_set   # => True
+10 in filled_set   # => False
+
+
+####################################################
+## 3. Control Flow
+####################################################
+
+# Dichiariamo una variabile
+some_var = 5
+
+# Questo è un controllo if. L'indentazione è molto importante in python!
+# stampa "some_var è più piccola di 10"
+if some_var > 10:
+    print "some_var è decisamente più grande di 10."
+elif some_var < 10:    # Questa clausola elif è opzionale.
+    print "some_var è più piccola di 10."
+else:           # Anche questo è opzionale.
+    print "some_var è precisamente 10."
+
+
+"""
+I cicli for iterano sulle liste
+stampa:
+    cane è un mammifero
+    gatto è un mammifero
+    topo è un mammifero
+"""
+for animale in ["cane", "gatto", "topo"]:
+    # Puoi usare {0} per interpolare le stringhe formattate. (Vedi di seguito.)
+    print "{0} è un mammifero".format(animale)
+
+"""
+"range(numero)" restituisce una lista di numeri
+da zero al numero dato
+stampa:
+    0
+    1
+    2
+    3
+"""
+for i in range(4):
+    print i
+
+"""
+"range(lower, upper)" restituisce una lista di numeri
+dal più piccolo (lower) al più grande (upper)
+stampa:
+    4
+    5
+    6
+    7
+"""
+for i in range(4, 8):
+    print i
+
+"""
+I cicli while vengono eseguiti finchè una condizione viene a mancare
+stampa:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print x
+    x += 1  # Forma compatta per x = x + 1
+
+# Gestisci le eccezioni con un blocco try/except
+
+# Funziona da Python 2.6 in su:
+try:
+    # Usa "raise" per generare un errore
+    raise IndexError("Questo è un errore di indice")
+except IndexError as e:
+    pass    # Pass è solo una non-operazione. Solitamente vorrai fare un recupero.
+except (TypeError, NameError):
+    pass    # Eccezioni multiple possono essere gestite tutte insieme, se necessario.
+else:   # Optional clause to the try/except block. Must follow all except blocks
+    print "All good!"   # Viene eseguita solo se il codice dentro try non genera eccezioni
+finally: #  Eseguito sempre
+    print "Possiamo liberare risorse qui"
+
+# Invece di try/finally per liberare risorse puoi usare il metodo with
+with open("myfile.txt") as f:
+    for line in f:
+        print line
+
+####################################################
+## 4. Funzioni
+####################################################
+
+# Usa "def" per creare nuove funzioni
+def aggiungi(x, y):
+    print "x è {0} e y è {1}".format(x, y)
+    return x + y    # Restituisce valori con il metodo return
+
+# Chiamare funzioni con parametri
+aggiungi(5, 6)   # => stampa "x è 5 e y è 6" e restituisce 11
+
+# Un altro modo per chiamare funzioni  è con parole chiave come argomenti
+aggiungi(y=6, x=5)   # Le parole chiave come argomenti possono arrivare in ogni ordine.
+
+
+# Puoi definire funzioni che accettano un numero variabile di argomenti posizionali
+# che verranno interpretati come come tuple se non usi il *
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3)   # => (1, 2, 3)
+
+
+# Puoi definire funzioni che accettano un numero variabile di parole chiave
+# come argomento, che saranno interpretati come un dizionario se non usi **
+def keyword_args(**kwargs):
+    return kwargs
+
+# Chiamiamola per vedere cosa succede
+keyword_args(big="foot", loch="ness")   # => {"big": "foot", "loch": "ness"}
+
+
+# Puoi farle entrambi in una volta, se ti va
+def all_the_args(*args, **kwargs):
+    print args
+    print kwargs
+"""
+all_the_args(1, 2, a=3, b=4) stampa:
+    (1, 2)
+    {"a": 3, "b": 4}
+"""
+
+# Quando chiami funzioni, puoi fare l'opposto di args/kwargs!
+# Usa * per sviluppare gli argomenti posizionale ed usa ** per espandere gli argomenti parola chiave
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+all_the_args(*args)   # equivalente a foo(1, 2, 3, 4)
+all_the_args(**kwargs)   # equivalente a foo(a=3, b=4)
+all_the_args(*args, **kwargs)   # equivalente a foo(1, 2, 3, 4, a=3, b=4)
+
+# puoi passare args e kwargs insieme alle altre funzioni che accettano args/kwargs
+# sviluppandoli, rispettivamente, con * e **
+def pass_all_the_args(*args, **kwargs):
+    all_the_args(*args, **kwargs)
+    print varargs(*args)
+    print keyword_args(**kwargs)
+
+# Funzioni Scope
+x = 5
+
+def setX(num):
+    # La variabile locale x non è uguale alla variabile globale x
+    x = num # => 43
+    print x # => 43
+
+def setGlobalX(num):
+    global x
+    print x # => 5
+    x = num # la variabile globable x è ora 6
+    print x # => 6
+
+setX(43)
+setGlobalX(6)
+
+# Python ha funzioni di prima classe
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3)   # => 13
+
+# Ci sono anche funzioni anonime
+(lambda x: x > 2)(3)   # => True
+
+# Esse sono incluse in funzioni di alto livello
+map(add_10, [1, 2, 3])   # => [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
+
+# Possiamo usare la comprensione delle liste per mappe e filtri
+[add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5]   # => [6, 7]
+
+
+####################################################
+## 5. Classi
+####################################################
+
+# Usiamo una sottoclasse da un oggetto per avere una classe.
+class Human(object):
+
+    # Un attributo della classe. E' condiviso da tutte le istanze delle classe
+    species = "H. sapiens"
+
+    # Costruttore base, richiamato quando la classe viene inizializzata.
+    # Si noti che il doppio leading e l'underscore finali denotano oggetti
+    # o attributi che sono usati da python ma che vivono nello spazio dei nome controllato
+    # dall'utente. Non dovresti usare nomi di questo genere.
+    def __init__(self, name):
+        # Assegna l'argomento all'attributo name dell'istanza
+        self.name = name
+
+    # Un metodo dell'istanza. Tutti i metodi prendo "self" come primo argomento
+    def say(self, msg):
+        return "{0}: {1}".format(self.name, msg)
+
+    # Un metodo della classe è condiviso fra tutte le istanze
+    # Sono chiamate con la classe chiamante come primo argomento
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # Un metodo statico è chiamato senza una classe od una istanza di riferimento
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+
+# Instanziare una classe
+i = Human(name="Ian")
+print i.say("hi")     # stampa "Ian: hi"
+
+j = Human("Joel")
+print j.say("hello")  # stampa "Joel: hello"
+
+# Chiamare metodi della classe
+i.get_species()   # => "H. sapiens"
+
+# Cambiare l'attributo condiviso
+Human.species = "H. neanderthalensis"
+i.get_species()   # => "H. neanderthalensis"
+j.get_species()   # => "H. neanderthalensis"
+
+# Chiamare il metodo condiviso
+Human.grunt()   # => "*grunt*"
+
+
+####################################################
+## 6. Moduli
+####################################################
+
+# Puoi importare moduli
+import math
+print math.sqrt(16)  # => 4
+
+# Puoi ottenere specifiche funzione da un modulo
+from math import ceil, floor
+print ceil(3.7)  # => 4.0
+print floor(3.7)   # => 3.0
+
+# Puoi importare tutte le funzioni da un modulo
+# Attenzione: questo non è raccomandato
+from math import *
+
+# Puoi abbreviare i nomi dei moduli
+import math as m
+math.sqrt(16) == m.sqrt(16)   # => True
+# puoi anche verificare che le funzioni sono equivalenti
+from math import sqrt
+math.sqrt == m.sqrt == sqrt  # => True
+
+# I moduli di Python sono normali file python. Ne puoi
+# scrivere di tuoi ed importarli. Il nome del modulo
+# è lo stesso del nome del file.
+
+# Potete scoprire quali funzioni e attributi
+# definiscono un modulo
+import math
+dir(math)
+
+
+####################################################
+## 7. Avanzate
+####################################################
+
+# Generators help you make lazy code
+def double_numbers(iterable):
+    for i in iterable:
+        yield i + i
+
+# Un generatore crea valori al volo.
+# Invece di generare e ritornare tutti i valori in una volta ne crea uno in ciascuna
+# iterazione.  Ciò significa che i valori più grandi di 15 non saranno considerati in
+# double_numbers.
+# Nota xrange è un generatore che fa la stessa cosa di range.
+# Creare una lista  1-900000000 occuperebbe molto tempo e spazio.
+# xrange crea un oggetto generatore xrange  invece di creare l'intera lista
+# come fa range.
+# Usiamo un underscore finale nel nome delle variabile quando vogliamo usare un nome
+# che normalmente colliderebbe con una parola chiave di python
+xrange_ = xrange(1, 900000000)
+
+# raddoppierà tutti i numeri fino a che result >=30 non sarà trovato
+for i in double_numbers(xrange_):
+    print i
+    if i >= 30:
+        break
+
+
+# Decoratori
+# in questo esempio beg include say
+# Beg chiamerà say. Se say_please è True allora cambierà il messaggio
+# ritornato
+from functools import wraps
+
+
+def beg(target_function):
+    @wraps(target_function)
+    def wrapper(*args, **kwargs):
+        msg, say_please = target_function(*args, **kwargs)
+        if say_please:
+            return "{} {}".format(msg, "Please! I am poor :(")
+        return msg
+
+    return wrapper
+
+
+@beg
+def say(say_please=False):
+    msg = "Can you buy me a beer?"
+    return msg, say_please
+
+
+print say()  # Can you buy me a beer?
+print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
+```
+
+## Ready For More?
+
+### Free Online
+
+* [Automate the Boring Stuff with Python](https://automatetheboringstuff.com)
+* [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+* [Dive Into Python](http://www.diveintopython.net/)
+* [The Official Docs](http://docs.python.org/2.6/)
+* [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
+* [Python Module of the Week](http://pymotw.com/2/)
+* [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
+* [First Steps With Python](https://realpython.com/learn/python-first-steps/)
+
+### Dead Tree
+
+* [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
+* [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
+* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)

From 59ce161978ccaad26f7e9c31721fd2af7f6df9c0 Mon Sep 17 00:00:00 2001
From: Whitebyte <pastuhov85@gmail.com>
Date: Thu, 15 Oct 2015 00:10:12 +0600
Subject: [PATCH 07/88] D language russian

---
 ru-ru/d-ru.html.markdown | 735 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 735 insertions(+)
 create mode 100644 ru-ru/d-ru.html.markdown

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
new file mode 100644
index 00000000..33bff3b7
--- /dev/null
+++ b/ru-ru/d-ru.html.markdown
@@ -0,0 +1,735 @@
+---
+language: d
+filename: learnd-ru.d
+contributors:
+    - ["Anton Pastukhov", "http://dprogramming.ru/"]
+    - ["Robert Brights-Gray", "http://lhs-blog.info/"]
+lang: ru-ru
+---
+D - современный компилируемый язык общего назначения с Си-подобным синтаксисом,
+который сочетает удобство, продуманный дизайн и высокую производительность.
+D - это С++, сделанный правильно.
+
+```d
+// Welcome to D! Это однострочный комментарий
+
+/* многострочный
+   комментарий  */
+
+/+
+    // вложенные кометарии
+
+    /* еще вложенные
+       комментарии */
+
+    /+
+        // мало уровней вложенности? Их может быть сколько угодно.
+    +/
++/
+
+/*
+    Имя модуля. Каждый файл с исходным кодом на D — модуль.
+    Если имя не указано явно, то предполагается, что оно совпадает с именем
+    файла. Например, для файла "test.d" имя модуля будет "test", если явно
+    не указать другое
+ */
+module app;
+
+// импорт модуля. Std — пространство имен стандартной библиотеки (Phobos)
+import std.stdio;
+
+// можно импортировать только нужные части, не обязательно модуль целиком
+import std.exception : assert;
+
+// точка входа в программу — функция main, аналогично C/C++
+void main()
+{
+    writeln("Hello, world!");
+}
+
+
+
+/*** типы и переменные ***/
+
+int a; // объявление переменной типа int (32 бита)
+float b = 12.34; // тип с плавающей точкой
+double с = 56.78; // тип с плавающей точкой (64 бита)
+
+/*
+    Численные типы в D, за исключением типов с плавающей точкой и типов
+    комплексных чисел, могут быть беззнаковыми.
+    В этом случае название типа начинается с префикса "u"
+*/
+uint d = 10, ulong e = 11.12;
+bool b = true; // логический тип
+char d = 'd';  // UTF-символ, 8 бит. D поддерживает UTF "из коробки"
+wchar = 'é';   // символ UTF-16
+dchar f;       // и даже UTF-32, если он вам зачем-то понадобится
+
+string s = "для строк есть отдельный тип, это не просто массив char-ов из Си";
+wstring ws = "поскольку у нас есть wchar, должен быть и  wstring";
+dstring ds = "...и dstring, конечно";
+
+typeof(a) b = 6; // typeof возвращает тип своего выражения.
+                 // В результате, b имеет такой же тип как и a
+
+// Тип переменной, помеченной ключевым словом auto,
+// присваивается компилятором исходя из значения этой переменной
+auto x = 1;              // Например, тип этой переменной будет int.
+auto y = 1.1;            // этой — double
+auto z = "Zed is dead!"; // а этой — string
+
+int[3] arr = [1, 2, 3]; // простой одномерный массив с фиксированным размером
+int[] arr2 = [1, 2, 3, 4]; // динамический массив
+int[string] aa = ["key1": 5, "key2": 6]; // ассоциативный массив
+
+/*
+   Cтроки и массивы в D — встроенные типы. Для их использования не нужно
+   подключать ни внешние, ни даже стандартную библиотеку, хотя в последней
+   есть множество дополнительных инструментов для работы с ними.
+ */
+immutalbe int ia = 10;  // неизменяемый тип,
+                        // обозначается ключевым словом immutable
+ia += 1;                // — вызовет ошибку на этапе компиляции
+
+// перечислимый (enumerable) тип,
+// более правильный способ работы с константами в D
+enum myConsts = { Const1, Const2, Const3 };
+
+// свойства типов
+writeln("Имя типа               : ", int.stringof); // int
+writeln("Размер в байтах        : ", int.sizeof);   // 4
+writeln("Минимальное значение   : ", int.min);      // -2147483648
+writeln("Максимальное значениеe : ", int.max);      // 2147483647
+writeln("Начальное значение     : ", int.init);     // 0. Это значение,
+                                                    // присвоенное по умолчанию
+
+// На самом деле типов в D больше, но все мы здесь описывать не будем,
+// иначе не уложимся в Y минут.
+
+
+
+/*** Приведение типов ***/
+
+// Простейший вариант
+int i;
+double j = double(i) / 2;
+
+// to!(имя типа)(выражение) - для большинства конверсий
+import std.conv : to; // функция "to" - часть стандартной библиотеки, а не языка
+double d = -1.75;
+short s = to!short(d); // s = -1
+
+/*
+   cast - если вы знаете, что делаете. Кроме того, это единственный способ 
+   преобразования типов-указателей в "обычные" и наоборот
+*/
+void* v;
+int* p = cast(int*)v;
+
+// Для собственного удобства можно создавать псевдонимы
+// для различных встроенных объектов
+alias int newInt; // теперь можно обращаться к int так, как будто бы это newInt
+newInt a = 5;
+
+alias newInt = int; // так тоже допустимо
+alias uint[2] pair; // дать псевдоним можно даже сложным структурам данных
+
+
+
+/*** Операторы ***/
+
+int x = 10; // присваивание
+x = x + 1;  // 11
+x -= 2;     // 9
+x++;        // 10
+++x;        // 11
+x *= 2;     // 22
+x /= 2;     // 11
+x ^^ 2;     // 121 (возведение в степень)
+x ^^= 2;    // 1331 (то же самое)
+
+string str1 = "Hello";
+string str2 = ", world!";
+string hw = str1 ~ str2; // Конкатенация строк
+
+int[] arr = [1, 2, 3];
+arr ~= 4; // [1, 2, 3, 4] - добавление элемента в конец массива
+
+
+
+/*** Логика и сравнения ***/
+
+int x = 0, int y = 1;
+
+x == y;         // false
+x > y;          // false
+x < y;          // true
+x >= y;         // false
+x != y;         // true. ! — логическое "не"
+x > 0 || x < 1; // true. || — логическое "или"
+x > 0 && x < 1; // false && — логическое "и"
+x ^ y           // true; ^ - xor (исключающее "или")
+
+// Тернарный оператор
+auto y = (x > 10) ? 1 : 0; // если x больше 10, то y равен 1,
+                           // в противном случае y равен нулю
+
+
+/***  Управляющие конструкции  ***/
+
+// if - абсолютно привычен
+if (a == 1) {
+    // ..
+} else if (a == 2) {
+    // ..
+} else {
+    // ..
+}
+
+// switch
+switch (a) {
+    case 1:
+        // делаем что-нибудь
+        break;
+    case 2:
+        // делаем что-нибудь другое
+        break;
+    case 3:
+        // делаем что-нибудь еще
+        break;
+    default:
+        // default обязателен, без него будет ошибка компиляции
+        break;
+}
+
+// while
+while (a > 10) {
+    // ..
+    if (number == 42) {
+        break;
+    }
+}
+
+while (true) {
+    // бесконечный цикл
+}
+
+// do-while
+do {
+    // ..
+} while (a == 10);
+
+// for
+for (int number = 1; number < 11; ++number) {
+    writeln(number); // все абсолютно стандартно
+}
+
+for ( ; ; ) {
+    // секции могут быть пустыми. Это бесконечный цикл в стиле Си
+}
+
+// foreach - универсальный и самый "правильный" цикл в D
+foreach (element; array) {
+    writeln(element); // для простых массивов
+}
+
+foreach (key, val; aa) {
+    writeln(key, ": ", val); // для ассоциативных массивов
+}
+
+foreach (c; "hello") {
+    writeln(c); // hello. Поскольку строки - это вариант массива,
+                // foreach применим и к ним
+}
+
+foreach (number; 10..15) {
+    writeln(number); // численные интервалы можно указывать явным образом
+}
+
+// foreach_reverse - в обратную сторону
+auto container = [ 1, 2, 3 ];
+foreach_reverse (element; container) {
+    writefln("%s ", element); // 3, 2, 1
+}
+
+// foreach в массивах и им подобных структурах не меняет сами структуры
+int[] a = [1,2,3,4,5];
+foreach (elem; array) {
+    elem *= 2; // сам массив останется неизменным
+}
+
+writeln(a); // вывод: [1,2,3,4,5] Т.е изменений нет
+
+// добавление ref приведет к тому, что массив будет изменяться
+foreach (ref elem; array) {
+    elem *= 2; // сам массив останется неизменным
+}
+
+writeln(a); // [2,4,6,8,10]
+
+// foreach умеет расчитывать индексы элементов
+int[] a = [1,2,3,4,5];
+foreach (ind, elem; array) {
+    writeln(ind, " ", elem); // через ind - доступен индекс элемента,
+                             // а через elem - сам элемент
+}
+
+
+
+/*** Функции ***/
+
+test(42); // Что, вот так сразу? Разве мы где-то уже объявили эту функцию?
+
+// Нет, вот она. Это не Си, здесь объявление функции не обязательно должно быть
+// до первого вызова
+int test(int argument) {
+    return argument * 2;
+}
+
+
+// В D используется унифицированныйй синтаксис вызова функций
+// (UFCS, Uniform Function Call Syntax), поэтому так тоже можно:
+int var = 42.test();
+
+// и даже так, если у функции нет аргументов:
+int var2 = 42.test;
+
+// можно выстраивать цепочки:
+int var3 = 42.test.test;
+
+/*
+    Аргументы в функцию передаются по значению (т. е.  функция работает не с
+    оригинальными значениями, переданными ей, а с их локальными копиями.
+    Исключение составляют объекты классов, которые передаются по ссылке.
+    Кроме того, любой параметр можно передать в функцию по ссылке с помощью
+    ключевого слова ref
+*/
+int var = 10;
+
+void fn1(int arg) {
+    arg += 1;
+}
+
+void fn2(ref int arg) {
+    arg += 1;
+}
+
+fn1(var); // var все еще = 10
+fn2(var); // теперь var = 11
+
+// Возвращаемое значение тоже может быть auto, 
+// если его можно "угадать" из контекста
+auto add(int x, int y) {
+    return x + y;
+}
+
+auto z = add(x, y); // тип int - компилятор вывел его автоматически
+
+// Значения аргументов по умолчанию
+float linearFunction(float k, float x, float b = 1)
+{
+    return k * x + b;
+}
+
+auto linear1 = linearFunction(0.5, 2, 3); // все аргументы используются
+auto linear2 = linearFunction(0.5, 2);    // один аргумент пропущен, но в функции
+                                          // он все равно использован и равен 1
+
+// допускается описание вложенных функций
+float quarter(float x) {
+    float doubled(float y) {
+        return y * y;
+    }
+
+    return doubled(doubled(x));
+}
+
+// функции с переменным числом аргументов
+int sum(int[] a...)
+{
+    int s = 0;
+    foreach (elem; a) {
+        s += elem;
+    }
+    return s;
+}
+
+auto sum1 = sum(1);
+auto sum2 = sum(1,2,3,4);
+
+/*
+   модификатор "in" перед аргументами функций говорит о том, что функция имеет
+    право их только просматривать. При попытке модификации такого аргумента
+    внутри функции - получите ошибку
+*/
+float printFloat(in float a)
+{
+    writeln(a);
+}
+printFloat(a); // использование таких функций - самое обычное
+
+// модификатор "out" позволяет вернуть из функции несколько результатов
+// без посредства глобальных переменных или массивов
+uint remMod(uint a, uint b, out uint modulus)
+{
+    uint remainder = a / b; 
+    modulus = a % b;
+    return remainder;
+}
+
+uint modulus;                   // пока в этой переменной ноль
+uint rem = remMod(5,2,modulus); // наша "хитрая" функция, и теперь,
+                                // в modulus - остаток от деления
+writeln(rem, " ", modulus);     // вывод: 2 1
+
+
+
+/*** Структуры, классы, базовое ООП ***/
+
+// Объявление структуры. Структуры почти как в Си
+struct MyStruct {
+    int a;
+    float b;
+
+    void multiply() {
+        return a * b;
+    }
+}
+
+MyStruct str1; // Объявление переменной с типом MyStruct
+str1.a = 10;   // Обращение к полю
+str1.b = 20;
+auto result = str1.multiply();  
+MyStruct str2 = {4, 8}          // Объявление + инициальзация  в стиле Си
+auto str3 = MyStruct(5, 10);    // Объявление + инициальзация  в стиле D
+
+
+// области видимости полей и методов - 3 способа задания
+struct MyStruct2 {
+    public int a;
+
+    private:
+        float b;
+        bool c;
+
+    protected {
+        float multiply() {
+            return a * b;
+        }
+    }
+    /*
+        в дополнение к знакомым public, private и protected, в D есть еще
+        область видимости "package". Поля и методы с этим атрибутам будут
+        доступны изо всех модулей, включенных в "пакет" (package), но не
+        за его пределами. package - это "папка", в которой может храниться
+        несколько модулей. Например, в "import.std.stdio", "std" - это
+        package, в котором есть модуль stdio (и еще множество других)
+    */
+    package:
+        string d;
+        
+    /* помимо этого, имеется еще один модификатор - export, который позволяет 
+    использовать объявленный с ним идентификатор даже вне самой программы !
+    */
+    export:
+         string description;
+}
+
+// Конструкторы и деструкторы
+struct MyStruct3 {
+    this() { // конструктор. Для структур его не обязательно указывать явно,
+             // в этом случае пустой конструктор добавляется компилятором
+        writeln("Hello, world!");
+    }
+    
+    
+    // а вот это конструкция, одна из интересных идиом и представлет собой 
+    // конструктор копирования, т.е конструктор возвращающий копию структуры.
+    // Работает только в структурах.
+    this(this)
+    {
+        return this;
+    }
+
+    ~this() { // деструктор, также необязателен
+        writeln("Awww!");
+    }
+}
+
+// Объявление простейшего класса
+class MyClass {
+    int a;  // в D по умолчанию данные-члены являются public
+    float b;
+}
+
+auto mc = new MyClass(); // ...и создание его экземпляра
+auto mc2 = new MyClass; // ... тоже сработает
+
+// Конструктор
+class MyClass2 {
+    int a;
+    float b;
+
+    this(int a, float b) {
+        this.a = a; // ключевое слово "this" - ссылка на объект класса
+        this.b = b;
+    }
+}
+
+auto mc2 = new MyClass2(1, 2.3);
+
+// Классы могут быть вложенными
+class Outer
+{
+    int m;
+
+    class Inner
+    {
+        int foo()
+        {
+            return m; // можно обращаться к полям "родительского" класса
+        }
+    }
+}
+
+// наследование
+class Base {
+    int a = 1;
+    float b = 2.34;
+    
+    
+    // это статический метод, т.е метод который можно вызывать обращаясь
+    // классу напрямую, а не через создание экземпляра объекта
+    static void multiply(int x, int y)
+    {
+        writeln(x * y);
+    }
+}
+
+Base.multiply(2, 5); // используем статический метод. Результат: 10
+
+class Derived : Base {
+    string c = "Поле класса - наследника";
+    
+    
+    // override означает то, что наследник предоставит свою реализацию метода,
+    // переопределив метод базового класса
+    override static void multiply(int x, int y)
+    {
+        super.multiply(x, y);  // super - это ссылка на класс-предок или базовый класс
+        writeln(x * y * 2);
+    }
+}
+
+auto mc3 = new Derived();
+writeln(mc3.a); // 1
+writeln(mc3.b); // 2.34
+writeln(mc3.c); // Поле класса - наследника
+
+// Финальный класс, наследовать от него нельзя
+// кроме того, модификатор final работает не только для классов, но и для методов
+// и даже для модулей !
+final class FC {
+    int a;
+}
+
+class Derived : FC { // это вызовет ошибку
+    float b;
+}
+
+// Абстрактный класс не можен быть истанциирован, но может иметь наследников
+abstract class AC {
+    int a;
+}
+
+auto ac = new AC(); // это вызовет ошибку
+
+class Implementation : AC {
+    float b;
+    
+     // final перед методом нефинального класса означает запрет возможности 
+     // переопределения метода
+    final void test()
+    {
+       writeln("test passed !");
+    }
+}
+
+auto impl = new Implementation(); // ОК
+
+
+
+/*** Микшины (mixins) ***/
+
+// В D можно вставлять код как строку, если эта строка известна на этапе
+// компиляции. Например:
+void main() {
+   mixin(`writeln("Hello World!");`);
+}
+
+// еще пример
+string print(string s) {
+   return `writeln("` ~ s ~ `");`;
+}
+
+void main() {
+   mixin (print("str1"));
+   mixin (print("str2"));
+}
+
+
+
+/*** Шаблоны ***/
+
+/*
+    Шаблон функции. Эта функция принимает аргументы разеых типов, которые
+    подсталяются вместо T на этапе компиляции. "T" - это не специальный
+    символ, а просто буква. Вместо "T" может быть любое слово, кроме ключевого.
+ */
+void print(T)(T value) {
+   writefln("%s", value);
+}
+
+void main() {
+   print(42);     // В одну и ту же функцию передается: целое
+   print(1.2);    // ...число с плавающей точкой,
+   print("test"); // ...строка
+}
+
+// "Шаблонных" параметров может быть сколько угодно
+void print(T1, T2)(T1 value1, T2 value2) {
+   writefln(" %s %s", value1, value2);
+}
+
+void main() {
+   print(42, "Test");
+   print(1.2, 33);
+}
+
+// Шаблон класса
+class Stack(T)
+{
+    private:
+        T[] elements;
+
+    public:
+        void push(T element) {
+            elements ~= element;
+        }
+
+        void pop() {
+            --elements.length;
+        }
+
+        T top() const @property {
+            return elements[$ - 1];
+        }
+
+        size_t length() const @property {
+            return elements.length;
+        }
+}
+
+void main() {
+    /*
+        восклицательный знак - признак шаблона В данном случае мы создаем 
+        класс и указывем, что "шаблонное" поле будет иметь тип string
+    */
+   auto stack = new Stack!string;
+
+   stack.push("Test1");
+   stack.push("Test2");
+
+   writeln(stack.top);
+   writeln(stack.length);
+
+   stack.pop;
+   writeln(stack.top);
+   writeln(stack.length);
+}
+
+
+
+/*** Диапазоны (ranges) ***/
+
+/*
+   Диапазоны - это абстракция, которая позволяет легко использовать разные
+   алгоритмы с разными структурами данных. Вместо того, чтобы определять свои
+   уникальные алгоритмы для каждой структуры, мы можем просто указать для нее
+   несколько единообразных функций, определяющих, _как_ мы получаем доступ
+   к элементам контейнера, вместо того, чтобы описывать внутреннее устройство
+   этого контейнера. Сложно? На самом деле не очень.
+*/
+
+/*
+    Простейший вид диапазона - Input Range. Для того, чтобы превратить любой
+    контейнер в Input Range, достаточно реализовать для него 3 метода:
+    - empty - проверяет, пуст ли контейнер
+    - front - дает доступ к первому элементу контейнера
+    - popFront - удаляет из контейнера первый элемент
+*/
+struct Student
+{
+    string name;
+    int number;
+    string toString() {
+        return format("%s(%s)", name, number);
+    }
+}
+
+struct School
+{
+    Student[] students;
+}
+
+struct StudentRange
+{
+    Student[] students;
+
+    this(School school) {
+        this.students = school.students;
+    }
+
+    bool empty() {
+        return students.length == 0;
+    }
+
+    ref Student front() {
+        return students[0];
+    }
+
+    void popFront() {
+        students = students[1 .. $];
+    }
+}
+
+void main(){
+    auto school = School([
+            Student("Mike", 1), 
+            Student("John", 2) , 
+            Student("Dan", 3)
+    ]);
+    auto range = StudentRange(school);
+    writeln(range);                     // [Mike(1), John(2), Dan(3)]
+    writeln(school.students.length);    // 3
+    writeln(range.front());             // Mike(1)
+    range.popFront();
+    writeln(range.empty());             // false
+    writeln(range);                     // [John(2), Dan(3)]
+}
+/*
+   Смысл в том, что нам не так уж важно внутреннее устройство контейнера, если
+   у нас есть унифицированные методы доступа к его элементам.
+   Кроме Input Range в D есть и другие типы диапазонов, которые требуют
+   реализации большего числа методов, зато дают больше контроля. Это большая
+   тема и мы не будем в подробностях освещать ее здесь.
+
+   Диапазоны - это важная часть D, они используются в нем повсеместно.
+*/
+```
+## Что дальше?
+
+[Официальный сайт](http://dlang.org/)
+[Онлайн-книга](http://ddili.org/ders/d.en/)
+[Официальная вики](http://wiki.dlang.org/)

From c3387b8a611b6fbb00ac8d54102b772d44d3eca2 Mon Sep 17 00:00:00 2001
From: Andrew Backes <backes.andrew@gmail.com>
Date: Sun, 18 Oct 2015 22:32:14 -0500
Subject: [PATCH 08/88] [typescript/en] Template Strings

---
 typescript.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/typescript.html.markdown b/typescript.html.markdown
index e9135510..101bb5dc 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -159,6 +159,10 @@ var tuple = pairToTuple({ item1:"hello", item2:"world"});
 // Including references to a definition file:
 /// <reference path="jquery.d.ts" />
 
+// Template Strings
+var name = 'Tyrone';
+var greeting = `Hi ${name}, how are you?`
+
 ```
 
 ## Further Reading

From 525b6106a57baa570734e29b43f861cd8cc5de3a Mon Sep 17 00:00:00 2001
From: Andrew Backes <backes.andrew@gmail.com>
Date: Sun, 18 Oct 2015 22:38:56 -0500
Subject: [PATCH 09/88] [typescript/en] Multiline Strings

Multiline Strings via Template Strings
---
 typescript.html.markdown | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/typescript.html.markdown b/typescript.html.markdown
index 101bb5dc..61b0fdb8 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -159,9 +159,13 @@ var tuple = pairToTuple({ item1:"hello", item2:"world"});
 // Including references to a definition file:
 /// <reference path="jquery.d.ts" />
 
-// Template Strings
+// Template Strings (strings that use backtics)
+// String Intepolation with Template Strings
 var name = 'Tyrone';
 var greeting = `Hi ${name}, how are you?`
+// Multiline Strings with Template Strings
+var multiline = `This is an example
+of a multiline string`;
 
 ```
 

From 998e76c310422e0946431b036eb7de03a9384e74 Mon Sep 17 00:00:00 2001
From: Andrew Backes <backes.andrew@gmail.com>
Date: Mon, 19 Oct 2015 08:09:58 -0500
Subject: [PATCH 10/88] [typescript/en] Typo fixed in 'backticks'

---
 typescript.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typescript.html.markdown b/typescript.html.markdown
index 61b0fdb8..17c56e7a 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -159,7 +159,7 @@ var tuple = pairToTuple({ item1:"hello", item2:"world"});
 // Including references to a definition file:
 /// <reference path="jquery.d.ts" />
 
-// Template Strings (strings that use backtics)
+// Template Strings (strings that use backticks)
 // String Intepolation with Template Strings
 var name = 'Tyrone';
 var greeting = `Hi ${name}, how are you?`

From 5ca38bf934801c9e85e25e19842a6f84ebe6efa0 Mon Sep 17 00:00:00 2001
From: Andrew Backes <backes.andrew@gmail.com>
Date: Mon, 19 Oct 2015 10:40:57 -0500
Subject: [PATCH 11/88] [typescript/en] Fixing typo in 'Interpolation'

---
 typescript.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typescript.html.markdown b/typescript.html.markdown
index 17c56e7a..20974304 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -160,7 +160,7 @@ var tuple = pairToTuple({ item1:"hello", item2:"world"});
 /// <reference path="jquery.d.ts" />
 
 // Template Strings (strings that use backticks)
-// String Intepolation with Template Strings
+// String Interpolation with Template Strings
 var name = 'Tyrone';
 var greeting = `Hi ${name}, how are you?`
 // Multiline Strings with Template Strings

From 7c15eaefcdfe21809ebab893f6d8d6321188abf1 Mon Sep 17 00:00:00 2001
From: Chaitya Shah <chaityabshah@users.noreply.github.com>
Date: Tue, 20 Oct 2015 11:45:58 -0400
Subject: [PATCH 12/88] Fix Spacing Inconsistency

Fix spacing inconsistency in PennyFarthing Constructor
---
 java.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java.html.markdown b/java.html.markdown
index 38c9e490..a78aa9fc 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -519,7 +519,7 @@ class PennyFarthing extends Bicycle {
     // (Penny Farthings are those bicycles with the big front wheel.
     // They have no gears.)
 
-    public PennyFarthing(int startCadence, int startSpeed){
+    public PennyFarthing(int startCadence, int startSpeed) {
         // Call the parent constructor with super
         super(startCadence, startSpeed, 0, "PennyFarthing");
     }

From 4b0dda63b31873fad1b038c1db4745aaa20756cf Mon Sep 17 00:00:00 2001
From: Zane Sterling <sterling.zane@gmail.com>
Date: Sun, 25 Oct 2015 12:55:50 -0400
Subject: [PATCH 13/88] Fix typo in README.md

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 94afbcbe..092785f8 100644
--- a/README.markdown
+++ b/README.markdown
@@ -51,7 +51,7 @@ Long version:
 ### Header configuration
 
 The actual site uses Middleman to generate HTML files from these Markdown ones. Middleman, or at least
-the custom scripts underpinning the site, required that some key information be defined in the header.
+the custom scripts underpinning the site, requires that some key information be defined in the header.
 
 The following fields are necessary for English articles about programming languages:
 

From e60a7d73e846e683bd4345cff4d1a514beab5b91 Mon Sep 17 00:00:00 2001
From: jxu093 <jxu093@gmail.com>
Date: Sun, 25 Oct 2015 22:19:40 -0400
Subject: [PATCH 14/88] Added Python Resource

---
 python.html.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python.html.markdown b/python.html.markdown
index 42a52bcf..254235ab 100644
--- a/python.html.markdown
+++ b/python.html.markdown
@@ -712,6 +712,7 @@ print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
 * [Python Module of the Week](http://pymotw.com/2/)
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 * [First Steps With Python](https://realpython.com/learn/python-first-steps/)
+* [Fullstack Python](https://www.fullstackpython.com/)
 
 ### Dead Tree
 

From 5acb0c1a604d468af2cd651229866c48ed7c4e24 Mon Sep 17 00:00:00 2001
From: Bruno Volcov <volcov.bruno@gmail.com>
Date: Mon, 26 Oct 2015 17:23:27 -0200
Subject: [PATCH 15/88] add a cool reference for learn Ruby =)

---
 ruby.html.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruby.html.markdown b/ruby.html.markdown
index c10255d8..b3ef2a4d 100644
--- a/ruby.html.markdown
+++ b/ruby.html.markdown
@@ -13,6 +13,7 @@ contributors:
   - ["Levi Bostian", "https://github.com/levibostian"]
   - ["Rahil Momin", "https://github.com/iamrahil"]
   - ["Gabriel Halley", https://github.com/ghalley]
+  - ["Bruno Volcov", https://github.com/volcov]
 
 ---
 
@@ -285,7 +286,7 @@ end
 #=> iteration 4
 #=> iteration 5
 
-# There are a bunch of other helpful looping functions in Ruby, 
+# There are a bunch of other helpful looping functions in Ruby,
 # for example "map", "reduce", "inject", the list goes on. Map,
 # for instance, takes the array it's looping over, does something
 # to it as defined in your block, and returns an entirely new array.
@@ -576,3 +577,4 @@ Something.new.qux # => 'qux'
 - [Ruby from other languages](https://www.ruby-lang.org/en/documentation/ruby-from-other-languages/)
 - [Programming Ruby](http://www.amazon.com/Programming-Ruby-1-9-2-0-Programmers/dp/1937785491/) - An older [free edition](http://ruby-doc.com/docs/ProgrammingRuby/) is available online.
 - [Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide) - A community-driven Ruby coding style guide.
+- [Try Ruby](http://tryruby.org) - Learn the basic of Ruby programming language, interactive in the browser.

From 69efce9e8340216164b8aeae3af72994fae64582 Mon Sep 17 00:00:00 2001
From: Juuso Mikkonen <juuso.mikkonen@aalto.fi>
Date: Mon, 26 Oct 2015 22:33:53 +0200
Subject: [PATCH 16/88] [scala/eng] Added Java import to misc

---
 scala.html.markdown | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scala.html.markdown b/scala.html.markdown
index 192e03d7..166285f2 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -606,6 +606,9 @@ import scala.collection.immutable.{List => ImmutableList}
 // Import all classes, except some. The following excludes Map and Set:
 import scala.collection.immutable.{Map => _, Set => _, _}
 
+// Java classes can also be imported. Scala syntax can be used
+import java.swing.{JFrame, JWindow}
+
 // Your programs entry point is defined in an scala file using an object, with a
 // single method, main:
 object Application {

From 3b1940b9cc9c0e46a9275b2ae64e4c5996d7de75 Mon Sep 17 00:00:00 2001
From: Alex Luehm <luehm@me.com>
Date: Wed, 28 Oct 2015 17:45:31 -0500
Subject: [PATCH 17/88] [C/en] Added tidbit about fall-though in switch
 statements.

Another pitfall, as not all languages have fall-through in switches.
---
 c.html.markdown | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/c.html.markdown b/c.html.markdown
index 3d632eab..2a5e460f 100644
--- a/c.html.markdown
+++ b/c.html.markdown
@@ -76,7 +76,7 @@ int main (int argc, char** argv)
   ///////////////////////////////////////
   // Types
   ///////////////////////////////////////
-  
+
   // All variables MUST be declared at the top of the current block scope
   // we declare them dynamically along the code for the sake of the tutorial
 
@@ -318,6 +318,12 @@ int main (int argc, char** argv)
   case 1:
     printf("Huh, 'a' equals 1!\n");
     break;
+    // Be careful - without a "break", execution continues until the
+    // next "break" is reached.
+  case 3:
+  case 4:
+    printf("Look at that.. 'a' is either 3, or 4\n");
+    break;
   default:
     // if `some_integral_expression` didn't match any of the labels
     fputs("error!\n", stderr);
@@ -345,8 +351,8 @@ int main (int argc, char** argv)
   https://ideone.com/GuPhd6
   this will print out "Error occured at i = 52 & j = 99."
   */
-  
-  
+
+
   ///////////////////////////////////////
   // Typecasting
   ///////////////////////////////////////
@@ -445,7 +451,7 @@ int main (int argc, char** argv)
   for (xx = 0; xx < 20; xx++) {
     *(my_ptr + xx) = 20 - xx; // my_ptr[xx] = 20-xx
   } // Initialize memory to 20, 19, 18, 17... 2, 1 (as ints)
-  
+
   // Note that there is no standard way to get the length of a
   // dynamically allocated array in C. Because of this, if your arrays are
   // going to be passed around your program a lot, you need another variable
@@ -721,13 +727,13 @@ typedef void (*my_fnp_type)(char *);
 
 /******************************* Header Files **********************************
 
-Header files are an important part of c as they allow for the connection of c 
-source files and can simplify code and definitions by seperating them into 
+Header files are an important part of c as they allow for the connection of c
+source files and can simplify code and definitions by seperating them into
 seperate files.
 
-Header files are syntaxtically similar to c source files but reside in ".h" 
-files. They can be included in your c source file by using the precompiler 
-command #include "example.h", given that example.h exists in the same directory 
+Header files are syntaxtically similar to c source files but reside in ".h"
+files. They can be included in your c source file by using the precompiler
+command #include "example.h", given that example.h exists in the same directory
 as the c file.
 */
 

From 54c67dfb38d1bb2a9dc004b3244d2ae3102107f3 Mon Sep 17 00:00:00 2001
From: bk2dcradle <ankitsultana@gmail.com>
Date: Thu, 29 Oct 2015 22:13:24 +0530
Subject: [PATCH 18/88] [c++] Added Lambda Expressions and Range for

---
 c++.html.markdown | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/c++.html.markdown b/c++.html.markdown
index d03092e5..6033ca06 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -801,6 +801,106 @@ void doSomethingWithAFile(const std::string& filename)
 //   all automatically destroy their contents when they fall out of scope.
 // - Mutexes using lock_guard and unique_lock
 
+///////////////////////////////////////
+// Lambda Expressions (C++11 and above)
+///////////////////////////////////////
+
+// lambdas are a convenient way of defining an anonymous function
+// object right at the location where it is invoked or passed as 
+// an argument to a function.
+
+// Example consider sorting a vector of pairs using the second 
+// value of the pair
+
+vector<pair<int, int> > tester;
+tester.push_back(make_pair(3, 6));
+tester.push_back(make_pair(1, 9));
+tester.push_back(make_pair(5, 0));
+
+// Pass a lambda expression as third argument to the sort function
+// sort is from the <algorithm> header
+
+sort(tester.begin(), tester.end(), [](const pair<int, int> &lhs, const pair<int, int> &rhs) {
+		return lhs.second < rhs.second;
+	});
+
+// Notice the syntax of the lambda expression,
+// [] in the lambda is used to "capture" variables.
+// For Example:
+
+vector<int> dog_ids;
+// number_of_dogs = 3;
+for(int i = 0; i < 3; i++){
+	dog_ids.push_back(i);  
+}
+
+int weight[3];
+weight[0] = 30, weight[1] = 50, weight[2] = 10;
+
+// Say you want to sort dog_ids according to the dogs' weights
+// So dog_ids should in the end become: [2, 0, 1]
+
+// Here's where lambda expressions come in handy
+
+sort(dog_ids.begin(), dog_ids.end(), [weight](const int &lhs, const int &rhs) {
+		return weight[lhs] < weight[rhs];
+	});
+// Note we captured "weight" in the above example.
+
+// lambda are really useful for the case of structs
+// You can use lambda expressions instead of overloading
+// the "<" operator
+
+struct dog{
+	int weight, age;
+}dogs[3];
+
+dogs[0].weight = 30, dogs[0].age = 4;
+dogs[1].weight = 40, dogs[1].age = 10;
+dogs[2].weight = 20, dogs[2].age = 9;
+
+// Say I want to sort the dogs array by the dogs' weights
+
+sort(dogs, dogs+3, [](const dog &lhs, const dog &rhs) {
+		return lhs.weight < rhs.weight;
+	});
+// dogs is now sorted according to their weight
+
+// Do something with the dogs
+
+// Now I want to sort the dogs by in descending order of their age
+
+sort(dogs, dogs+3, [](const dog &lhs, const dog &rhs) {
+		return lhs.age > rhs.age;
+	});
+// dogs is now sorted in descending order of their age
+
+
+///////////////////////////////
+// Range For (C++11 and above)
+///////////////////////////////
+
+// You can use a range for loop to iterate over a container
+int arr[] = {1, 10, 3};
+
+for(int elem: arr){
+	cout<<elem<<'\n';  
+}
+
+// You can use "auto" and not worry about the type of the elements of the container
+// Caveat: Don't assign inside the range for loop
+// For example:
+
+for(auto elem: arr) {
+	elem = -1;  
+}
+
+// "arr" remains unchanged
+
+// Why doesn't it change?
+// What actually is happening is that the value of "arr[i]" is stored in 
+// the variable "elem" in every iteration. So assigning "elem" doesn't assign "arr[i]".
+// For more, checkout: http://en.cppreference.com/w/cpp/language/range-for
 
 /////////////////////
 // Fun stuff

From d94d88cd2031b7322c2c2886fa54b26ef1c461be Mon Sep 17 00:00:00 2001
From: Michal Martinek <martinek8@gmail.com>
Date: Thu, 29 Oct 2015 19:21:48 +0100
Subject: [PATCH 19/88] Czech translation for Sass

---
 cs-cz/sass.html.markdown | 439 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 439 insertions(+)
 create mode 100644 cs-cz/sass.html.markdown

diff --git a/cs-cz/sass.html.markdown b/cs-cz/sass.html.markdown
new file mode 100644
index 00000000..e890debe
--- /dev/null
+++ b/cs-cz/sass.html.markdown
@@ -0,0 +1,439 @@
+---
+language: sass
+filename: learnsass.scss
+contributors:
+  - ["Laura Kyle", "https://github.com/LauraNK"]
+  - ["Sean Corrales", "https://github.com/droidenator"]
+translators:
+  - ["Michal Martinek", "https://github.com/MichalMartinek"]
+
+---
+
+Sass je rozšíření jazyka CSS, který přidává nové vlastnosti jako proměnné, zanořování, mixiny a další.
+Sass (a další preprocesory, jako  [Less](http://lesscss.org/)) pomáhají vývojářům psát udržovatelný a neopakující (DRY) kód.
+
+Sass nabízí dvě možnosti syntaxe. SCSS, které je stejná jako CSS, akorát obsahuje nové vlastnosti Sassu. Nebo Sass, který používá odsazení místo složených závorek a středníků.
+Tento tutoriál bude používat syntaxi CSS.
+
+
+Pokud jste již obeznámeni s CSS3, budete schopni používat Sass relativně rychle. Nezprostředkovává nějaké úplně nové stylové možnosti, spíše nátroje, jak psát Vás CSS kód více efektivně, udržitelně a jednoduše.
+
+```scss
+
+
+//Jednořádkové komentáře jsou ze Sassu při kompilaci vymazány
+
+/*Víceřádkové komentáře jsou naopak zachovány */
+
+
+
+/*Proměnné
+==============================*/
+
+
+
+/* Můžete uložit CSS hodnotu (jako třeba barvu) do proměnné.
+Použijte symbol '$' k jejímu vytvoření. */
+
+$hlavni-barva: #A3A4FF;
+$sekundarni-barva: #51527F;
+$body-font: 'Roboto', sans-serif;
+
+/* Můžete používat proměnné napříč vaším souborem.
+Teď, když chcete změnit barvu, stačí ji změnit pouze jednou.*/
+
+body {
+	background-color: $hlavni-barva;
+	color: $sekundarni-barva;
+	font-family: $body-font;
+}
+
+/* Toto se zkompiluje do: */
+body {
+	background-color: #A3A4FF;
+	color: #51527F;
+	font-family: 'Roboto', sans-serif;
+}
+
+
+/* Toto je o hodně více praktické, než měnit každý výskyt barvy.  */
+
+
+
+/*Mixiny
+==============================*/
+
+
+
+/* Pokud zjistíte, že píšete kód pro více než jeden element, můžete jej uložit do mixinu.
+
+Použijte '@mixin' direktivu, plus jméno vašeho mixinu.*/
+
+@mixin na-stred {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	left: 0;
+	right: 0;
+}
+
+/* Mixin vložíte pomocí '@include' a jména mixinu */
+
+div {
+	@include na-stred;
+	background-color: $hlavni-barva;
+}
+
+/*Což se zkompiluje do: */
+div {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	left: 0;
+	right: 0;
+	background-color: #A3A4FF;
+}
+
+
+/* Můžete využít mixiny i třeba pro takovéto ušetření práce: */
+
+@mixin velikost($sirka, $vyska) {
+	width: $sirka;
+	height: $vyska;
+}
+
+/*Stačí vložit argumenty: */
+
+.obdelnik {
+	@include velikost(100px, 60px);
+}
+
+.ctverec {
+	@include velikost(40px, 40px);
+}
+
+/* Toto se zkompiluje do: */
+.obdelnik {
+  width: 100px;
+  height: 60px;
+}
+
+.ctverec {
+  width: 40px;
+  height: 40px;
+}
+
+
+
+/*Funkce
+==============================*/   
+
+
+
+/* Sass obsahuje funkce, které vám pomůžou splnit různé úkoly. */
+
+/* Funkce se spouštějí pomocí jejich jména, které následuje seznam argumentů uzavřený v kulatých závorkách. */
+body {
+  width: round(10.25px);    
+}
+
+.footer {
+  background-color: fade_out(#000000, 0.25)
+}
+
+/* Se zkompiluje do: */
+
+body {
+  width: 10px;
+}
+
+.footer {
+  background-color: rgba(0, 0, 0, 0.75);
+}   
+
+/* Můžete také definovat vlastní funkce. Funkce jsou velmi podobné mixinům.
+   Když se snažíte vybrat mezi funkcí a mixinem, mějte na paměti, že mixiny
+   jsou lepší pro generování CSS kódu, zatímco funkce jsou lepší pro logiku.
+   Příklady ze sekce Matematické operátory jsou skvělí kandidáti na
+   znovupoužitelné funkce. */
+
+/* Tato funkce vrací poměr k velikosti rodiče v procentech.
+@function vypocitat-pomer($velikost, $velikost-rodice) {
+  @return $velikost / $velikost-rodice * 100%;
+}
+
+$hlavni obsah: vypocitat-pomer(600px, 960px);
+
+.hlavni-obsah {
+  width: $hlavni-obsah;
+}
+
+.sloupec {
+  width: vypocitat-pomer(300px, 960px);
+}
+
+/* Zkompiluje do: */
+
+.hlavni-obsah {
+  width: 62.5%;
+}
+
+.sloupec {
+  width: 31.25%;
+}
+
+
+
+/*Dědění
+==============================*/
+
+
+
+/*Dědění je způsob jak používat vlastnosti pro jeden selektor ve druhém. */
+
+.oznameni {
+	@include velikost(5em, 5em);
+	border: 5px solid $sekundarni-barva;
+}
+
+.oznameni-uspech {
+	@extend .oznameni;
+	border-color: #22df56;
+}
+
+/* Zkompiluje do: */
+.oznameni, .oznameni-uspech {
+  width: 5em;
+  height: 5em;
+  border: 5px solid #51527F;
+}
+
+.oznameni-uspech {
+  border-color: #22df56;
+}
+
+
+/* Dědění CSS výrazů je preferováno před vytvořením mixinu kvůli způsobu,
+   jakým způsobem Sass dává dohromady třídy, které sdílejí stejný kód.
+   Kdyby to bylo udělané pomocí mixinu, tak výška, šířka, rámeček by byl v
+   každém výrazu, který by volal mixin. I když tohle neovlivní vaše workflow,
+   přidá to kód navíc do souborů. */
+
+
+/*Zanořování
+==============================*/
+
+
+
+/*Sass vám umožňuje zanořovat selektory do selektorů */
+
+ul {
+	list-style-type: none;
+	margin-top: 2em;
+
+	li {
+		background-color: #FF0000;
+	}
+}
+
+/* '&' nahradí rodičovský element. */
+/* Můžete také zanořovat pseudo třídy. */
+/* Pamatujte, že moc velké zanoření do hloubky snižuje čitelnost.
+   Doporučuje se používat maximálně trojité zanoření.
+   Na příklad: */
+
+ul {
+	list-style-type: none;
+	margin-top: 2em;
+
+	li {
+		background-color: red;
+
+		&:hover {
+		  background-color: blue;
+		}
+
+		a {
+		  color: white;
+		}
+	}
+}
+
+/* Zkompiluje do: */
+
+ul {
+  list-style-type: none;
+  margin-top: 2em;
+}
+
+ul li {
+  background-color: red;
+}
+
+ul li:hover {
+  background-color: blue;
+}
+
+ul li a {
+  color: white;
+}
+
+
+
+/*Částečné soubory a importy
+==============================*/   
+
+
+
+/* Sass umožňuje vytvářet částečné soubory. Tyto soubory pomahájí udržovat váš
+   kód modulární. Tyto soubory by měli začínat vždy '_', např. _reset.css.
+   Částečné soubory se nepřevádí do CSS. */
+
+/* Toto je kód, který si uložíme do souboru _reset.css */
+
+html,
+body,
+ul,
+ol {
+  margin: 0;
+  padding: 0;
+}
+
+/* Sass obsahuje @import, které může být použit pro import částečných souborů.
+   Toto se liší od klasického CSS @import, který dělá HTTP požadavek na stáhnutí
+   souboru. Sass vezme importovaný soubor a vloží ho do kompilovaného kódu. */
+
+@import 'reset';
+
+body {
+  font-size: 16px;
+  font-family: Helvetica, Arial, Sans-serif;
+}
+
+/* Zkompiluje do: */
+
+html, body, ul, ol {
+  margin: 0;
+  padding: 0;
+}   
+
+body {
+  font-size: 16px;
+  font-family: Helvetica, Arial, Sans-serif;
+}
+
+
+
+/*Zástupné selektory
+==============================*/  
+
+
+
+/* Zástupné selektory jsou užitečné, když vytváříte CSS výraz, ze kterého
+   chcete později dědit. Když chcete vytvořit výraz, ze kterého je možné pouze
+   dědit pomocí @extend, vytvořte zástupný selektor s CSS výrazem. Ten začíná
+   symbolem '%' místo '.' nebo '#'. Tyto výrazy se neobjeví ve výsledném CSS */
+
+%okno-obsahu {
+  font-size: 14px;
+  padding: 10px;
+  color: #000;
+  border-radius: 4px;
+}
+
+.okno-zpravy {
+  @extend %okno-obsahu;
+  background-color: #0000ff;
+}
+
+/* Zkompiluje do: */
+
+.okno-zpravy {
+  font-size: 14px;
+  padding: 10px;
+  color: #000;
+  border-radius: 4px;
+}
+
+.okno-zpravy {
+  background-color: #0000ff;
+}
+
+
+
+/*Matematické operace
+==============================*/   
+
+
+
+/* Sass obsahuje následující operátory: +, -, *, /, and %. Tyto operátory
+   můžou být velmi užitečné pro počítání hodnot přímo ve vašem souboru Sass.
+   Níže je příklad, jak udělat jednoduchý dvousloupcový layout. */
+
+$oblast-obsahu: 960px;
+$hlavni-obsah: 600px;
+$vedlejsi-sloupec: 300px;
+
+$obsah-velikost: $hlavni-obsah / $oblast-obsahu * 100%;
+$vedlejsi-sloupec-velikost: $vedlejsi-sloupec / $oblast-obsahu * 100%;
+$zbytek-velikost: 100% - ($main-size + $vedlejsi-sloupec-size);
+
+body {
+  width: 100%;
+}
+
+.hlavni-obsah {
+  width: $obsah-velikost;
+}
+
+.vedlejsi-sloupec {
+  width: $vedlejsi-sloupec-velikost;
+}
+
+.zbytek {
+  width: $zbytek-velikost;
+}
+
+/* Zkompiluje do: */
+
+body {
+  width: 100%;
+}
+
+.hlavni-obsah {
+  width: 62.5%;
+}
+
+.vedlejsi-sloupec {
+  width: 31.25%;
+}
+
+.gutter {
+  width: 6.25%;
+}
+
+
+```
+
+
+
+## SASS nebo Sass?
+Divili jste se někdy, jestli je Sass zkratka nebo ne? Pravděpodobně ne, ale řeknu vám to stejně. Jméno tohoto jazyka je slovo, "Sass", a ne zkratka.
+Protože to lidé konstatně píší jako "SASS", nazval ho autor jazyka jako "Syntactically Awesome StyleSheets" (Syntaktický úžasně styly).
+
+
+## Procvičování Sassu
+Pokud si chcete hrát se Sassem ve vašem prohlížeči, navštivte [SassMeister](http://sassmeister.com/).
+Můžete používát oba dva způsoby zápisu, stačí si vybrat v nastavení SCSS nebo SASS.
+
+
+## Kompatibilita
+
+Sass může být použit v jakémkoliv projektu, jakmile máte program, pomocí kterého ho zkompilujete do CSS. Pokud si chcete ověřit, že CSS, které Sass produkuje je kompatibilní s prohlížeči:
+
+[QuirksMode CSS](http://www.quirksmode.org/css/) a [CanIUse](http://caniuse.com) jsou skvělé stránky pro kontrolu kompatibility.
+
+
+## Kam dál?
+* [Oficiální dokumentace](http://sass-lang.com/documentation/file.SASS_REFERENCE.html)
+* [The Sass Way](http://thesassway.com/) obsahuje tutoriál a řadu skvělých článků

From 8aff0a65dc106f4718b8d5da27178757e4f41eba Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Fri, 30 Oct 2015 20:10:22 +0500
Subject: [PATCH 20/88] Update d-ru.html.markdown

---
 ru-ru/d-ru.html.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index 33bff3b7..cbd5b127 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -39,7 +39,7 @@ module app;
 import std.stdio;
 
 // можно импортировать только нужные части, не обязательно модуль целиком
-import std.exception : assert;
+import std.exception : enforce;
 
 // точка входа в программу — функция main, аналогично C/C++
 void main()
@@ -60,7 +60,7 @@ double с = 56.78; // тип с плавающей точкой (64 бита)
     комплексных чисел, могут быть беззнаковыми.
     В этом случае название типа начинается с префикса "u"
 */
-uint d = 10, ulong e = 11.12;
+uint d = 10; ulong e = 11;
 bool b = true; // логический тип
 char d = 'd';  // UTF-символ, 8 бит. D поддерживает UTF "из коробки"
 wchar = 'é';   // символ UTF-16
@@ -146,7 +146,7 @@ x++;        // 10
 ++x;        // 11
 x *= 2;     // 22
 x /= 2;     // 11
-x ^^ 2;     // 121 (возведение в степень)
+x = x ^^ 2; // 121 (возведение в степень)
 x ^^= 2;    // 1331 (то же самое)
 
 string str1 = "Hello";
@@ -160,7 +160,7 @@ arr ~= 4; // [1, 2, 3, 4] - добавление элемента в конец
 
 /*** Логика и сравнения ***/
 
-int x = 0, int y = 1;
+int x = 0; int y = 1;
 
 x == y;         // false
 x > y;          // false

From db632ee03ca837fcdc4ca45e428ad7efb9c8135f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20P=C3=A9rez?= <mario@geekytheory.com>
Date: Sat, 31 Oct 2015 11:27:29 +0100
Subject: [PATCH 21/88] Create file for PHP translation es-ES

---
 es-es/php-es.html.markdown | 823 +++++++++++++++++++++++++++++++++++++
 1 file changed, 823 insertions(+)
 create mode 100644 es-es/php-es.html.markdown

diff --git a/es-es/php-es.html.markdown b/es-es/php-es.html.markdown
new file mode 100644
index 00000000..a8276e53
--- /dev/null
+++ b/es-es/php-es.html.markdown
@@ -0,0 +1,823 @@
+---
+language: PHP
+contributors:
+    - ["Malcolm Fell", "http://emarref.net/"]
+    - ["Trismegiste", "https://github.com/Trismegiste"]
+translators:
+    - ["Mario Pérez", "https://github.com/MarioPerezEsteso"]
+lang: es-es
+filename: learnphp-es.php
+---
+
+This document describes PHP 5+.
+
+```php
+<?php // PHP code must be enclosed with <?php tags
+
+// If your php file only contains PHP code, it is best practice
+// to omit the php closing tag to prevent accidental output.
+
+// Two forward slashes start a one-line comment.
+
+# So will a hash (aka pound symbol) but // is more common
+
+/*
+     Surrounding text in slash-asterisk and asterisk-slash
+     makes it a multi-line comment.
+*/
+
+// Use "echo" or "print" to print output
+print('Hello '); // Prints "Hello " with no line break
+
+// () are optional for print and echo
+echo "World\n"; // Prints "World" with a line break
+// (all statements must end with a semicolon)
+
+// Anything outside <?php tags is echoed automatically
+?>
+Hello World Again!
+<?php
+
+
+/************************************
+ * Types & Variables
+ */
+
+// Variables begin with the $ symbol.
+// A valid variable name starts with a letter or underscore,
+// followed by any number of letters, numbers, or underscores.
+
+// Boolean values are case-insensitive
+$boolean = true;  // or TRUE or True
+$boolean = false; // or FALSE or False
+
+// Integers
+$int1 = 12;   // => 12
+$int2 = -12;  // => -12
+$int3 = 012;  // => 10 (a leading 0 denotes an octal number)
+$int4 = 0x0F; // => 15 (a leading 0x denotes a hex literal)
+
+// Floats (aka doubles)
+$float = 1.234;
+$float = 1.2e3;
+$float = 7E-10;
+
+// Delete variable
+unset($int1);
+
+// Arithmetic
+$sum        = 1 + 1; // 2
+$difference = 2 - 1; // 1
+$product    = 2 * 2; // 4
+$quotient   = 2 / 1; // 2
+
+// Shorthand arithmetic
+$number = 0;
+$number += 1;      // Increment $number by 1
+echo $number++;    // Prints 1 (increments after evaluation)
+echo ++$number;    // Prints 3 (increments before evaluation)
+$number /= $float; // Divide and assign the quotient to $number
+
+// Strings should be enclosed in single quotes;
+$sgl_quotes = '$String'; // => '$String'
+
+// Avoid using double quotes except to embed other variables
+$dbl_quotes = "This is a $sgl_quotes."; // => 'This is a $String.'
+
+// Special characters are only escaped in double quotes
+$escaped   = "This contains a \t tab character.";
+$unescaped = 'This just contains a slash and a t: \t';
+
+// Enclose a variable in curly braces if needed
+$money = "I have $${number} in the bank.";
+
+// Since PHP 5.3, nowdocs can be used for uninterpolated multi-liners
+$nowdoc = <<<'END'
+Multi line
+string
+END;
+
+// Heredocs will do string interpolation
+$heredoc = <<<END
+Multi line
+$sgl_quotes
+END;
+
+// String concatenation is done with .
+echo 'This string ' . 'is concatenated';
+
+// Strings can be passed in as parameters to echo
+echo 'Multiple', 'Parameters', 'Valid';  // Returns 'MultipleParametersValid'
+
+
+/********************************
+ * Constants
+ */
+
+// A constant is defined by using define()
+// and can never be changed during runtime!
+
+// a valid constant name starts with a letter or underscore,
+// followed by any number of letters, numbers, or underscores.
+define("FOO",     "something");
+
+// access to a constant is possible by calling the choosen name without a $
+echo FOO; // Returns 'something'
+echo 'This outputs '.FOO;  // Returns 'This ouputs something'
+
+
+
+/********************************
+ * Arrays
+ */
+
+// All arrays in PHP are associative arrays (hashmaps),
+
+// Associative arrays, known as hashmaps in some languages.
+
+// Works with all PHP versions
+$associative = array('One' => 1, 'Two' => 2, 'Three' => 3);
+
+// PHP 5.4 introduced a new syntax
+$associative = ['One' => 1, 'Two' => 2, 'Three' => 3];
+
+echo $associative['One']; // prints 1
+
+// List literals implicitly assign integer keys
+$array = ['One', 'Two', 'Three'];
+echo $array[0]; // => "One"
+
+// Add an element to the end of an array
+$array[] = 'Four';
+// or
+array_push($array, 'Five');
+
+// Remove element from array
+unset($array[3]);
+
+/********************************
+ * Output
+ */
+
+echo('Hello World!');
+// Prints Hello World! to stdout.
+// Stdout is the web page if running in a browser.
+
+print('Hello World!'); // The same as echo
+
+// echo and print are language constructs too, so you can drop the parentheses
+echo 'Hello World!';
+print 'Hello World!';
+
+$paragraph = 'paragraph';
+
+echo 100;        // Echo scalar variables directly
+echo $paragraph; // or variables
+
+// If short open tags are configured, or your PHP version is
+// 5.4.0 or greater, you can use the short echo syntax
+?>
+<p><?= $paragraph ?></p>
+<?php
+
+$x = 1;
+$y = 2;
+$x = $y; // $x now contains the same value as $y
+$z = &$y;
+// $z now contains a reference to $y. Changing the value of
+// $z will change the value of $y also, and vice-versa.
+// $x will remain unchanged as the original value of $y
+
+echo $x; // => 2
+echo $z; // => 2
+$y = 0;
+echo $x; // => 2
+echo $z; // => 0
+
+// Dumps type and value of variable to stdout
+var_dump($z); // prints int(0)
+
+// Prints variable to stdout in human-readable format
+print_r($array); // prints: Array ( [0] => One [1] => Two [2] => Three )
+
+/********************************
+ * Logic
+ */
+$a = 0;
+$b = '0';
+$c = '1';
+$d = '1';
+
+// assert throws a warning if its argument is not true
+
+// These comparisons will always be true, even if the types aren't the same.
+assert($a == $b); // equality
+assert($c != $a); // inequality
+assert($c <> $a); // alternative inequality
+assert($a < $c);
+assert($c > $b);
+assert($a <= $b);
+assert($c >= $d);
+
+// The following will only be true if the values match and are the same type.
+assert($c === $d);
+assert($a !== $d);
+assert(1 === '1');
+assert(1 !== '1');
+
+// 'Spaceship' operator (since PHP 7)
+// Returns 0 if values on either side are equal
+// Returns 1 if value on the left is greater
+// Returns -1 if the value on the right is greater
+
+$a = 100;
+$b = 1000;
+
+echo $a <=> $a; // 0 since they are equal
+echo $a <=> $b; // -1 since $a < $b
+echo $b <=> $a; // 1 since $b > $a
+
+// Variables can be converted between types, depending on their usage.
+
+$integer = 1;
+echo $integer + $integer; // => 2
+
+$string = '1';
+echo $string + $string; // => 2 (strings are coerced to integers)
+
+$string = 'one';
+echo $string + $string; // => 0
+// Outputs 0 because the + operator cannot cast the string 'one' to a number
+
+// Type casting can be used to treat a variable as another type
+
+$boolean = (boolean) 1; // => true
+
+$zero = 0;
+$boolean = (boolean) $zero; // => false
+
+// There are also dedicated functions for casting most types
+$integer = 5;
+$string = strval($integer);
+
+$var = null; // Null value
+
+
+/********************************
+ * Control Structures
+ */
+
+if (true) {
+    print 'I get printed';
+}
+
+if (false) {
+    print 'I don\'t';
+} else {
+    print 'I get printed';
+}
+
+if (false) {
+    print 'Does not get printed';
+} elseif(true) {
+    print 'Does';
+}
+
+// ternary operator
+print (false ? 'Does not get printed' : 'Does');
+
+// ternary shortcut operator since PHP 5.3
+// equivalent of "$x ? $x : 'Does'""
+$x = false;
+print($x ?: 'Does');
+
+// null coalesce operator since php 7
+$a = null;
+$b = 'Does print';
+echo $a ?? 'a is not set'; // prints 'a is not set'
+echo $b ?? 'b is not set'; // prints 'Does print'
+
+
+$x = 0;
+if ($x === '0') {
+    print 'Does not print';
+} elseif($x == '1') {
+    print 'Does not print';
+} else {
+    print 'Does print';
+}
+
+
+
+// This alternative syntax is useful for templates:
+?>
+
+<?php if ($x): ?>
+This is displayed if the test is truthy.
+<?php else: ?>
+This is displayed otherwise.
+<?php endif; ?>
+
+<?php
+
+// Use switch to save some logic.
+switch ($x) {
+    case '0':
+        print 'Switch does type coercion';
+        break; // You must include a break, or you will fall through
+               // to cases 'two' and 'three'
+    case 'two':
+    case 'three':
+        // Do something if $variable is either 'two' or 'three'
+        break;
+    default:
+        // Do something by default
+}
+
+// While, do...while and for loops are probably familiar
+$i = 0;
+while ($i < 5) {
+    echo $i++;
+}; // Prints "01234"
+
+echo "\n";
+
+$i = 0;
+do {
+    echo $i++;
+} while ($i < 5); // Prints "01234"
+
+echo "\n";
+
+for ($x = 0; $x < 10; $x++) {
+    echo $x;
+} // Prints "0123456789"
+
+echo "\n";
+
+$wheels = ['bicycle' => 2, 'car' => 4];
+
+// Foreach loops can iterate over arrays
+foreach ($wheels as $wheel_count) {
+    echo $wheel_count;
+} // Prints "24"
+
+echo "\n";
+
+// You can iterate over the keys as well as the values
+foreach ($wheels as $vehicle => $wheel_count) {
+    echo "A $vehicle has $wheel_count wheels";
+}
+
+echo "\n";
+
+$i = 0;
+while ($i < 5) {
+    if ($i === 3) {
+        break; // Exit out of the while loop
+    }
+    echo $i++;
+} // Prints "012"
+
+for ($i = 0; $i < 5; $i++) {
+    if ($i === 3) {
+        continue; // Skip this iteration of the loop
+    }
+    echo $i;
+} // Prints "0124"
+
+
+/********************************
+ * Functions
+ */
+
+// Define a function with "function":
+function my_function () {
+    return 'Hello';
+}
+
+echo my_function(); // => "Hello"
+
+// A valid function name starts with a letter or underscore, followed by any
+// number of letters, numbers, or underscores.
+
+function add ($x, $y = 1) { // $y is optional and defaults to 1
+    $result = $x + $y;
+    return $result;
+}
+
+echo add(4); // => 5
+echo add(4, 2); // => 6
+
+// $result is not accessible outside the function
+// print $result; // Gives a warning.
+
+// Since PHP 5.3 you can declare anonymous functions;
+$inc = function ($x) {
+    return $x + 1;
+};
+
+echo $inc(2); // => 3
+
+function foo ($x, $y, $z) {
+    echo "$x - $y - $z";
+}
+
+// Functions can return functions
+function bar ($x, $y) {
+    // Use 'use' to bring in outside variables
+    return function ($z) use ($x, $y) {
+        foo($x, $y, $z);
+    };
+}
+
+$bar = bar('A', 'B');
+$bar('C'); // Prints "A - B - C"
+
+// You can call named functions using strings
+$function_name = 'add';
+echo $function_name(1, 2); // => 3
+// Useful for programatically determining which function to run.
+// Or, use call_user_func(callable $callback [, $parameter [, ... ]]);
+
+
+// You can get the all the parameters passed to a function
+function parameters() {
+    $numargs = func_num_args();
+    if ($numargs > 0) {
+        echo func_get_arg(0) . ' | ';
+    }
+    $args_array = func_get_args();
+    foreach ($args_array as $key => $arg) {
+        echo $key . ' - ' . $arg . ' | ';
+    }
+}
+
+parameters('Hello', 'World'); // Hello | 0 - Hello | 1 - World |
+
+// Since PHP 5.6 you can get a variable number of arguments
+function variable($word, ...$list) {
+	echo $word . " || ";
+	foreach ($list as $item) {
+		echo $item . ' | ';
+	}
+}
+
+variable("Separate", "Hello", "World") // Separate || Hello | World | 
+
+/********************************
+ * Includes
+ */
+
+<?php
+// PHP within included files must also begin with a PHP open tag.
+
+include 'my-file.php';
+// The code in my-file.php is now available in the current scope.
+// If the file cannot be included (e.g. file not found), a warning is emitted.
+
+include_once 'my-file.php';
+// If the code in my-file.php has been included elsewhere, it will
+// not be included again. This prevents multiple class declaration errors
+
+require 'my-file.php';
+require_once 'my-file.php';
+// Same as include(), except require() will cause a fatal error if the
+// file cannot be included.
+
+// Contents of my-include.php:
+<?php
+
+return 'Anything you like.';
+// End file
+
+// Includes and requires may also return a value.
+$value = include 'my-include.php';
+
+// Files are included based on the file path given or, if none is given,
+// the include_path configuration directive. If the file isn't found in
+// the include_path, include will finally check in the calling script's
+// own directory and the current working directory before failing.
+/* */
+
+/********************************
+ * Classes
+ */
+
+// Classes are defined with the class keyword
+
+class MyClass
+{
+    const MY_CONST      = 'value'; // A constant
+
+    static $staticVar   = 'static';
+
+    // Static variables and their visibility
+    public static $publicStaticVar = 'publicStatic';
+    // Accessible within the class only
+    private static $privateStaticVar = 'privateStatic';
+    // Accessible from the class and subclasses
+    protected static $protectedStaticVar = 'protectedStatic';
+
+    // Properties must declare their visibility
+    public $property    = 'public';
+    public $instanceProp;
+    protected $prot = 'protected'; // Accessible from the class and subclasses
+    private $priv   = 'private';   // Accessible within the class only
+
+    // Create a constructor with __construct
+    public function __construct($instanceProp) {
+        // Access instance variables with $this
+        $this->instanceProp = $instanceProp;
+    }
+
+    // Methods are declared as functions inside a class
+    public function myMethod()
+    {
+        print 'MyClass';
+    }
+
+    //final keyword would make a function unoverridable
+    final function youCannotOverrideMe()
+    {
+    }
+
+/*
+ * Declaring class properties or methods as static makes them accessible without
+ * needing an instantiation of the class. A property declared as static can not
+ * be accessed with an instantiated class object (though a static method can).
+ */
+
+    public static function myStaticMethod()
+    {
+        print 'I am static';
+    }
+}
+
+// Class constants can always be accessed statically
+echo MyClass::MY_CONST;    // Outputs 'value';
+
+echo MyClass::$staticVar;  // Outputs 'static';
+MyClass::myStaticMethod(); // Outputs 'I am static';
+
+// Instantiate classes using new
+$my_class = new MyClass('An instance property');
+// The parentheses are optional if not passing in an argument.
+
+// Access class members using ->
+echo $my_class->property;     // => "public"
+echo $my_class->instanceProp; // => "An instance property"
+$my_class->myMethod();        // => "MyClass"
+
+
+// Extend classes using "extends"
+class MyOtherClass extends MyClass
+{
+    function printProtectedProperty()
+    {
+        echo $this->prot;
+    }
+
+    // Override a method
+    function myMethod()
+    {
+        parent::myMethod();
+        print ' > MyOtherClass';
+    }
+}
+
+$my_other_class = new MyOtherClass('Instance prop');
+$my_other_class->printProtectedProperty(); // => Prints "protected"
+$my_other_class->myMethod();               // Prints "MyClass > MyOtherClass"
+
+final class YouCannotExtendMe
+{
+}
+
+// You can use "magic methods" to create getters and setters
+class MyMapClass
+{
+    private $property;
+
+    public function __get($key)
+    {
+        return $this->$key;
+    }
+
+    public function __set($key, $value)
+    {
+        $this->$key = $value;
+    }
+}
+
+$x = new MyMapClass();
+echo $x->property; // Will use the __get() method
+$x->property = 'Something'; // Will use the __set() method
+
+// Classes can be abstract (using the abstract keyword) or
+// implement interfaces (using the implements keyword).
+// An interface is declared with the interface keyword.
+
+interface InterfaceOne
+{
+    public function doSomething();
+}
+
+interface InterfaceTwo
+{
+    public function doSomethingElse();
+}
+
+// interfaces can be extended
+interface InterfaceThree extends InterfaceTwo
+{
+    public function doAnotherContract();
+}
+
+abstract class MyAbstractClass implements InterfaceOne
+{
+    public $x = 'doSomething';
+}
+
+class MyConcreteClass extends MyAbstractClass implements InterfaceTwo
+{
+    public function doSomething()
+    {
+        echo $x;
+    }
+
+    public function doSomethingElse()
+    {
+        echo 'doSomethingElse';
+    }
+}
+
+
+// Classes can implement more than one interface
+class SomeOtherClass implements InterfaceOne, InterfaceTwo
+{
+    public function doSomething()
+    {
+        echo 'doSomething';
+    }
+
+    public function doSomethingElse()
+    {
+        echo 'doSomethingElse';
+    }
+}
+
+
+/********************************
+ * Traits
+ */
+
+// Traits are available from PHP 5.4.0 and are declared using "trait"
+
+trait MyTrait
+{
+    public function myTraitMethod()
+    {
+        print 'I have MyTrait';
+    }
+}
+
+class MyTraitfulClass
+{
+    use MyTrait;
+}
+
+$cls = new MyTraitfulClass();
+$cls->myTraitMethod(); // Prints "I have MyTrait"
+
+
+/********************************
+ * Namespaces
+ */
+
+// This section is separate, because a namespace declaration
+// must be the first statement in a file. Let's pretend that is not the case
+
+<?php
+
+// By default, classes exist in the global namespace, and can
+// be explicitly called with a backslash.
+
+$cls = new \MyClass();
+
+
+
+// Set the namespace for a file
+namespace My\Namespace;
+
+class MyClass
+{
+}
+
+// (from another file)
+$cls = new My\Namespace\MyClass;
+
+//Or from within another namespace.
+namespace My\Other\Namespace;
+
+use My\Namespace\MyClass;
+
+$cls = new MyClass();
+
+// Or you can alias the namespace;
+
+namespace My\Other\Namespace;
+
+use My\Namespace as SomeOtherNamespace;
+
+$cls = new SomeOtherNamespace\MyClass();
+
+
+/**********************
+* Late Static Binding
+*
+*/
+
+class ParentClass {
+    public static function who() {
+        echo "I'm a " . __CLASS__ . "\n";
+    }
+    public static function test() {
+        // self references the class the method is defined within
+        self::who();
+        // static references the class the method was invoked on
+        static::who();
+    }
+}
+
+ParentClass::test();
+/*
+I'm a ParentClass
+I'm a ParentClass
+*/
+
+class ChildClass extends ParentClass {
+    public static function who() {
+        echo "But I'm " . __CLASS__ . "\n";
+    }
+}
+
+ChildClass::test();
+/*
+I'm a ParentClass
+But I'm ChildClass
+*/
+
+
+/**********************
+*  Error Handling
+*  
+*/
+
+// Simple error handling can be done with try catch block
+
+try {
+    // Do something
+} catch (Exception $e) {
+    // Handle exception
+}
+
+// When using try catch blocks in a namespaced enviroment use the following
+
+try {
+    // Do something
+} catch (\Exception $e) {
+    // Handle exception
+}
+
+// Custom exceptions
+
+class MyException extends Exception {}
+
+try {
+
+    $condition = true;
+
+    if ($condition) {
+        throw new MyException('Something just happend');
+    }
+
+} catch (MyException $e) {
+    // Handle my exception
+}
+
+```
+
+## More Information
+
+Visit the [official PHP documentation](http://www.php.net/manual/) for reference
+and community input.
+
+If you're interested in up-to-date best practices, visit
+[PHP The Right Way](http://www.phptherightway.com/).
+
+If you're coming from a language with good package management, check out
+[Composer](http://getcomposer.org/).
+
+For common standards, visit the PHP Framework Interoperability Group's
+[PSR standards](https://github.com/php-fig/fig-standards).

From b307b65e8df4e27991c8cf7ade1e3d7faa1e87fd Mon Sep 17 00:00:00 2001
From: Anton Ivanov <sendmailn@gmail.com>
Date: Sat, 31 Oct 2015 14:37:12 +0300
Subject: [PATCH 22/88] Add binary number example.

---
 php.html.markdown | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/php.html.markdown b/php.html.markdown
index 7b0cf61c..d03b89fe 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -54,6 +54,8 @@ $int1 = 12;   // => 12
 $int2 = -12;  // => -12
 $int3 = 012;  // => 10 (a leading 0 denotes an octal number)
 $int4 = 0x0F; // => 15 (a leading 0x denotes a hex literal)
+// Binary integer literals are available since PHP 5.4.0.
+$int5 = 0b11111111; // 255 (a leading 0b denotes a binary number)
 
 // Floats (aka doubles)
 $float = 1.234;
@@ -117,11 +119,11 @@ echo 'Multiple', 'Parameters', 'Valid';  // Returns 'MultipleParametersValid'
 
 // a valid constant name starts with a letter or underscore,
 // followed by any number of letters, numbers, or underscores.
-define("FOO",     "something");
+define("FOO", "something");
 
 // access to a constant is possible by calling the choosen name without a $
 echo FOO; // Returns 'something'
-echo 'This outputs '.FOO;  // Returns 'This ouputs something'
+echo 'This outputs ' . FOO;  // Returns 'This ouputs something'
 
 
 

From 3dbcf1c2c6092b0287bae150eec2271446f95927 Mon Sep 17 00:00:00 2001
From: Pavel Kazlou <p.i.kazlou@gmail.com>
Date: Sat, 31 Oct 2015 16:22:59 +0300
Subject: [PATCH 23/88] added docs for multi-variable tuple assignment

---
 scala.html.markdown | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scala.html.markdown b/scala.html.markdown
index 192e03d7..4ba9a31b 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -321,9 +321,15 @@ divideInts(10, 3)    // (Int, Int) = (3,1)
 val d = divideInts(10, 3)    // (Int, Int) = (3,1)
 
 d._1    // Int = 3
-
 d._2    // Int = 1
 
+// Alternatively you can do multiple-variable assignment to tuple, which is more
+// convenient and readable in many cases
+val (div, mod) = divideInts(10, 3)
+
+div     // Int = 3
+mod     // Int = 1
+
 
 /////////////////////////////////////////////////
 // 5. Object Oriented Programming

From d47f06345b37cecf4072523c1c79f63f37846d8c Mon Sep 17 00:00:00 2001
From: Pavel Kazlou <p.i.kazlou@gmail.com>
Date: Sat, 31 Oct 2015 16:50:40 +0300
Subject: [PATCH 24/88] added docs for default case in pattern matching

---
 scala.html.markdown | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scala.html.markdown b/scala.html.markdown
index 192e03d7..131bd71c 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -454,6 +454,9 @@ def matchEverything(obj: Any): String = obj match {
 
   // You can nest patterns:
   case List(List((1, 2, "YAY"))) => "Got a list of list of tuple"
+
+  // Match any case (default) if all previous haven't matched
+  case _ => "Got unknown object"
 }
 
 // In fact, you can pattern match any object with an "unapply" method. This

From a11e01b82162ad43db9b4f751ead0fdd09ad3fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20P=C3=A9rez?= <mario@geekytheory.com>
Date: Sat, 31 Oct 2015 15:32:24 +0100
Subject: [PATCH 25/88] Translate learn PHP to es-es

---
 es-es/php-es.html.markdown | 714 +++++++++++++++++++------------------
 1 file changed, 358 insertions(+), 356 deletions(-)

diff --git a/es-es/php-es.html.markdown b/es-es/php-es.html.markdown
index a8276e53..fa52353c 100644
--- a/es-es/php-es.html.markdown
+++ b/es-es/php-es.html.markdown
@@ -9,121 +9,121 @@ lang: es-es
 filename: learnphp-es.php
 ---
 
-This document describes PHP 5+.
+Este documento explica el funcionamiento de PHP 5+.
 
 ```php
-<?php // PHP code must be enclosed with <?php tags
+<?php // El código PHP debe estar dentro de etiquetas <?php
 
-// If your php file only contains PHP code, it is best practice
-// to omit the php closing tag to prevent accidental output.
+// Si tu fichero php solo contiene código php, es una buena práctica
+// omitir la etiqueta de cierre php para prevenir salidas acidentales.
 
-// Two forward slashes start a one-line comment.
+// Dos barras comienzan un comentario de una línea.
 
-# So will a hash (aka pound symbol) but // is more common
+# También lo hará una almohadilla, pero // es más común
 
 /*
-     Surrounding text in slash-asterisk and asterisk-slash
-     makes it a multi-line comment.
+     Escribir texto entre una barra-asterisco y asterisco-barra
+     crea un comentario multilínea.
 */
 
-// Use "echo" or "print" to print output
-print('Hello '); // Prints "Hello " with no line break
+// Utiliza "echo" o "print" para imprimir por pantalla
+print('Hola '); // Imprime "Hola " sin salto de línea
 
-// () are optional for print and echo
-echo "World\n"; // Prints "World" with a line break
-// (all statements must end with a semicolon)
+// () son opcionales para print y echo
+echo "Mundo\n"; // Imprime "Mundo" con un salto de línea
+// (todas las sentencias deben finalizar con un punto y coma)
 
-// Anything outside <?php tags is echoed automatically
+// Cualquier cosa fuera de las etiquetas <?php se imprime automáticamente
 ?>
-Hello World Again!
+¡Hola Mundo de nuevo!
 <?php
 
 
 /************************************
- * Types & Variables
+ * Tipos y variables
  */
 
-// Variables begin with the $ symbol.
-// A valid variable name starts with a letter or underscore,
-// followed by any number of letters, numbers, or underscores.
+// Las variables comienzan con el símbolo $.
+// Una variable válida comienza con una letra o guión bajo,
+// seguida de cualquier cantidad de letras, números o guiones bajos.
 
-// Boolean values are case-insensitive
-$boolean = true;  // or TRUE or True
-$boolean = false; // or FALSE or False
+// Las variables booleanas no distinguen entre mayúsculas o minúsculas
+$boolean = true;  // o TRUE o True
+$boolean = false; // o FALSE o False
 
-// Integers
+// Enteros
 $int1 = 12;   // => 12
 $int2 = -12;  // => -12
-$int3 = 012;  // => 10 (a leading 0 denotes an octal number)
-$int4 = 0x0F; // => 15 (a leading 0x denotes a hex literal)
+$int3 = 012;  // => 10 (un 0 al comienzo declara un número octal)
+$int4 = 0x0F; // => 15 (un 0x al comienzo declara un hexadecimal)
 
-// Floats (aka doubles)
+// Floats (también conocidos como doubles)
 $float = 1.234;
 $float = 1.2e3;
 $float = 7E-10;
 
-// Delete variable
+// Eliminar variable
 unset($int1);
 
-// Arithmetic
-$sum        = 1 + 1; // 2
-$difference = 2 - 1; // 1
-$product    = 2 * 2; // 4
-$quotient   = 2 / 1; // 2
+// Operaciones aritméticas
+$suma        = 1 + 1; // 2
+$diferencia  = 2 - 1; // 1
+$producto    = 2 * 2; // 4
+$cociente    = 2 / 1; // 2
 
-// Shorthand arithmetic
-$number = 0;
-$number += 1;      // Increment $number by 1
-echo $number++;    // Prints 1 (increments after evaluation)
-echo ++$number;    // Prints 3 (increments before evaluation)
-$number /= $float; // Divide and assign the quotient to $number
+// Operaciones aritméticas de escritura rápida
+$numero = 0;
+$numero += 1;      // Incrementa $numero en 1
+echo $numero++;    // Imprime 1 (incremento después la evaluación)
+echo ++$numero;    // Imprime 3 (incremento antes de la evaluación)
+$numero /= $float; // Divide y asigna el cociente a $numero
 
-// Strings should be enclosed in single quotes;
+// Las cadenas de caracteres deben declararse entre comillas simples
 $sgl_quotes = '$String'; // => '$String'
 
-// Avoid using double quotes except to embed other variables
+// Evita utilizar comillas dobles excepto para embeber otras variables
 $dbl_quotes = "This is a $sgl_quotes."; // => 'This is a $String.'
 
-// Special characters are only escaped in double quotes
-$escaped   = "This contains a \t tab character.";
-$unescaped = 'This just contains a slash and a t: \t';
+// Los caracteres especiales solo son válidos entre comillas dobles
+$escaped   = "Esto contiene \t un caracter tabulador.";
+$unescaped = 'Esto solo contiene una barra y una t: \t';
 
-// Enclose a variable in curly braces if needed
-$money = "I have $${number} in the bank.";
+// Rodea una variable entre corchetes si es necesario
+$dinero = "Tengo $${numero} en el banco.";
 
-// Since PHP 5.3, nowdocs can be used for uninterpolated multi-liners
+// Desde PHP 5.3, los nowdocs pueden ser utilizados para multilíneas no interpoladas
 $nowdoc = <<<'END'
 Multi line
 string
 END;
 
-// Heredocs will do string interpolation
+// Heredocs interpola cadenas de caracteres
 $heredoc = <<<END
 Multi line
 $sgl_quotes
 END;
 
-// String concatenation is done with .
-echo 'This string ' . 'is concatenated';
+// La concatenación de cadenas de caracteres se realiza con .
+echo 'Esta cadena de caracteres ' . 'está concatenada';
 
-// Strings can be passed in as parameters to echo
-echo 'Multiple', 'Parameters', 'Valid';  // Returns 'MultipleParametersValid'
+// Las cadenas de caracteres pueden ser pasadas como parámetros en un echo
+echo 'Multiples', 'Parametros', 'Validos';  // Devuelve 'MultiplesParametrosValidos'
 
 
 /********************************
- * Constants
+ * Constantes
  */
 
-// A constant is defined by using define()
-// and can never be changed during runtime!
+// Una constante se define utilizando define()
+// y nunca puede ser cambiada en tiempo de ejecución
 
-// a valid constant name starts with a letter or underscore,
-// followed by any number of letters, numbers, or underscores.
-define("FOO",     "something");
+// un nombre válido para una constante debe comenzar con una letra o guión bajo,
+// seguido por cualquier número de letras, números o guiones bajos.
+define("FOO",     "algo");
 
-// access to a constant is possible by calling the choosen name without a $
-echo FOO; // Returns 'something'
-echo 'This outputs '.FOO;  // Returns 'This ouputs something'
+// el acceso a una constante se puede realizar llamando a la variable elegida sin un símbolo de $
+echo FOO; // Devuelve 'algo'
+echo 'Esto imprime '.FOO;  // Devuelve 'Esto imprime algo'
 
 
 
@@ -131,62 +131,62 @@ echo 'This outputs '.FOO;  // Returns 'This ouputs something'
  * Arrays
  */
 
-// All arrays in PHP are associative arrays (hashmaps),
+// Todos los arrays en PHP son asociativos (hashmaps),
 
-// Associative arrays, known as hashmaps in some languages.
+// Los arrays asociativos son conocidos como hashmaps en algunos lenguajes.
 
-// Works with all PHP versions
-$associative = array('One' => 1, 'Two' => 2, 'Three' => 3);
+// Funciona con todas las versiones de php
+$asociativo = array('Uno' => 1, 'Dos' => 2, 'Tres' => 3);
 
-// PHP 5.4 introduced a new syntax
-$associative = ['One' => 1, 'Two' => 2, 'Three' => 3];
+// PHP 5.4 introdujo una nueva sintaxis
+$asociativo = ['Uno' => 1, 'Dos' => 2, 'Tres' => 3];
 
-echo $associative['One']; // prints 1
+echo $asociativo['Uno']; // imprime 1
 
-// List literals implicitly assign integer keys
-$array = ['One', 'Two', 'Three'];
-echo $array[0]; // => "One"
+// Lista literales implícitamente asignados con claves enteras
+$array = ['Uno', 'Dos', 'Tres'];
+echo $array[0]; // => "Uno"
 
-// Add an element to the end of an array
-$array[] = 'Four';
-// or
-array_push($array, 'Five');
+// Añadir un elemento al final de un array
+$array[] = 'Cuatro';
+// o
+array_push($array, 'Cinco');
 
-// Remove element from array
+// Eliminar un elemento de un array
 unset($array[3]);
 
 /********************************
- * Output
+ * Salidas por pantalla
  */
 
-echo('Hello World!');
-// Prints Hello World! to stdout.
-// Stdout is the web page if running in a browser.
+echo('¡Hola Mundo!');
+// Imprime ¡Hola Mundo! en stdout.
+// Stdout es la página web si se está ejecutando en un navegador.
 
-print('Hello World!'); // The same as echo
+print('!Hola Mundo!'); // Es lo mismo que echo
 
-// echo and print are language constructs too, so you can drop the parentheses
-echo 'Hello World!';
-print 'Hello World!';
+// No es necesario el paréntesis en echo y print
+echo '¡Hola Mundo!';
+print '¡Hola Mundo!';
 
-$paragraph = 'paragraph';
+$parrafo = 'parrafo';
 
-echo 100;        // Echo scalar variables directly
-echo $paragraph; // or variables
+echo 100;      // Haz echo de escalares directamente
+echo $parrafo; // o de variables
 
-// If short open tags are configured, or your PHP version is
-// 5.4.0 or greater, you can use the short echo syntax
+// Si las etiquetas cortas estás configuradas y tu versión de PHP es
+// la 5.4.0 o superior, puede utilizar la sintaxis abreviada de echo
 ?>
-<p><?= $paragraph ?></p>
+<p><?= $parrafo?></p>
 <?php
 
 $x = 1;
 $y = 2;
-$x = $y; // $x now contains the same value as $y
+$x = $y; // $x ahora contiene el mismo valor que $y
 $z = &$y;
-// $z now contains a reference to $y. Changing the value of
-// $z will change the value of $y also, and vice-versa.
-// $x will remain unchanged as the original value of $y
+// $z contiene ahora una referencia a $y. Un cambio en el valor de
+// $z cambiará también el valor de $y, y viceversa.
+// $x sin embargo, tendrá el valor original de $y
 
 echo $x; // => 2
 echo $z; // => 2
@@ -194,179 +194,178 @@ $y = 0;
 echo $x; // => 2
 echo $z; // => 0
 
-// Dumps type and value of variable to stdout
-var_dump($z); // prints int(0)
+// Dump muestra el tipo y valor de una variable en stdout
+var_dump($z); // imprime int(0)
 
-// Prints variable to stdout in human-readable format
-print_r($array); // prints: Array ( [0] => One [1] => Two [2] => Three )
+// Para mostrar el valor de una variable en un formato legible para humanos
+print_r($array); // imprime: Array ( [0] => Uno [1] => Dos [2] => Tres )
 
 /********************************
- * Logic
+ * Lógica
  */
 $a = 0;
 $b = '0';
 $c = '1';
 $d = '1';
 
-// assert throws a warning if its argument is not true
+// assert lanza una advertencia si su argumento no es verdadero
 
-// These comparisons will always be true, even if the types aren't the same.
-assert($a == $b); // equality
-assert($c != $a); // inequality
-assert($c <> $a); // alternative inequality
+// Estas comparaciones siempre serán verdaderas, incluso si los tipos no son los mismos.
+assert($a == $b); // igualdad
+assert($c != $a); // desigualdad
+assert($c <> $a); // desigualdad alternativa
 assert($a < $c);
 assert($c > $b);
 assert($a <= $b);
 assert($c >= $d);
 
-// The following will only be true if the values match and are the same type.
+// Los siguiente solo será verdadero si los valores coinciden y son del mismo tipo.
 assert($c === $d);
 assert($a !== $d);
 assert(1 === '1');
 assert(1 !== '1');
 
-// 'Spaceship' operator (since PHP 7)
-// Returns 0 if values on either side are equal
-// Returns 1 if value on the left is greater
-// Returns -1 if the value on the right is greater
+// Operador 'Spaceship' (desde PHP 7)
+// Devuelve 0 si ambos valores son iguales
+// Devuelve 1 si el valor de la izquierda es mayor
+// Devuelve -1 si el valor de la derecha es mayor
 
 $a = 100;
 $b = 1000;
 
-echo $a <=> $a; // 0 since they are equal
-echo $a <=> $b; // -1 since $a < $b
-echo $b <=> $a; // 1 since $b > $a
+echo $a <=> $a; //  0 porque son iguales
+echo $a <=> $b; // -1 porque $a < $b
+echo $b <=> $a; //  1 porque $b > $a
 
-// Variables can be converted between types, depending on their usage.
+// Las variables pueden ser convertidas entre tipos, dependiendo de su uso.
 
-$integer = 1;
-echo $integer + $integer; // => 2
+$entero = 1;
+echo $entero + $entero; // => 2
 
 $string = '1';
-echo $string + $string; // => 2 (strings are coerced to integers)
+echo $string + $string; // => 2 (los strings son convertidos a enteros)
 
-$string = 'one';
+$string = 'uno';
 echo $string + $string; // => 0
-// Outputs 0 because the + operator cannot cast the string 'one' to a number
+// Muestra un 0 porque el operador + no puede convertir la cadena de caracteres 'uno' a un número
 
-// Type casting can be used to treat a variable as another type
+// La conversión de tipos puede ser utilizada para tratar a una variable como otro tipo
 
 $boolean = (boolean) 1; // => true
 
-$zero = 0;
-$boolean = (boolean) $zero; // => false
+$cero = 0;
+$boolean = (boolean) $cero; // => false
 
-// There are also dedicated functions for casting most types
-$integer = 5;
-$string = strval($integer);
+// También hay funciones dedicadas a la conversión de tipos
+$entero = 5;
+$string = strval($entero);
 
-$var = null; // Null value
+$var = null; // Valor nulo
 
 
 /********************************
- * Control Structures
+ * Estructuras de control
  */
 
 if (true) {
-    print 'I get printed';
+    print 'He sido imprimido';
 }
 
 if (false) {
-    print 'I don\'t';
+    print 'Yo no';
 } else {
-    print 'I get printed';
+    print 'He sido imprimido';
 }
 
 if (false) {
-    print 'Does not get printed';
+    print 'No se imprime';
 } elseif(true) {
-    print 'Does';
+    print 'Sí se imprime';
 }
 
-// ternary operator
-print (false ? 'Does not get printed' : 'Does');
+// operador ternario
+print (false ? 'No se imprime' : 'Sí se imprime');
 
-// ternary shortcut operator since PHP 5.3
-// equivalent of "$x ? $x : 'Does'""
+// atajo para el operador ternario desde PHP 5.3
+// equivalente de "$x ? $x : 'Sí'""
 $x = false;
-print($x ?: 'Does');
+print($x ?: 'Sí');
 
-// null coalesce operator since php 7
+// operador 'no definido' desde php 7
 $a = null;
-$b = 'Does print';
-echo $a ?? 'a is not set'; // prints 'a is not set'
-echo $b ?? 'b is not set'; // prints 'Does print'
+$b = 'Imprime';
+echo $a ?? 'a no está definido'; // imprime 'a no está definido'
+echo $b ?? 'b no está definido'; // imprime 'Imprime'
 
 
 $x = 0;
 if ($x === '0') {
-    print 'Does not print';
+    print 'No imprime';
 } elseif($x == '1') {
-    print 'Does not print';
+    print 'No imprime';
 } else {
-    print 'Does print';
+    print 'Imprime';
 }
 
 
 
-// This alternative syntax is useful for templates:
+// Esta sintaxis alternativa se utiliza para plantillas:
 ?>
 
 <?php if ($x): ?>
-This is displayed if the test is truthy.
+Esto se muestra si la evaluación es verdadera.
 <?php else: ?>
-This is displayed otherwise.
+En otro caso, se muestra esto.
 <?php endif; ?>
 
 <?php
 
-// Use switch to save some logic.
+// Utiliza el switch para tener algo más de lógica.
 switch ($x) {
     case '0':
         print 'Switch does type coercion';
-        break; // You must include a break, or you will fall through
-               // to cases 'two' and 'three'
-    case 'two':
-    case 'three':
-        // Do something if $variable is either 'two' or 'three'
+        break; // Debes incluir un break para no seguir con los casos 'Dos' y 'Tres'
+    case 'Dos':
+    case 'Tres':
+        // Hacer algo si la variables es 'Dos' o 'Tres'
         break;
     default:
-        // Do something by default
+        // Hacer algo por defecto
 }
 
-// While, do...while and for loops are probably familiar
+// Los bucles While, do...while y for te serán familiares
 $i = 0;
 while ($i < 5) {
     echo $i++;
-}; // Prints "01234"
+}; // Imprime "01234"
 
 echo "\n";
 
 $i = 0;
 do {
     echo $i++;
-} while ($i < 5); // Prints "01234"
+} while ($i < 5); // Imprime "01234"
 
 echo "\n";
 
 for ($x = 0; $x < 10; $x++) {
     echo $x;
-} // Prints "0123456789"
+} // Imprime "0123456789"
 
 echo "\n";
 
-$wheels = ['bicycle' => 2, 'car' => 4];
+$ruedas = ['bicicleta' => 2, 'coche' => 4];
 
-// Foreach loops can iterate over arrays
-foreach ($wheels as $wheel_count) {
-    echo $wheel_count;
-} // Prints "24"
+// Los bucles foreach pueden iterar por arrays
+foreach ($ruedas as $numero_ruedas) {
+    echo $numero_ruedas;
+} // Imprime "24"
 
 echo "\n";
 
-// You can iterate over the keys as well as the values
-foreach ($wheels as $vehicle => $wheel_count) {
-    echo "A $vehicle has $wheel_count wheels";
+// También se puede iterar sobre las claves, así como sobre los valores
+foreach ($ruedas as $vehiculo => $numero_ruedas) {
+    echo "Un $vehiculo tiene $numero_ruedas ruedas";
 }
 
 echo "\n";
@@ -374,45 +373,45 @@ echo "\n";
 $i = 0;
 while ($i < 5) {
     if ($i === 3) {
-        break; // Exit out of the while loop
+        break; // Sale fuera del bucle while
     }
     echo $i++;
-} // Prints "012"
+} // Imprime "012"
 
 for ($i = 0; $i < 5; $i++) {
     if ($i === 3) {
-        continue; // Skip this iteration of the loop
+        continue; // Se salta esta iteración del bucle
     }
     echo $i;
-} // Prints "0124"
+} // Imprime "0124"
 
 
 /********************************
- * Functions
+ * Funciones
  */
 
-// Define a function with "function":
-function my_function () {
-    return 'Hello';
+// Define una función con "function":
+function mi_funcion () {
+    return 'Hola';
 }
 
-echo my_function(); // => "Hello"
+echo mi_funcion(); // => "Hola"
 
-// A valid function name starts with a letter or underscore, followed by any
-// number of letters, numbers, or underscores.
+// Un nombre válido de función comienza con una letra o guión bajo, seguido de cualquier
+// número de letras, números o guiones bajos.
 
-function add ($x, $y = 1) { // $y is optional and defaults to 1
-    $result = $x + $y;
-    return $result;
+function anadir ($x, $y = 1) { // $y es opcional y por defecto es 1
+    $resultado = $x + $y;
+    return $resultado;
 }
 
-echo add(4); // => 5
-echo add(4, 2); // => 6
+echo anadir(4); // => 5
+echo anadir(4, 2); // => 6
 
-// $result is not accessible outside the function
-// print $result; // Gives a warning.
+// $resultado no es accesible fuera de la función
+// print $resultado; // Devuelve una advertencia.
 
-// Since PHP 5.3 you can declare anonymous functions;
+// Desde PHP 5.3 se pueden declarar funciones anónimas
 $inc = function ($x) {
     return $x + 1;
 };
@@ -423,28 +422,28 @@ function foo ($x, $y, $z) {
     echo "$x - $y - $z";
 }
 
-// Functions can return functions
+// Las funciones pueden devolver funciones
 function bar ($x, $y) {
-    // Use 'use' to bring in outside variables
+    // Utiliza 'use' para meter variables de fuera de la función
     return function ($z) use ($x, $y) {
         foo($x, $y, $z);
     };
 }
 
 $bar = bar('A', 'B');
-$bar('C'); // Prints "A - B - C"
+$bar('C'); // Imprime "A - B - C"
 
-// You can call named functions using strings
-$function_name = 'add';
-echo $function_name(1, 2); // => 3
-// Useful for programatically determining which function to run.
-// Or, use call_user_func(callable $callback [, $parameter [, ... ]]);
+// Puedes llamar a funciones utilizando cadenas de caracteres
+$nombre_funcion = 'add';
+echo $nombre_funcion(1, 2); // => 3
+// Es útil para determinarl qué función ejecutar.
+// O, utiliza call_user_func(callable $callback [, $parameter [, ... ]]);
 
 
-// You can get the all the parameters passed to a function
-function parameters() {
-    $numargs = func_num_args();
-    if ($numargs > 0) {
+// Puedes obtener todos los parámetros pasados a una función
+function parametros() {
+    $numero_argumentos = func_num_args();
+    if ($numero_argumentos > 0) {
         echo func_get_arg(0) . ' | ';
     }
     $args_array = func_get_args();
@@ -453,151 +452,153 @@ function parameters() {
     }
 }
 
-parameters('Hello', 'World'); // Hello | 0 - Hello | 1 - World |
+parametros('Hola', 'Mundo'); // Hola | 0 - Hola | 1 - Mundo |
 
-// Since PHP 5.6 you can get a variable number of arguments
-function variable($word, ...$list) {
-	echo $word . " || ";
-	foreach ($list as $item) {
+// Desde PHP 5.6 se puede obtener un número variable de argumentos
+function variable($palabra, ...$lista) {
+	echo $palabra . " || ";
+	foreach ($lista as $item) {
 		echo $item . ' | ';
 	}
 }
 
-variable("Separate", "Hello", "World") // Separate || Hello | World | 
+variable("Separa", "Hola", "Mundo") // Separa || Hola | Mundo |
 
 /********************************
  * Includes
  */
 
 <?php
-// PHP within included files must also begin with a PHP open tag.
+// Los ficheros PHP incluidos deben comenzar también con la etiqueta de <?php
 
-include 'my-file.php';
-// The code in my-file.php is now available in the current scope.
-// If the file cannot be included (e.g. file not found), a warning is emitted.
+include 'mi-fichero.php';
+// El código de mi-fichero.php ya está disponible en el entorno actual.
+// Si el fichero no puede ser incluido (por ejemplo porque no se ha encontrado),
+// se muestra una advertencia.
 
-include_once 'my-file.php';
-// If the code in my-file.php has been included elsewhere, it will
-// not be included again. This prevents multiple class declaration errors
+include_once 'mi-fichero.php';
+// Si el código del fichero mi-fichero.php ya ha sido incluido, ya no se
+// incluirá de nuevo. Este previene errores por múltiples declaraciones.
 
-require 'my-file.php';
-require_once 'my-file.php';
-// Same as include(), except require() will cause a fatal error if the
-// file cannot be included.
+require 'mi-fichero.php';
+require_once 'mi-fichero.php';
+// Es lo mismo que el include(), pero require() causará un error fatal si el archivo
+// no ha podido ser incluido.
 
-// Contents of my-include.php:
+// Contenido de mi-include.php:
 <?php
 
-return 'Anything you like.';
-// End file
+return 'Cualquier cosa.';
+// acabar archivo
 
-// Includes and requires may also return a value.
-$value = include 'my-include.php';
+// Los include y require también pueden devolver un valor.
+$valor = include 'mi-include.php';
 
-// Files are included based on the file path given or, if none is given,
-// the include_path configuration directive. If the file isn't found in
-// the include_path, include will finally check in the calling script's
-// own directory and the current working directory before failing.
+// Los archivos son incluidos en función de la ruta data o, si ninguna ruta es
+// especificada se utilizará la directiva de configuración de include_path. Si el
+// fichero no se encuentra en el include_path, include comprobará la ruta del código
+// que lo llama antes de fallar.
 /* */
 
 /********************************
- * Classes
+ * Clases
  */
 
-// Classes are defined with the class keyword
+// Las clases son definidas con la palabra clave class
 
-class MyClass
+class MiClase
 {
-    const MY_CONST      = 'value'; // A constant
+    const MI_CONSTANTE      = 'valor'; // Una constante
 
     static $staticVar   = 'static';
 
-    // Static variables and their visibility
+    // Las variables estáticas y su visibilidad
     public static $publicStaticVar = 'publicStatic';
-    // Accessible within the class only
+    // Accesible solo dentro de su clase
     private static $privateStaticVar = 'privateStatic';
-    // Accessible from the class and subclasses
+    // Accesible desde la clase y las subclases
     protected static $protectedStaticVar = 'protectedStatic';
 
-    // Properties must declare their visibility
-    public $property    = 'public';
+    // Las propiedades deben declarar su visibilidad
+    public $propiedad    = 'public';
     public $instanceProp;
-    protected $prot = 'protected'; // Accessible from the class and subclasses
-    private $priv   = 'private';   // Accessible within the class only
+    protected $prot = 'protected'; // Accesible desde la clase y las subclases
+    private $priv   = 'private';   // Accesible solo desde la clase
 
-    // Create a constructor with __construct
+    // Crear un constructor con __construct
     public function __construct($instanceProp) {
-        // Access instance variables with $this
+        // Accede a las variables de la instancia con $this
         $this->instanceProp = $instanceProp;
     }
 
-    // Methods are declared as functions inside a class
-    public function myMethod()
+    // Los métodos son declarados como funciones dentro de una clase
+    public function miMetodo()
     {
-        print 'MyClass';
+        print 'MiClase';
     }
 
-    //final keyword would make a function unoverridable
-    final function youCannotOverrideMe()
+    // la palabra clave final hará una función no sobreescribible
+    final function noMePuedesSobreEscribir()
     {
     }
 
 /*
- * Declaring class properties or methods as static makes them accessible without
- * needing an instantiation of the class. A property declared as static can not
- * be accessed with an instantiated class object (though a static method can).
+ * Declarar propiedades de clase o métodos como estáticos los hace accesibles sin
+ * necesidad de instanciar la clase. Una propiedad declarada como estática no
+ * puede ser accedida mediante una instancia de la clase, pero sí mediante un
+ * método estático.
  */
 
-    public static function myStaticMethod()
+    public static function miMetodoEstatico()
     {
-        print 'I am static';
+        print 'Soy estático';
     }
 }
 
-// Class constants can always be accessed statically
-echo MyClass::MY_CONST;    // Outputs 'value';
+// Las constantes de una clase siempre pueden ser accedidas estáticamente
+echo MiClase::MI_CONSTANTE;    // Muestra 'valor';
 
-echo MyClass::$staticVar;  // Outputs 'static';
-MyClass::myStaticMethod(); // Outputs 'I am static';
+echo MiClase::$staticVar;  // Muestra 'static';
+MiClase::miMetodoEstatico(); // Muestra 'Soy estático';
 
-// Instantiate classes using new
-$my_class = new MyClass('An instance property');
-// The parentheses are optional if not passing in an argument.
+// Instancia una clase usando new
+$mi_clase = new MiClase('Una instancia');
+// Los paréntesis son opcionales si no se pasa ningún argumento.
 
-// Access class members using ->
-echo $my_class->property;     // => "public"
-echo $my_class->instanceProp; // => "An instance property"
-$my_class->myMethod();        // => "MyClass"
+// Accede a los miembros de una clase utilizando ->
+echo $mi_clase->propiedad;     // => "public"
+echo $mi_clase->instanceProp; // => "Una instancia"
+$mi_clase->miMetodo();        // => "MiClase"
 
 
-// Extend classes using "extends"
-class MyOtherClass extends MyClass
+// Extender clases utilizando "extends"
+class MiOtraClase extends MiClase
 {
-    function printProtectedProperty()
+    function imprimePropiedadProtegida()
     {
         echo $this->prot;
     }
 
-    // Override a method
-    function myMethod()
+    // Sobreescribe un método
+    function miMetodo()
     {
-        parent::myMethod();
-        print ' > MyOtherClass';
+        parent::miMetodo();
+        print ' > MiOtraClase';
     }
 }
 
-$my_other_class = new MyOtherClass('Instance prop');
-$my_other_class->printProtectedProperty(); // => Prints "protected"
-$my_other_class->myMethod();               // Prints "MyClass > MyOtherClass"
+$mi_otra_clase = new MiOtraClase('Propiedad de instancia');
+$mi_otra_clase->imprimePropiedadProtegida(); // => Imprime "protected"
+$mi_otra_clase->miMetodo();               // Imprime "MiClase > MiOtraClase"
 
-final class YouCannotExtendMe
+final class NoMePuedesExtender
 {
 }
 
-// You can use "magic methods" to create getters and setters
-class MyMapClass
+// Puedes utilizar "métodos mágicos" para crear los getters y setters
+class MiClaseMapeada
 {
-    private $property;
+    private $propiedad;
 
     public function __get($key)
     {
@@ -610,60 +611,60 @@ class MyMapClass
     }
 }
 
-$x = new MyMapClass();
-echo $x->property; // Will use the __get() method
-$x->property = 'Something'; // Will use the __set() method
+$x = new MiClaseMapeada();
+echo $x->propiedad; // Utilizará el método __get()
+$x->propiedad = 'Algo'; // Utilizará el método __set()
 
-// Classes can be abstract (using the abstract keyword) or
-// implement interfaces (using the implements keyword).
-// An interface is declared with the interface keyword.
+// Las clases pueden ser abstractas (utilizando la palabra clave abstract) o
+// implementando interfaces (utilizando la palabra clave implements).
+// Una interfaz puede ser declarada con la palabra clave interface.
 
-interface InterfaceOne
+interface InterfazUno
 {
-    public function doSomething();
+    public function hazAlgo();
 }
 
-interface InterfaceTwo
+interface InterfazDos
 {
-    public function doSomethingElse();
+    public function hazOtraCosa();
 }
 
-// interfaces can be extended
-interface InterfaceThree extends InterfaceTwo
+// las interfaces pueden ser extendidas
+interface InterfazTres extends InterfazDos
 {
-    public function doAnotherContract();
+    public function hazCualquierOtraCosa();
 }
 
-abstract class MyAbstractClass implements InterfaceOne
+abstract class MiClaseAbstracta implements InterfazUno
 {
-    public $x = 'doSomething';
+    public $x = 'hazAlgo';
 }
 
-class MyConcreteClass extends MyAbstractClass implements InterfaceTwo
+class MiOtraClase extends MiClaseAbstracta implements InterfazDos
 {
-    public function doSomething()
+    public function hazAlgo()
     {
         echo $x;
     }
 
-    public function doSomethingElse()
+    public function hazOtraCosa()
     {
-        echo 'doSomethingElse';
+        echo 'hazOtraCosa';
     }
 }
 
 
-// Classes can implement more than one interface
-class SomeOtherClass implements InterfaceOne, InterfaceTwo
+// Las clases pueden implementar más de una interfaz
+class CualquierOtraClase implements InterfazUno, InterfazDos
 {
-    public function doSomething()
+    public function hazAlgo()
     {
-        echo 'doSomething';
+        echo 'hazAlgo';
     }
 
-    public function doSomethingElse()
+    public function hazOtraCosa()
     {
-        echo 'doSomethingElse';
+        echo 'hazOtraCosa';
     }
 }
 
@@ -672,65 +673,65 @@ class SomeOtherClass implements InterfaceOne, InterfaceTwo
  * Traits
  */
 
-// Traits are available from PHP 5.4.0 and are declared using "trait"
+// Los traits están disponibles desde PHP 5.4.0 y son declarados utilizando "trait"
 
-trait MyTrait
+trait MiTrait
 {
-    public function myTraitMethod()
+    public function miMetodoTrait()
     {
-        print 'I have MyTrait';
+        print 'Tengo trait';
     }
 }
 
-class MyTraitfulClass
+class MiClaseTrait
 {
-    use MyTrait;
+    use MiTrait;
 }
 
-$cls = new MyTraitfulClass();
-$cls->myTraitMethod(); // Prints "I have MyTrait"
+$cls = new MiClaseTrait();
+$cls->miMetodoTrait(); // Imprime "Tengo trait"
 
 
 /********************************
  * Namespaces
  */
 
-// This section is separate, because a namespace declaration
-// must be the first statement in a file. Let's pretend that is not the case
+// Esta sección está separada porque una declaración de namespace debe
+// ser la primera sentencia en un archivo. Vamos a suponer que no es el caso
 
 <?php
 
-// By default, classes exist in the global namespace, and can
-// be explicitly called with a backslash.
+// Por defecto, las clases existen en el namespace global y pueden ser llamadas
+// explícitamente con una contrabarra.
 
-$cls = new \MyClass();
+$cls = new \MiClase();
 
 
 
-// Set the namespace for a file
-namespace My\Namespace;
+// Estableder el namespace para un archivo
+namespace Mi\Namespace;
 
-class MyClass
+class MiClase
 {
 }
 
-// (from another file)
-$cls = new My\Namespace\MyClass;
+// (de otro archivo)
+$cls = new Mi\Namespace\MiClase;
 
-//Or from within another namespace.
-namespace My\Other\Namespace;
+// O de otro namespace.
+namespace Mi\Otro\Namespace;
 
-use My\Namespace\MyClass;
+use Mi\Namespace\MiClase;
 
-$cls = new MyClass();
+$cls = new MiClase();
 
-// Or you can alias the namespace;
+// O se puede asignar un ales al namespace
 
-namespace My\Other\Namespace;
+namespace Mi\Otro\Namespace;
 
-use My\Namespace as SomeOtherNamespace;
+use Mi\Namespace as OtroNamespace;
 
-$cls = new SomeOtherNamespace\MyClass();
+$cls = new OtroNamespace\MiClase();
 
 
 /**********************
@@ -738,86 +739,87 @@ $cls = new SomeOtherNamespace\MyClass();
 *
 */
 
-class ParentClass {
-    public static function who() {
-        echo "I'm a " . __CLASS__ . "\n";
+class ClasePadre {
+    public static function quien() {
+        echo "Soy una " . __CLASS__ . "\n";
     }
     public static function test() {
-        // self references the class the method is defined within
-        self::who();
-        // static references the class the method was invoked on
-        static::who();
+        // Auto referencia a la clase en la que el método está definido
+        self::quien();
+        // Referencia estáticamente a la clase donde el método ha sido llamado
+        static::quien();
     }
 }
 
-ParentClass::test();
+ClasePadre::test();
 /*
-I'm a ParentClass
-I'm a ParentClass
+Soy una ClasePadre
+Soy una ClasePadre
 */
 
-class ChildClass extends ParentClass {
-    public static function who() {
-        echo "But I'm " . __CLASS__ . "\n";
+class ClaseHija extends ClasePadre {
+    public static function quien() {
+        echo "Pero soy una " . __CLASS__ . "\n";
     }
 }
 
-ChildClass::test();
+ClaseHija::test();
 /*
-I'm a ParentClass
-But I'm ChildClass
+Soy una ClasePadre
+Pero soy una ClaseHija
 */
 
 
 /**********************
-*  Error Handling
+*  Manejo de errores
 *  
 */
 
-// Simple error handling can be done with try catch block
+// Una simple gestión de errores puede ser realizada con un bloque try catch
 
 try {
-    // Do something
+    // Haz algo
 } catch (Exception $e) {
-    // Handle exception
+    // Maneja la excepción
 }
 
-// When using try catch blocks in a namespaced enviroment use the following
+// Cuando se utilicen bloques try catch en un entorno con namespaces hay que
+// usar lo siguiente
 
 try {
-    // Do something
+    // Haz algo
 } catch (\Exception $e) {
-    // Handle exception
+    // Maneja la excepción
 }
 
-// Custom exceptions
+// Excepciones personalizadas
 
-class MyException extends Exception {}
+class MiExcepcion extends Exception {}
 
 try {
 
-    $condition = true;
+    $condicion = true;
 
-    if ($condition) {
-        throw new MyException('Something just happend');
+    if ($condicion) {
+        throw new MiExcepcion('Ha pasado algo');
     }
 
-} catch (MyException $e) {
-    // Handle my exception
+} catch (MiExcepcion $e) {
+    // Manejar la excepción
 }
 
 ```
 
-## More Information
+## Más información
 
-Visit the [official PHP documentation](http://www.php.net/manual/) for reference
-and community input.
+Visita la [documentación oficial de PHP](http://www.php.net/manual/) para más referencias
+y apoyo de la comunidad.
 
-If you're interested in up-to-date best practices, visit
+Si estás interesado en buenas prácticas, visita
 [PHP The Right Way](http://www.phptherightway.com/).
 
-If you're coming from a language with good package management, check out
+Si vienes de un lenguaje con una buena gestión de paquetes, visita
 [Composer](http://getcomposer.org/).
 
-For common standards, visit the PHP Framework Interoperability Group's
+Para estándares comunes, visita el PHP Framework Interoperability Group
 [PSR standards](https://github.com/php-fig/fig-standards).

From 9631e99f4acca4c4415f5166c2a8f7292058cd51 Mon Sep 17 00:00:00 2001
From: meinkej <jerome.meinke@googlemail.com>
Date: Sat, 31 Oct 2015 15:39:50 +0100
Subject: [PATCH 26/88] Improvements to the german LaTeX document. Fix a
 sentence, added a command to be able to define multiline comment blocks.
 Additionally, make use of the \LaTeX command to correctly show the LaTeX
 logo.

---
 de-de/latex-de.html.markdown | 91 ++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 40 deletions(-)

diff --git a/de-de/latex-de.html.markdown b/de-de/latex-de.html.markdown
index 2c18b8fd..ee9c6e3e 100644
--- a/de-de/latex-de.html.markdown
+++ b/de-de/latex-de.html.markdown
@@ -6,19 +6,19 @@ contributors:
     - ["Sricharan Chiruvolu", "http://sricharan.xyz"]
 translators:
   - ["Moritz Kammerer", "https://github.com/phxql"]
+  - ["Jerome Meinke", "https://github.com/jmeinke"]
 lang: de-de
 filename: latex-de.tex
 ---
 ```
-% Alle Kommentare starten fangen mit % an
-% Es gibt keine Kommentare über mehrere Zeilen
+% Alle Kommentare starten mit einem Prozentzeichen %
 
-% LateX ist keine "What You See Is What You Get" Textverarbeitungssoftware wie z.B.
+% LaTeX ist keine "What You See Is What You Get" Textverarbeitungssoftware wie z.B.
 % MS Word oder OpenOffice Writer
 
-% Jedes LateX-Kommando startet mit einem Backslash (\)
+% Jedes LaTeX-Kommando startet mit einem Backslash (\)
 
-% LateX-Dokumente starten immer mit der Definition des Dokuments, die sie darstellen
+% LaTeX-Dokumente starten immer mit der Definition des Dokuments, die sie darstellen
 % Weitere Dokumententypen sind z.B. book, report, presentations, etc.
 % Optionen des Dokuments stehen zwischen den eckigen Klammern []. In diesem Fall
 % wollen wir einen 12 Punkte-Font verwenden.
@@ -26,7 +26,7 @@ filename: latex-de.tex
 
 % Als nächstes definieren wir die Pakete, die wir verwenden wollen.
 % Wenn du z.B. Grafiken, farbigen Text oder Quelltext in dein Dokument einbetten möchtest,
-% musst du die Fähigkeiten von Latex durch Hinzufügen von Paketen erweitern.
+% musst du die Fähigkeiten von LaTeX durch Hinzufügen von Paketen erweitern.
 % Wir verwenden die Pakete float und caption für Bilder.
 \usepackage{caption}
 \usepackage{float}
@@ -34,30 +34,41 @@ filename: latex-de.tex
 % Mit diesem Paket können leichter Umlaute getippt werden
 \usepackage[utf8]{inputenc}
 
+% Es gibt eigentlich keine Kommentare über mehrere Zeilen, solche kann man
+% aber selbst durch die Angabe eigener Kommandos definieren.
+% Dieses Kommando kann man später benutzen.
+\newcommand{\comment}[1]{}
+
 % Es können durchaus noch weitere Optione für das Dokument gesetzt werden!
 \author{Chaitanya Krishna Ande, Colton Kohnke \& Sricharan Chiruvolu}
 \date{\today}
-\title{Learn LaTeX in Y Minutes!}
+\title{Learn \LaTeX\ in Y Minutes!}
 
 % Nun kann's losgehen mit unserem Dokument.
 % Alles vor dieser Zeile wird die Preamble genannt.
-\begin{document} 
+\begin{document}
+
+\comment{
+  Dies ist unser selbst-definierter Befehl
+  für mehrzeilige Kommentare.
+}
+
 % Wenn wir den Autor, das Datum und den Titel gesetzt haben, kann
-% LateX für uns eine Titelseite generieren
+% LaTeX für uns eine Titelseite generieren
 \maketitle
 
-% Die meisten Paper haben ein Abstract. LateX bietet dafür einen vorgefertigen Befehl an.
+% Die meisten Paper haben ein Abstract. LaTeX bietet dafür einen vorgefertigen Befehl an.
 % Das Abstract sollte in der logischen Reihenfolge, also nach dem Titel, aber vor dem
 % Inhalt erscheinen.
 % Dieser Befehl ist in den Dokumentenklassen article und report verfügbar.
 \begin{abstract}
- LateX documentation geschrieben in LateX! Wie ungewöhnlich und garantiert nicht meine Idee!
+ \LaTeX -Documentation geschrieben in \LaTeX ! Wie ungewöhnlich und garantiert nicht meine Idee!
 \end{abstract}
 
 % Section Befehle sind intuitiv.
 % Alle Titel der sections werden automatisch in das Inhaltsverzeichnis übernommen.
 \section{Einleitung}
-Hi, mein Name ist Moritz und zusammen werden wir LateX erforschen!
+Hi, mein Name ist Moritz und zusammen werden wir \LaTeX\ erforschen!
 
 \section{Noch eine section}
 Das hier ist der Text für noch eine section. Ich glaube, wir brauchen eine subsection.
@@ -71,16 +82,16 @@ So ist's schon viel besser.
 
 % Wenn wir den Stern nach section schreiben, dann unterdrückt LateX die Nummerierung.
 % Das funktioniert auch bei anderen Befehlen.
-\section*{Das ist eine unnummerierte section} 
-Es müssen nicht alle sections nummeriert sein!
+\section*{Das ist eine unnummerierte section}
+Es müssen nicht alle Sections nummeriert sein!
 
 \section{Ein paar Notizen}
-LateX ist ziemlich gut darin, Text so zu platzieren, dass es gut aussieht.
+\LaTeX\ ist ziemlich gut darin, Text so zu platzieren, dass es gut aussieht.
 Falls eine Zeile \\ mal \\ woanders \\ umgebrochen \\ werden \\ soll, füge
 \textbackslash\textbackslash in den Code ein.\\
 
 \section{Listen}
-Listen sind eine der einfachsten Dinge in LateX. Ich muss morgen einkaufen gehen,
+Listen sind eine der einfachsten Dinge in \LaTeX. Ich muss morgen einkaufen gehen,
 also lass uns eine Einkaufsliste schreiben:
 \begin{enumerate} % Dieser Befehl erstellt eine "enumerate" Umgebung.
   % \item bringt enumerate dazu, eins weiterzuzählen.
@@ -96,7 +107,7 @@ also lass uns eine Einkaufsliste schreiben:
 
 \section{Mathe}
 
-Einer der Haupteinsatzzwecke von LateX ist das Schreiben von akademischen
+Einer der Haupteinsatzzwecke von \LaTeX\ ist das Schreiben von akademischen
 Artikeln oder Papern. Meistens stammen diese aus dem Bereich der Mathe oder
 anderen Wissenschaften. Und deswegen müssen wir in der Lage sein, spezielle
 Symbole zu unserem Paper hinzuzufügen! \\
@@ -106,18 +117,18 @@ Symbole für Mengen und relationen, Pfeile, Operatoren und Griechische Buchstabe
 um nur ein paar zu nennen.\\
 
 Mengen und Relationen spielen eine sehr wichtige Rolle in vielen mathematischen
-Papern. So schreibt man in LateX, dass alle y zu X gehören: $\forall$ y $\in$ X. \\
+Papern. So schreibt man in \LaTeX, dass alle y zu X gehören: $\forall$ y $\in$ X. \\
 
-% Achte auf die $ Zeichen vor und nach den Symbolen. Wenn wir in LateX schreiben,
+% Achte auf die $ Zeichen vor und nach den Symbolen. Wenn wir in LaTeX schreiben,
 % geschieht dies standardmäßig im Textmodus. Die Mathe-Symbole existieren allerdings
 % nur im Mathe-Modus. Wir können den Mathe-Modus durch das $ Zeichen aktivieren und
 % ihn mit $ wieder verlassen. Variablen können auch im Mathe-Modus angezeigt werden.
 
 Mein Lieblingsbuchstabe im Griechischen ist $\xi$. Ich mag auch $\beta$, $\gamma$ und $\sigma$.
-Bis jetzt habe ich noch keinen griechischen Buchstaben gefunden, den LateX nicht kennt!
+Bis jetzt habe ich noch keinen griechischen Buchstaben gefunden, den \LaTeX nicht kennt!
 
 Operatoren sind ebenfalls wichtige Bestandteile von mathematischen Dokumenten:
-Trigonometrische Funktionen ($\sin$, $\cos$, $\tan$), 
+Trigonometrische Funktionen ($\sin$, $\cos$, $\tan$),
 Logarithmus und Exponenten ($\log$, $\exp$),
 Grenzwerte ($\lim$), etc. haben vordefinierte Befehle.
 Lass uns eine Gleichung schreiben: \\
@@ -127,7 +138,7 @@ $\cos(2\theta) = \cos^{2}(\theta) - \sin^{2}(\theta)$\\
 Brüche (Zähler / Nenner) können so geschrieben werden:
 
 % 10 / 7
-$^{10}/_{7}$ 
+$^{10}/_{7}$
 
 % Komplexere Brüche können so geschrieben werden:
 % \frac{Zähler}{Nenner}
@@ -142,19 +153,19 @@ Wir können Gleichungen auch in einer equation Umgebung verwenden.
 \end{equation} % Alle \begin Befehle müssen einen \end Befehl besitzen
 
 Wir können nun unsere Gleichung referenzieren!
-Gleichung ~\ref{eq:pythagoras} ist auch als das Theorem des Pythagoras bekannt. Dieses wird in 
+Gleichung ~\ref{eq:pythagoras} ist auch als das Theorem des Pythagoras bekannt. Dieses wird in
 Abschnitt ~\ref{subsec:pythagoras} behandelt. Es können sehr viele Sachen mit Labels versehen werden:
 Grafiken, Gleichungen, Sections, etc.
 
 Summen und Integrale können mit den sum und int Befehlen dargestellt werden:
 
-% Manche LateX-Compiler beschweren sich, wenn Leerzeilen in Gleichungen auftauchen
-\begin{equation} 
+% Manche LaTeX-Compiler beschweren sich, wenn Leerzeilen in Gleichungen auftauchen
+\begin{equation}
   \sum_{i=0}^{5} f_{i}
-\end{equation} 
-\begin{equation} 
+\end{equation}
+\begin{equation}
   \int_{0}^{\infty} \mathrm{e}^{-x} \mathrm{d}x
-\end{equation} 
+\end{equation}
 
 \section{Grafiken}
 
@@ -164,7 +175,7 @@ Aber keine Sorge, ich muss auch jedes mal nachschauen, welche Option wie wirkt.
 \begin{figure}[H] % H ist die Platzierungsoption
     \centering % Zentriert die Grafik auf der Seite
     % Fügt eine Grafik ein, die auf 80% der Seitenbreite einnimmt.
-    %\includegraphics[width=0.8\linewidth]{right-triangle.png} 
+    %\includegraphics[width=0.8\linewidth]{right-triangle.png}
     % Auskommentiert, damit es nicht im Dokument auftaucht.
     \caption{Dreieck mit den Seiten $a$, $b$, $c$}
     \label{fig:right-triangle}
@@ -177,7 +188,7 @@ Wir können Tabellen genauso wie Grafiken einfügen.
   \caption{Überschrift der Tabelle.}
   % Die {} Argumente geben an, wie eine Zeile der Tabelle dargestellt werden soll.
   % Auch hier muss ich jedes Mal nachschauen. Jedes. einzelne. Mal.  
-  \begin{tabular}{c|cc} 
+  \begin{tabular}{c|cc}
     Nummer &  Nachname & Vorname \\ % Spalten werden durch & getrennt
     \hline % Eine horizontale Linie
     1 & Biggus & Dickus \\
@@ -187,36 +198,36 @@ Wir können Tabellen genauso wie Grafiken einfügen.
 
 % \section{Links} % Kommen bald!
 
-\section{Verhindern, dass LateX etwas kompiliert (z.B. Quelltext)}
-Angenommen, wir wollen Quelltext in unserem LateX-Dokument. LateX soll 
-in diesem Fall nicht den Quelltext als LateX-Kommandos interpretieren, 
+\section{Verhindern, dass \LaTeX\ etwas kompiliert (z.B. Quelltext)}
+Angenommen, wir wollen Quelltext in unserem \LaTeX-Dokument. \LaTeX\ soll
+in diesem Fall nicht den Quelltext als \LaTeX-Kommandos interpretieren,
 sondern es einfach ins Dokument schreiben. Um das hinzubekommen, verwenden
 wir eine verbatim Umgebung.
 
 % Es gibt noch weitere Pakete für Quelltexte (z.B. minty, lstlisting, etc.)
 % aber verbatim ist das simpelste.
-\begin{verbatim} 
+\begin{verbatim}
   print("Hello World!")
   a%b; % Schau dir das an! Wir können % im verbatim verwenden!
   random = 4; #decided by fair random dice roll
 \end{verbatim}
 
-\section{Kompilieren} 
+\section{Kompilieren}
 
 Ich vermute, du wunderst dich, wie du dieses tolle Dokument in ein PDF
 verwandeln kannst. (Ja, dieses Dokument kompiliert wirklich!) \\
 
 Dafür musst du folgende Schritte durchführen:
   \begin{enumerate}
-    \item Schreibe das Dokument. (den LateX-Quelltext).
-    \item Kompiliere den Quelltext in ein PDF. 
+    \item Schreibe das Dokument. (den \LaTeX -Quelltext).
+    \item Kompiliere den Quelltext in ein PDF.
      Das Kompilieren sieht so ähnlich wie das hier aus (Linux): \\
-     \begin{verbatim} 
-        $pdflatex learn-latex.tex learn-latex.pdf 
+     \begin{verbatim}
+        $pdflatex learn-latex.tex learn-latex.pdf
      \end{verbatim}
   \end{enumerate}
 
-Manche LateX-Editoren kombinieren Schritt 1 und 2. Du siehst also nur Schritt 1 und Schritt
+Manche \LaTeX-Editoren kombinieren Schritt 1 und 2. Du siehst also nur Schritt 1 und Schritt
 2 wird unsichtbar im Hintergrund ausgeführt.
 
 Alle Formatierungsoptionen werden in Schritt 1 in den Quelltext geschrieben. Schritt 2 verwendet

From c0b2ccdb43ab8b49cfdab277c8cc266abf532bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20P=C3=A9rez?= <mario@geekytheory.com>
Date: Sat, 31 Oct 2015 15:45:36 +0100
Subject: [PATCH 27/88] Create latex es-es file

---
 es-es/latex-es.html.markdown | 239 +++++++++++++++++++++++++++++++++++
 1 file changed, 239 insertions(+)
 create mode 100644 es-es/latex-es.html.markdown

diff --git a/es-es/latex-es.html.markdown b/es-es/latex-es.html.markdown
new file mode 100644
index 00000000..11bac4fc
--- /dev/null
+++ b/es-es/latex-es.html.markdown
@@ -0,0 +1,239 @@
+---
+language: latex
+contributors:
+    - ["Chaitanya Krishna Ande", "http://icymist.github.io"]
+    - ["Colton Kohnke", "http://github.com/voltnor"]
+    - ["Sricharan Chiruvolu", "http://sricharan.xyz"]
+translators:
+    - ["Mario Pérez", "https://github.com/MarioPerezEsteso"]
+filename: learn-latex-es.tex
+---
+
+```tex
+% All comment lines start with %
+% There are no multi-line comments
+
+% LaTeX is NOT a "What You See Is What You Get" word processing software like
+% MS Word, or OpenOffice Writer
+
+% Every LaTeX command starts with a backslash (\)
+
+% LaTeX documents start with a defining the type of document it's compiling
+% Other document types include book, report, presentations, etc.
+% The options for the document appear in the [] brackets. In this case
+% it specifies we want to use 12pt font.
+\documentclass[12pt]{article}
+
+% Next we define the packages the document uses.
+% If you want to include graphics, colored text, or
+% source code from another language file into your document,
+% you need to enhance the capabilities of LaTeX. This is done by adding packages.
+% I'm going to include the float and caption packages for figures.
+\usepackage{caption}
+\usepackage{float}
+
+% We can define some other document properties too!
+\author{Chaitanya Krishna Ande, Colton Kohnke \& Sricharan Chiruvolu}
+\date{\today}
+\title{Learn LaTeX in Y Minutes!}
+
+% Now we're ready to begin the document
+% Everything before this line is called "The Preamble"
+\begin{document}
+% if we set the author, date, title fields, we can have LaTeX
+% create a title page for us.
+\maketitle
+
+% Most research papers have abstract, you can use the predefined commands for this.
+% This should appear in its logical order, therefore, after the top matter,
+% but before the main sections of the body.
+% This command is available in the document classes article and report.
+\begin{abstract}
+ LaTeX documentation written as LaTeX! How novel and totally not my idea!
+\end{abstract}
+
+% Section commands are intuitive.
+% All the titles of the sections are added automatically to the table of contents.
+\section{Introduction}
+Hello, my name is Colton and together we're going to explore LaTeX!
+
+\section{Another section}
+This is the text for another section. I think it needs a subsection.
+
+\subsection{This is a subsection} % Subsections are also intuitive.
+I think we need another one
+
+\subsubsection{Pythagoras}
+Much better now.
+\label{subsec:pythagoras}
+
+% By using the asterisk we can suppress LaTeX's inbuilt numbering.
+% This works for other LaTeX commands as well.
+\section*{This is an unnumbered section}
+However not all sections have to be numbered!
+
+\section{Some Text notes}
+LaTeX is generally pretty good about placing text where it should go. If
+a line \\ needs \\ to \\ break \\ you add \textbackslash\textbackslash to
+the source code. \\
+
+\section{Lists}
+Lists are one of the easiest things to create in LaTeX! I need to go shopping
+tomorrow, so let's make a grocery list.
+\begin{enumerate} % This creates an "enumerate" environment.
+  % \item tells the enumerate to increment
+  \item Salad.
+  \item 27 watermelon.
+  \item A single jackrabbit.
+  % we can even override the item number by using []
+  \item[how many?] Medium sized squirt guns.
+
+  Not a list item, but still part of the enumerate.
+
+\end{enumerate} % All environments must have an end.
+
+\section{Math}
+
+One of the primary uses for LaTeX is to produce academic articles or
+technical papers. Usually in the realm of math and science. As such,
+we need to be able to add special symbols to our paper! \\
+
+Math has many symbols, far beyond what you can find on a keyboard;
+Set and relation symbols, arrows, operators, and Greek letters to name a few.\\
+
+Sets and relations play a vital role in many mathematical research papers.
+Here's how you state all y that belong to X, $\forall$ x $\in$ X. \\
+% Notice how I needed to add $ signs before and after the symbols. This is
+% because when writing, we are in text-mode.
+% However, the math symbols only exist in math-mode.
+% We can enter math-mode from text mode with the $ signs.
+% The opposite also holds true. Variable can also be rendered in math-mode.
+% We can also enter math mode with \[\]
+
+\[a^2 + b^2 = c^2 \]
+
+My favorite Greek letter is $\xi$. I also like $\beta$, $\gamma$ and $\sigma$.
+I haven't found a Greek letter that yet that LaTeX doesn't know about!
+
+Operators are essential parts of a mathematical document:
+trigonometric functions ($\sin$, $\cos$, $\tan$),
+logarithms and exponentials ($\log$, $\exp$),
+limits ($\lim$), etc.
+have per-defined LaTeX commands.
+Let's write an equation to see how it's done: \\
+
+$\cos(2\theta) = \cos^{2}(\theta) - \sin^{2}(\theta)$
+
+Fractions(Numerator-denominators) can be written in these forms:
+
+% 10 / 7
+$^{10}/_{7}$
+
+% Relatively complex fractions can be written as
+% \frac{numerator}{denominator}
+$\frac{n!}{k!(n - k)!}$ \\
+
+We can also insert equations in an "equation environment".
+
+% Display math with the equation 'environment'
+\begin{equation} % enters math-mode
+    c^2 = a^2 + b^2.
+    \label{eq:pythagoras} % for referencing
+\end{equation} % all \begin statements must have an end statement
+
+We can then reference our new equation!
+Eqn.~\ref{eq:pythagoras} is also known as the Pythagoras Theorem which is also
+the subject of Sec.~\ref{subsec:pythagoras}. A lot of things can be labeled:
+figures, equations, sections, etc.
+
+Summations and Integrals are written with sum and int commands:
+
+% Some LaTeX compilers will complain if there are blank lines
+% In an equation environment.
+\begin{equation}
+  \sum_{i=0}^{5} f_{i}
+\end{equation}
+\begin{equation}
+  \int_{0}^{\infty} \mathrm{e}^{-x} \mathrm{d}x
+\end{equation}
+
+\section{Figures}
+
+Let's insert a Figure. Figure placement can get a little tricky.
+I definitely have to lookup the placement options each time.
+
+\begin{figure}[H] % H here denoted the placement option.
+    \centering % centers the figure on the page
+    % Inserts a figure scaled to 0.8 the width of the page.
+    %\includegraphics[width=0.8\linewidth]{right-triangle.png}
+    % Commented out for compilation purposes. Please use your imagination.
+    \caption{Right triangle with sides $a$, $b$, $c$}
+    \label{fig:right-triangle}
+\end{figure}
+
+\subsection{Table}
+We can also insert Tables in the same way as figures.
+
+\begin{table}[H]
+  \caption{Caption for the Table.}
+  % the {} arguments below describe how each row of the table is drawn.
+  % Again, I have to look these up. Each. And. Every. Time.
+  \begin{tabular}{c|cc}
+    Number &  Last Name & First Name \\ % Column rows are separated by $
+    \hline % a horizontal line
+    1 & Biggus & Dickus \\
+    2 & Monty & Python
+  \end{tabular}
+\end{table}
+
+% \section{Hyperlinks} % Coming soon
+
+\section{Getting LaTeX to not compile something (i.e. Source Code)}
+Let's say we want to include some code into our LaTeX document,
+we would then need LaTeX to not try and interpret that text and
+instead just print it to the document. We do this we a verbatim
+environment.
+
+% There are other packages that exist (i.e. minty, lstlisting, etc.)
+% but verbatim is the bare-bones basic one.
+\begin{verbatim}
+  print("Hello World!")
+  a%b; % look! We can use % signs in verbatim.
+  random = 4; #decided by fair random dice roll
+\end{verbatim}
+
+\section{Compiling}
+
+By now you're probably wondering how to compile this fabulous document
+and look at the glorious glory that is a LaTeX pdf.
+(yes, this document actually does compiles). \\
+Getting to the final document using LaTeX consists of the following steps:
+  \begin{enumerate}
+    \item Write the document in plain text (the "source code").
+    \item Compile source code to produce a pdf.
+     The compilation step looks something like this (in Linux): \\
+     \begin{verbatim}
+        $pdflatex learn-latex.tex learn-latex.pdf
+     \end{verbatim}
+  \end{enumerate}
+
+A number of LaTeX editors combine both Step 1 and Step 2 in the same piece of
+software. So, you get to see Step 1, but not Step 2 completely.
+Step 2 is still happening behind the scenes.
+
+You write all your formatting information in plain text in Step 1.
+The compilation part in Step 2 takes care of producing the document in the
+format you defined in Step 1.
+
+\section{End}
+
+That's all for now!
+
+% end the document
+\end{document}
+```
+
+## Más información sobre LaTeX
+
+* El wikilibro LaTeX: [https://es.wikibooks.org/wiki/Manual_de_LaTeX](https://es.wikibooks.org/wiki/Manual_de_LaTeX)
+* Un tutorial real: [http://www.latex-tutorial.com/](http://www.latex-tutorial.com/)

From 23b35d9da0b3c1de5ff6a0b262b08020f0f56c4f Mon Sep 17 00:00:00 2001
From: roymiloh <rmiloh@gmail.com>
Date: Sat, 31 Oct 2015 17:20:03 +0200
Subject: [PATCH 28/88] [C#/en] Fix to "extension methods"

over using "extension functions", it's more accurate.
---
 csharp.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csharp.html.markdown b/csharp.html.markdown
index dfdd98de..d6c503ae 100644
--- a/csharp.html.markdown
+++ b/csharp.html.markdown
@@ -630,7 +630,7 @@ on a new line! ""Wow!"", the masses cried";
 
     public static class Extensions
     {
-        // EXTENSION FUNCTIONS
+        // EXTENSION METHODS
         public static void Print(this object obj)
         {
             Console.WriteLine(obj.ToString());

From 09cbaa6536e13dc2e4e20d8222423968cd989492 Mon Sep 17 00:00:00 2001
From: Abdul Alim <alim@iflix.com>
Date: Sat, 31 Oct 2015 23:28:39 +0800
Subject: [PATCH 29/88] [JSON/ms-my] Added Malay (Malaysia) translation for
 JSON

---
 ms-my/json-my.html.markdown | 102 ++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 ms-my/json-my.html.markdown

diff --git a/ms-my/json-my.html.markdown b/ms-my/json-my.html.markdown
new file mode 100644
index 00000000..2d2da519
--- /dev/null
+++ b/ms-my/json-my.html.markdown
@@ -0,0 +1,102 @@
+---
+language: json
+filename: learnjson-ms.json
+contributors:
+  - ["Anna Harren", "https://github.com/iirelu"]
+  - ["Marco Scannadinari", "https://github.com/marcoms"]
+  - ["himanshu", "https://github.com/himanshu81494"]
+  - ["Michael Neth", "https://github.com/infernocloud"]
+translators:
+    - ["abdalim", "https://github.com/abdalim"]
+lang: ms-my
+---
+
+Disebabkan JSON adalah format pertukaran-data yang sangat ringkas, panduan ini
+kemungkinan besar adalah Learn X in Y Minutes yang paling mudah.
+
+JSON dalam bentuk paling aslinya sebenarnya tidak mempunyai sebarang komentar,
+tetapi kebanyakan pembaca menerima komen dalam bentuk C (`\\`,`/* */`). Beberapa
+pembaca juga bertoleransi terhadap koma terakhir (iaitu koma selepas elemen
+terakhir di dalam array atau selepas ciri terakhir sesuatu objek), tetapi semua
+ini harus dielakkan dan dijauhkan untuk keserasian yang lebih baik.
+
+Untuk tujuan ini bagaimanapun, semua di dalam panduan ini adalah 100% JSON yang
+sah. Luckily, it kind of speaks for itself.
+
+Sebuah nilai JSON harus terdiri dari salah satu, iaitu, nombor, string, array,
+objek atau salah satu dari nama literal berikut: true, false, null.
+
+Pelayar web yang menyokong adalah: Firefox 3.5+, Internet Explorer 8.0+, Chrome
+1.0+, Opera 10.0+, dan Safari 4.0+.
+
+Sambungan fail untuk fail - fail JSON adalah ".json" dan jenis MIME untuk teks
+JSON adalah "application/json".
+
+Banyak bahasa aturcara mempunyai fungsi untuk menyirikan (mengekod) dan
+menyah-sirikan (men-dekod) data JSON kepada struktur data asal. Javascript
+mempunyai sokongon tersirat untuk memanipulasi teks JSON sebagai data.
+
+Maklumat lebih lanjut boleh dijumpai di http://www.json.org/
+
+JSON dibina pada dua struktur:
+* Sebuah koleksi pasangan nama/nilai. Di dalam pelbagai bahasa aturcara, ini
+direalisasikan sebagai objek, rekod, "struct", "dictionary", "hash table",
+senarai berkunci, atau "associative array".
+* Sebuah senarai nilai yang tersusun. Dalam kebanyakan bahasa aturcara, ini
+direalisasikan sebagai array, vektor, senarai atau urutan.
+
+Sebuah objek dengan pelbagai pasangan nama/nilai.
+
+```json
+{
+  "kunci": "nilai",
+
+  "kekunci": "harus sentiasa dibalut dengan 'double quotes'",
+  "nombor": 0,
+  "strings": "Hellø, wørld. Semua unicode dibenarkan, bersama \"escaping\".",
+  "ada bools?": true,
+  "tiada apa - apa": null,
+
+  "nombor besar": 1.2e+100,
+
+  "objek": {
+    "komen": "Sebahagian besar struktur akan terdiri daripada objek.",
+
+    "array": [0, 1, 2, 3, "Array boleh mempunyai sebarang jenis data di dalamnya.", 5],
+
+    "objek lain": {
+      "komen": "Objek boleh dibina dengan pelbagai lapisan, sangat berguna."
+    }
+  },
+
+  "kebendulan": [
+    {
+      "punca potassium": ["pisang"]
+    },
+    [
+      [1, 0, 0, 0],
+      [0, 1, 0, 0],
+      [0, 0, 1, "neo"],
+      [0, 0, 0, 1]
+    ]
+  ],
+
+  "stail alternatif": {
+    "komen": "cuba lihat ini!"
+  , "posisi koma": "tidak mengapa - selagi ia adalah sebelum nama atau kunci seterusnya, maka ia sah"
+  , "komen lain": "sungguh bagus"
+  }
+}
+```
+
+Sebuah array sahaja yang mengandungi nilai - nilai juga adalah JSON yang sah.
+
+```json
+[1, 2, 3, "text", true]
+```
+
+Objek - objek boleh menjadi sebahagian dari array juga.
+
+```json
+[{"nama": "Abe", "umur": 25}, {"nama": "Jemah", "umur": 29}, {"name": "Yob", "umur": 31}]
+```

From fd512d12fcda159469d9450416a527a0a17f2774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20P=C3=A9rez?= <mario@geekytheory.com>
Date: Sat, 31 Oct 2015 16:45:36 +0100
Subject: [PATCH 30/88] Translate learn LaTeX to es-ES

---
 es-es/latex-es.html.markdown | 241 ++++++++++++++++-------------------
 1 file changed, 107 insertions(+), 134 deletions(-)

diff --git a/es-es/latex-es.html.markdown b/es-es/latex-es.html.markdown
index 11bac4fc..6743ad80 100644
--- a/es-es/latex-es.html.markdown
+++ b/es-es/latex-es.html.markdown
@@ -10,146 +10,131 @@ filename: learn-latex-es.tex
 ---
 
 ```tex
-% All comment lines start with %
-% There are no multi-line comments
+% Todas las líneas comentadas comienzan con %
+% No existen los comentarios multilínea
 
-% LaTeX is NOT a "What You See Is What You Get" word processing software like
-% MS Word, or OpenOffice Writer
+% LaTeX NO es un software de procesamiento de texto que cumple con
+% "Lo que ves es lo que tienes" como MS Word u OpenOffice
 
-% Every LaTeX command starts with a backslash (\)
+% Todos los comandos de LaTeX comienzan con una contrabarra (\)
 
-% LaTeX documents start with a defining the type of document it's compiling
-% Other document types include book, report, presentations, etc.
-% The options for the document appear in the [] brackets. In this case
-% it specifies we want to use 12pt font.
+% Los documentos LaTeX comienzan definiendo el tipo de documento que se va a
+% compilar. Algunos tipos de documentos son libros, informes, presentaciones,
+% etc. Las opciones para el documento comienzan en los corchetes []. En este
+% caso, se especifica que queremos utilizar una fuente de tamaño 12pt.
 \documentclass[12pt]{article}
 
-% Next we define the packages the document uses.
-% If you want to include graphics, colored text, or
-% source code from another language file into your document,
-% you need to enhance the capabilities of LaTeX. This is done by adding packages.
-% I'm going to include the float and caption packages for figures.
+% A continuación, definimos los paquetes que utilizará el documento.
+% Si quieres incluir gráficos, texto coloreado o código fuente de otro lenguaje,
+% debes extender las funciones de LaTeX. Esto se consigue añadiendo paquetes.
+% A continuación se incluirán los paquetes float y caption para figuras.
 \usepackage{caption}
 \usepackage{float}
 
-% We can define some other document properties too!
+% También podemos definir otras propiedades en el documento
 \author{Chaitanya Krishna Ande, Colton Kohnke \& Sricharan Chiruvolu}
 \date{\today}
 \title{Learn LaTeX in Y Minutes!}
 
-% Now we're ready to begin the document
-% Everything before this line is called "The Preamble"
+% Ahora estamos preparados para comenzar el documento
+% Todo lo que se encuentre antes de esta línea se llama "El Preámbulo"
 \begin{document}
-% if we set the author, date, title fields, we can have LaTeX
-% create a title page for us.
+% Si especificamos el autor, fecha y título, LaTeX creará una página como título
+% por nosotros
 \maketitle
 
-% Most research papers have abstract, you can use the predefined commands for this.
-% This should appear in its logical order, therefore, after the top matter,
-% but before the main sections of the body.
-% This command is available in the document classes article and report.
+% La mayoría de los artículos de investigación tienen un abstract. Es posible
+% utilizar comandos predefinidos para ello.
+% Esto debería aparecer en su orden lógico. Tras el título pero antes de las
+% secciones principales del cuerpo.
+% Este comando está disponible en los tipos de documentos article y report.
 \begin{abstract}
- LaTeX documentation written as LaTeX! How novel and totally not my idea!
+ Documentación de LaTex escrita en LaTex.
 \end{abstract}
 
-% Section commands are intuitive.
-% All the titles of the sections are added automatically to the table of contents.
-\section{Introduction}
-Hello, my name is Colton and together we're going to explore LaTeX!
+% Los comandos de sección son intuitivos.
+% Todos los títulos de secciones son añadidos automáticamente a la tabla de contenidos.
+\section{Introducción}
+Hola, mi nombre es Mario Pérez y estoy traduciendo este documento para aprender LaTex.
 
-\section{Another section}
-This is the text for another section. I think it needs a subsection.
+\section{Otra sección}
+Este es el texto de otra sección. Creo que necesitará una subsección.
 
-\subsection{This is a subsection} % Subsections are also intuitive.
-I think we need another one
+\subsection{Esto es una subsección} % Las subsecciones también son fáciles.
+Creo que necesitamos otra más.
 
-\subsubsection{Pythagoras}
-Much better now.
-\label{subsec:pythagoras}
+\subsubsection{Pitágoras}
+Mejor ahora.
+\label{subsec:pitagoras}
 
-% By using the asterisk we can suppress LaTeX's inbuilt numbering.
-% This works for other LaTeX commands as well.
-\section*{This is an unnumbered section}
-However not all sections have to be numbered!
+% Utilizando el asterisco podemos decirle a LaTeX que no ponga los números de secciones y subsecciones.
+% Esto también funciona con otros comandos de LaTeX.
+\section*{Esto es una sección no numerada}
+¡No todas las secciones tienen que estar numeradas!
 
-\section{Some Text notes}
-LaTeX is generally pretty good about placing text where it should go. If
-a line \\ needs \\ to \\ break \\ you add \textbackslash\textbackslash to
-the source code. \\
+\section{Algunas notas}
+LaTeX es generalmente bastante bueno situando el texto donde debe ir. Si una lína \\ necesita \\ ser \\ rota \\ puedes poner \textbackslash\textbackslash en el código fuente. \\
 
-\section{Lists}
-Lists are one of the easiest things to create in LaTeX! I need to go shopping
-tomorrow, so let's make a grocery list.
-\begin{enumerate} % This creates an "enumerate" environment.
-  % \item tells the enumerate to increment
-  \item Salad.
-  \item 27 watermelon.
-  \item A single jackrabbit.
-  % we can even override the item number by using []
-  \item[how many?] Medium sized squirt guns.
+\section{Listas}
+Las listas son de las cosas más fáciles de crear en LaTeX. Necesito ir a comprar mañana, así que vamos a crear una lista de la compra.
+\begin{enumerate} % Esto crea una lista numerada.
+  % \item crea un elemento
+  \item Ensalada.
+  \item 27 sandías.
+  \item Pescado.
+  % podemos incluso sobreescribir el número del ítem usando []
+  \item[cuántos?] Plátanos.
 
-  Not a list item, but still part of the enumerate.
+  No es un ítem de la lista, pero sigue siendo parte de la enumeración.
 
-\end{enumerate} % All environments must have an end.
+\end{enumerate} % Todos los contextos deben tener un final.
 
-\section{Math}
+\section{Matemáticas}
 
-One of the primary uses for LaTeX is to produce academic articles or
-technical papers. Usually in the realm of math and science. As such,
-we need to be able to add special symbols to our paper! \\
+Uno de los usos principales de LaTeX es la producción de artículos académicos o técnicos. Normalmente relacionados con la ciencia y las matemáticas. Debido a esto, necesitamos poder añadir símbolos especiales a nuestro artículo.\\
 
-Math has many symbols, far beyond what you can find on a keyboard;
-Set and relation symbols, arrows, operators, and Greek letters to name a few.\\
+En matemáticas hay muchos símbolos. Más de los que podemos encontrar en un teclado. Flechas o letras por nombrar un par.\\
 
-Sets and relations play a vital role in many mathematical research papers.
-Here's how you state all y that belong to X, $\forall$ x $\in$ X. \\
-% Notice how I needed to add $ signs before and after the symbols. This is
-% because when writing, we are in text-mode.
-% However, the math symbols only exist in math-mode.
-% We can enter math-mode from text mode with the $ signs.
-% The opposite also holds true. Variable can also be rendered in math-mode.
-% We can also enter math mode with \[\]
+Algunos símbolos juegan un papel fundamental en muchos artículos de investigación matemática. Así es como se establece que todo Y pertenece a X:  $\forall$ x $\in$ X. \\
+He necesitado añadir el signo $ antes de los símbolos. Esto se debe a que cuando escribimos, estamos en modo texto. Sin embargo, los símbolos solo pueden utilizarse en modo matemático, al cual se entra con el signo $.
+% Lo opuesto también se cumple. Una variable también puede ser mostrada en modo matemático, al que también se puede entrar con \[\]
 
 \[a^2 + b^2 = c^2 \]
 
-My favorite Greek letter is $\xi$. I also like $\beta$, $\gamma$ and $\sigma$.
-I haven't found a Greek letter that yet that LaTeX doesn't know about!
+Mi letra griega favorita es $\xi$. También me gustan $\beta$, $\gamma$ y $\sigma$.
+Todavía no he encontrado una letra griega que LaTeX no conozca.
 
-Operators are essential parts of a mathematical document:
-trigonometric functions ($\sin$, $\cos$, $\tan$),
-logarithms and exponentials ($\log$, $\exp$),
-limits ($\lim$), etc.
-have per-defined LaTeX commands.
-Let's write an equation to see how it's done: \\
+Los operadores son también una parte esencial de un documento matemático: 
+funciones trigonométricas ($\sin$, $\cos$, $\tan$), logaritmos y exponenciales ($\log$, $\exp$), límites ($\lim$), etc. tienen comandos predefinidos en LaTeX.
+
+Vamos a escribir una ecuación para ver cómo se hace: \\
 
 $\cos(2\theta) = \cos^{2}(\theta) - \sin^{2}(\theta)$
 
-Fractions(Numerator-denominators) can be written in these forms:
+Las fracciones (numeradores-denominadores) pueden escribirse de la siguiente forma:
 
 % 10 / 7
 $^{10}/_{7}$
 
-% Relatively complex fractions can be written as
-% \frac{numerator}{denominator}
+% Las fracciones relativamente complejas pueden escribirse como
+% \frac{numerador}{denominador}
 $\frac{n!}{k!(n - k)!}$ \\
 
-We can also insert equations in an "equation environment".
+También podemos insertar ecuaciones en un contexto de ecuación.
 
-% Display math with the equation 'environment'
-\begin{equation} % enters math-mode
+% Mostrar matemáticas en el contexto de ecuaciones
+\begin{equation} % entra en modo matemático
     c^2 = a^2 + b^2.
-    \label{eq:pythagoras} % for referencing
-\end{equation} % all \begin statements must have an end statement
+    \label{eq:pitagoras} % para referencias
+\end{equation} % Todos los contextos deben tener un final.
 
-We can then reference our new equation!
-Eqn.~\ref{eq:pythagoras} is also known as the Pythagoras Theorem which is also
-the subject of Sec.~\ref{subsec:pythagoras}. A lot of things can be labeled:
-figures, equations, sections, etc.
+Podemos referenciar nuestra nueva ecuación.
+Ecuación ~\ref{eq:pythagoras} también se conoce como el Teorema de Pitágoras, el cual también se encuentra en la sección ~\ref{subsec:pythagoras}. Muchas cosas pueden ser etiquetadas: figures, equations, sections, etc.
 
-Summations and Integrals are written with sum and int commands:
+Los sumatorios e integrales son escritor son los comandos sum e int:
 
-% Some LaTeX compilers will complain if there are blank lines
-% In an equation environment.
+% Algunos compiladores de LaTeX se quejarán si hay líneas en blanco
+% En un contexto de ecuación.
 \begin{equation}
   \sum_{i=0}^{5} f_{i}
 \end{equation}
@@ -157,79 +142,67 @@ Summations and Integrals are written with sum and int commands:
   \int_{0}^{\infty} \mathrm{e}^{-x} \mathrm{d}x
 \end{equation}
 
-\section{Figures}
+\section{Figuras}
 
-Let's insert a Figure. Figure placement can get a little tricky.
-I definitely have to lookup the placement options each time.
+Vamos a insertar una figura. Situarla puede ser algo complicado.
 
-\begin{figure}[H] % H here denoted the placement option.
-    \centering % centers the figure on the page
-    % Inserts a figure scaled to 0.8 the width of the page.
+\begin{figure}[H] % H aquí establece la situación de la figura.
+    \centering % centra la figura en la página
+    % Inserta una figura escalada por 0.8 el ancho de la página.
     %\includegraphics[width=0.8\linewidth]{right-triangle.png}
-    % Commented out for compilation purposes. Please use your imagination.
-    \caption{Right triangle with sides $a$, $b$, $c$}
+    % La línea anterior ha sido comentada para poder compilar este archivo. Por favor, usa tu imaginación.
+    \caption{Triángulo con lados $a$, $b$, $c$}
     \label{fig:right-triangle}
 \end{figure}
 
-\subsection{Table}
-We can also insert Tables in the same way as figures.
+\subsection{Tablas}
+También podemos insertar tablas de la misma manera que las figuras.
 
 \begin{table}[H]
-  \caption{Caption for the Table.}
-  % the {} arguments below describe how each row of the table is drawn.
-  % Again, I have to look these up. Each. And. Every. Time.
+  \caption{Título para la tabla.}
+  % los argumentos en {} describen cómo cada fila va a ser representada.
   \begin{tabular}{c|cc}
-    Number &  Last Name & First Name \\ % Column rows are separated by $
-    \hline % a horizontal line
+    Número & Nombre & Apellido \\
+    \hline % una línea horizontal
     1 & Biggus & Dickus \\
     2 & Monty & Python
   \end{tabular}
 \end{table}
 
-% \section{Hyperlinks} % Coming soon
+% \section{Hyperlinks} % En construcción
 
-\section{Getting LaTeX to not compile something (i.e. Source Code)}
-Let's say we want to include some code into our LaTeX document,
-we would then need LaTeX to not try and interpret that text and
-instead just print it to the document. We do this we a verbatim
-environment.
+\section{Haciendo que LaTeX no compile algo (por ejemplo, código fuente)}
+Digamos que queremos incluir código fuente dentro de nuestro documento LaTex. En ese caso, debemos indicarle a LaTeX que no trate de compilarlo y simplemente lo muestre en el documento. Esto lo realizamos en el contexto verbatim.
 
-% There are other packages that exist (i.e. minty, lstlisting, etc.)
-% but verbatim is the bare-bones basic one.
+% Hay otros paquetes para esta misma tarea, pero verbatim es el más básico.
 \begin{verbatim}
-  print("Hello World!")
-  a%b; % look! We can use % signs in verbatim.
-  random = 4; #decided by fair random dice roll
+  print("Hola Mundo!")
+  a%b; % Podemos usar los signos % en verbatim.
+  aleatorio = 4; # Número aleatorio
 \end{verbatim}
 
-\section{Compiling}
+\section{Compilación}
 
-By now you're probably wondering how to compile this fabulous document
-and look at the glorious glory that is a LaTeX pdf.
-(yes, this document actually does compiles). \\
-Getting to the final document using LaTeX consists of the following steps:
+Ahora mismo te estarás preguntando cómo compilar este fabuloso documento y obtener un documento PDF.\\
+Para obtener el documento final utilizando LaTeX hay que seguir los siguientes pasos:
   \begin{enumerate}
-    \item Write the document in plain text (the "source code").
-    \item Compile source code to produce a pdf.
-     The compilation step looks something like this (in Linux): \\
+    \item Escribe el documento en texto plano.
+    \item Compila el código para producir un PDF.
+     Los pasos de compilación serán algo parecido a esto (en Linux): \\
      \begin{verbatim}
         $pdflatex learn-latex.tex learn-latex.pdf
      \end{verbatim}
   \end{enumerate}
 
-A number of LaTeX editors combine both Step 1 and Step 2 in the same piece of
-software. So, you get to see Step 1, but not Step 2 completely.
-Step 2 is still happening behind the scenes.
+Un gran número de editores LaTeX combinan ambos pasos para que sea más sencillo obtener el documento.
 
-You write all your formatting information in plain text in Step 1.
-The compilation part in Step 2 takes care of producing the document in the
-format you defined in Step 1.
+Escribe toda la información de formato en el paso 1 y con el paso 2 obtendrás el documento que has definido en el paso anterior.
 
 \section{End}
 
-That's all for now!
+Esto es todo por ahora.
 
-% end the document
+% fin del documento
 \end{document}
 ```
 

From 0049a475edba88f6537b2490ca9506df23b46368 Mon Sep 17 00:00:00 2001
From: Aayush Ranaut <aayush.ranaut@gmail.com>
Date: Sat, 31 Oct 2015 22:20:51 +0530
Subject: [PATCH 31/88] Removed confusing comments

---
 python.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python.html.markdown b/python.html.markdown
index 5572e38e..abc461a2 100644
--- a/python.html.markdown
+++ b/python.html.markdown
@@ -404,7 +404,7 @@ add(y=6, x=5)   # Keyword arguments can arrive in any order.
 
 
 # You can define functions that take a variable number of
-# positional args, which will be interpreted as a tuple if you do not use the *
+# positional args, which will be interpreted as a tuple
 def varargs(*args):
     return args
 
@@ -412,7 +412,7 @@ varargs(1, 2, 3)   # => (1, 2, 3)
 
 
 # You can define functions that take a variable number of
-# keyword args, as well, which will be interpreted as a dict if you do not use **
+# keyword args, as well, which will be interpreted as a dict
 def keyword_args(**kwargs):
     return kwargs
 

From db690c17c5335b746e3e7867e3d7cf5aab724a9a Mon Sep 17 00:00:00 2001
From: Rudy Affandi <rudy@adnetinc.com>
Date: Sat, 31 Oct 2015 10:54:55 -0700
Subject: [PATCH 32/88] Add PHP magic constants entry

---
 php.html.markdown | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/php.html.markdown b/php.html.markdown
index 0504ced2..06a289f4 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -765,6 +765,13 @@ I'm a ParentClass
 But I'm ChildClass
 */
 
+/**********************
+*  Magic constants
+*  
+*/
+
+// Get directory of the file
+require __DIR__ . '/vendor/autoload.php';
 
 /**********************
 *  Error Handling

From 2cebd90205c7caedc001202b7a517971f8f1ec20 Mon Sep 17 00:00:00 2001
From: bureken <berkgureken@gmail.com>
Date: Sat, 31 Oct 2015 21:19:11 +0300
Subject: [PATCH 33/88] Comment lines fixed

---
 tr-tr/swift-tr.html.markdown | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tr-tr/swift-tr.html.markdown b/tr-tr/swift-tr.html.markdown
index c13f5ecf..15056bb8 100644
--- a/tr-tr/swift-tr.html.markdown
+++ b/tr-tr/swift-tr.html.markdown
@@ -25,14 +25,14 @@ import UIKit
 
 
 //XCode işaretlemelerle kodunuzu bölümlere ayırmanızı ve sağ üstteki metot
- listesinde gruplama yapmanıza olanak sağlıyor
+//listesinde gruplama yapmanıza olanak sağlıyor
 // MARK: Bölüm işareti
 // TODO: Daha sonra yapılacak
 // FIXME: Bu kodu düzelt
 
  
-//Swift 2 de, println ve print metotları print komutunda birleştirildi. Print
- otomatik olarak yeni satır ekliyor.  
+//Swift 2 de, println ve print metotları print komutunda birleştirildi.
+//Print otomatik olarak yeni satır ekliyor.
 print("Merhaba dünya") // println print olarak kullanılıyor.
 print("Merhaba dünya", appendNewLine: false) // yeni bir satır eklemeden yazar.
 
@@ -75,7 +75,7 @@ print("Build degiskeni: \(buildDegiskeni)") // Build degeri: 7
 */
 var baziOptionalString: String? = "optional" // nil olabilir.
 // yukarıdakiyle aynı ama ? bir postfix (sona eklenir) operatördür. (kolay 
-okunabilir)
+//okunabilir)
 var someOptionalString2: Optional<String> = "optional"  
 
 
@@ -104,7 +104,8 @@ if let baziOpsiyonelSabitString = baziOptionalString {
 // Swift değişkenlerde herhangi bir tip saklanabilir.
 // AnyObject == id
 // Objective-C deki `id` den farklı olarak, AnyObject tüm değişkenlerle
- çalışabilir (Class, Int, struct, etc)
+//çalışabilir
+(Class, Int, struct, etc)
 var herhangiBirObject: AnyObject = 7
 herhangiBirObject = "Değer string olarak değişti, iyi bir yöntem değil ama mümkün"
 
@@ -234,7 +235,7 @@ func fiyatlariGetir() -> (Double, Double, Double) {
 let fiyatTuple = fiyatlariGetir()
 let fiyat = fiyatTuple.2 // 3.79
 // _ (alt çizgi) kullanımı Tuple degerlerini veya diğer değerleri görmezden
-gelir
+//gelir
 let (_, fiyat1, _) = fiyatTuple // fiyat1 == 3.69
 print(fiyat1 == fiyatTuple.1) // true
 print("Benzin fiyatı: \(fiyat)")

From dc1c759c2903f15fd3c52c2241c765c65fbe9d89 Mon Sep 17 00:00:00 2001
From: Rudy Affandi <rudy@adnetinc.com>
Date: Sat, 31 Oct 2015 11:27:13 -0700
Subject: [PATCH 34/88] Add the rest of the magic constants

---
 php.html.markdown | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/php.html.markdown b/php.html.markdown
index 06a289f4..5034cfd1 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -770,8 +770,32 @@ But I'm ChildClass
 *  
 */
 
-// Get directory of the file
-require __DIR__ . '/vendor/autoload.php';
+// Get current class name. Must be used inside a class declaration.
+echo "Current class name is " . __CLASS__;
+
+// Get full path directory of a file
+echo "Current directory is " . __DIR__;
+
+    // Typical usage
+    require __DIR__ . '/vendor/autoload.php';
+
+// Get full path of a file
+echo "Current file path is " . __FILE__;
+
+// Get current function name
+echo "Current function name is " . __FUNCTION__;
+
+// Get current line number
+echo "Current line number is " . __LINE__;
+
+// Get the name of the current method. Only returns a value when used inside a trait or object declaration.
+echo "Current method is " . __METHOD__;
+
+// Get the name of the current namespace
+echo "Current namespace is " . __NAMESPACE__;
+
+// Get the name of the current trait. Only returns a value when used inside a trait or object declaration.
+echo "Current namespace is " . __TRAIT__;
 
 /**********************
 *  Error Handling

From 96f0b3b3903c6f619b4a964a98e1cb0a463c47e6 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 00:03:58 +0800
Subject: [PATCH 35/88] Transated Python 2 to zh-tw. Line 01 .. 143

---
 zh-tw/python-tw.html.markdown | 731 ++++++++++++++++++++++++++++++++++
 1 file changed, 731 insertions(+)
 create mode 100644 zh-tw/python-tw.html.markdown

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
new file mode 100644
index 00000000..8381f325
--- /dev/null
+++ b/zh-tw/python-tw.html.markdown
@@ -0,0 +1,731 @@
+---
+language: python
+contributors:
+    - ["Louie Dinh", "http://ldinh.ca"]
+    - ["Amin Bandali", "http://aminbandali.com"]
+    - ["Andre Polykanine", "https://github.com/Oire"]
+    - ["evuez", "http://github.com/evuez"]
+translators:
+    - ["Michael Yeh", "https://github.com/hinet60613"]
+filename: learnpython.py
+---
+
+Python是在1990年代早期由Guido Van Rossum創建的。它是現在最流行的程式語言之一。我愛上Python是因為他極為清晰的語法，甚至可以說它就是可執行的虛擬碼。
+
+非常歡迎各位給我們任何回饋！ 你可以在[@louiedinh](http://twitter.com/louiedinh) 或 louiedinh [at] [google's email service]聯絡到我。
+
+註： 本篇文章適用的版本為Python 2.7，但大部分的Python 2.X版本應該都適用。 Python 2.7將會在2020年停止維護，因此建議您可以從Python 3開始學Python。
+Python 3.X可以看這篇[Python 3 教學 (英文)](http://learnxinyminutes.com/docs/python3/).
+
+讓程式碼同時支援Python 2.7和3.X是可以做到的，只要引入
+ [`__future__` imports](https://docs.python.org/2/library/__future__.html) 模組.
+ `__future__` 模組允許你撰寫可以在Python 2上執行的Python 3程式碼，詳細訊息請參考Python 3 教學。
+
+```python
+
+# 單行註解從井字號開始
+
+""" 多行字串可以用三個雙引號
+    包住，不過通常這種寫法會
+    被拿來當作多行註解
+"""
+
+####################################################
+## 1. 原始型別與運算元
+####################################################
+
+# 你可以使用數字
+3  # => 3
+
+# 還有四則運算
+1 + 1  # => 2
+8 - 1  # => 7
+10 * 2  # => 20
+35 / 5  # => 7
+
+# 除法比較麻煩，除以整數時會自動捨去小數位。
+5 / 2  # => 2
+
+# 要做精確的除法，我們需要浮點數
+2.0     # 浮點數
+11.0 / 4.0  # => 2.75 精確多了！
+
+# 整數除法的無條件捨去對正數或負數都適用
+5 // 3     # => 1
+5.0 // 3.0 # => 1.0 # 浮點數的整數也適用
+-5 // 3  # => -2
+-5.0 // 3.0 # => -2.0
+
+# 我們可以用除法模組(參考第六節:模組)，讓
+# 單一斜線代表普通除法，而非無條件捨去
+from __future__ import division
+11/4    # => 2.75  ...普通除法
+11//4   # => 2 ...無條件捨去
+
+# 取餘數
+7 % 3 # => 1
+
+# 指數 (x的y次方)
+2**4 # => 16
+
+# 括號即先乘除後加減
+(1 + 3) * 2  # => 8
+
+# 布林運算
+# 注意 "and" 和 "or" 的大小寫
+True and False #=> False
+False or True #=> True
+
+# 用整數與布林值做運算
+0 and 2 #=> 0
+-5 or 0 #=> -5
+0 == False #=> True
+2 == True #=> False
+1 == True #=> True
+
+# 用not取反向
+not True  # => False
+not False  # => True
+
+# 等於判斷是用 ==
+1 == 1  # => True
+2 == 1  # => False
+
+# 不等於判斷是用 !=
+1 != 1  # => False
+2 != 1  # => True
+
+# 更多比較
+1 < 10  # => True
+1 > 10  # => False
+2 <= 2  # => True
+2 >= 2  # => True
+
+# 比較是可以串接的
+1 < 2 < 3  # => True
+2 < 3 < 2  # => False
+
+# 字串用單引號 ' 或雙引號 " 建立
+"This is a string."
+'This is also a string.'
+
+# 字串相加會被串接再一起
+"Hello " + "world!"  # => "Hello world!"
+# 不用加號也可以做字串相加
+"Hello " "world!"  # => "Hello world!"
+
+# ... 也可以做相乘
+"Hello" * 3  # => "HelloHelloHello"
+
+# 字串可以被視為字元的陣列
+"This is a string"[0]  # => 'T'
+
+# 字串的格式化可以用百分之符號 %
+# 儘管在Python 3.1後這個功能被廢棄了，並且在
+# 之後的版本會被移除，但還是可以了解一下
+x = 'apple'
+y = 'lemon'
+z = "The items in the basket are %s and %s" % (x,y)
+
+# 新的格式化方式是使用format函式
+# 這個方式也是較為推薦的
+"{} is a {}".format("This", "placeholder")
+"{0} can be {1}".format("strings", "formatted")
+# 你也可以用關鍵字，如果你不想數你是要用第幾個變數的話
+"{name} wants to eat {food}".format(name="Bob", food="lasagna")
+
+# 無(None) 是一個物件
+None  # => None
+
+# 不要用等於符號 "==" 對 無(None)做比較
+# 用 "is" 
+"etc" is None  # => False
+None is None  # => True
+
+# The 'is' operator tests for object identity. This isn't
+# very useful when dealing with primitive values, but is
+# very useful when dealing with objects.
+
+# Any object can be used in a Boolean context.
+# The following values are considered falsey:
+#    - None
+#    - zero of any numeric type (e.g., 0, 0L, 0.0, 0j)
+#    - empty sequences (e.g., '', (), [])
+#    - empty containers (e.g., {}, set())
+#    - instances of user-defined classes meeting certain conditions
+#      see: https://docs.python.org/2/reference/datamodel.html#object.__nonzero__
+#
+# All other values are truthy (using the bool() function on them returns True).
+bool(0)  # => False
+bool("")  # => False
+
+
+####################################################
+## 2. Variables and Collections
+####################################################
+
+# Python has a print statement
+print "I'm Python. Nice to meet you!" # => I'm Python. Nice to meet you!
+
+# Simple way to get input data from console
+input_string_var = raw_input("Enter some data: ") # Returns the data as a string
+input_var = input("Enter some data: ") # Evaluates the data as python code
+# Warning: Caution is recommended for input() method usage
+# Note: In python 3, input() is deprecated and raw_input() is renamed to input()
+
+# No need to declare variables before assigning to them.
+some_var = 5    # Convention is to use lower_case_with_underscores
+some_var  # => 5
+
+# Accessing a previously unassigned variable is an exception.
+# See Control Flow to learn more about exception handling.
+some_other_var  # Raises a name error
+
+# if can be used as an expression
+# Equivalent of C's '?:' ternary operator
+"yahoo!" if 3 > 2 else 2  # => "yahoo!"
+
+# Lists store sequences
+li = []
+# You can start with a prefilled list
+other_li = [4, 5, 6]
+
+# Add stuff to the end of a list with append
+li.append(1)    # li is now [1]
+li.append(2)    # li is now [1, 2]
+li.append(4)    # li is now [1, 2, 4]
+li.append(3)    # li is now [1, 2, 4, 3]
+# Remove from the end with pop
+li.pop()        # => 3 and li is now [1, 2, 4]
+# Let's put it back
+li.append(3)    # li is now [1, 2, 4, 3] again.
+
+# Access a list like you would any array
+li[0]  # => 1
+# Assign new values to indexes that have already been initialized with =
+li[0] = 42
+li[0]  # => 42
+li[0] = 1  # Note: setting it back to the original value
+# Look at the last element
+li[-1]  # => 3
+
+# Looking out of bounds is an IndexError
+li[4]  # Raises an IndexError
+
+# You can look at ranges with slice syntax.
+# (It's a closed/open range for you mathy types.)
+li[1:3]  # => [2, 4]
+# Omit the beginning
+li[2:]  # => [4, 3]
+# Omit the end
+li[:3]  # => [1, 2, 4]
+# Select every second entry
+li[::2]   # =>[1, 4]
+# Reverse a copy of the list
+li[::-1]   # => [3, 4, 2, 1]
+# Use any combination of these to make advanced slices
+# li[start:end:step]
+
+# Remove arbitrary elements from a list with "del"
+del li[2]   # li is now [1, 2, 3]
+
+# You can add lists
+li + other_li   # => [1, 2, 3, 4, 5, 6]
+# Note: values for li and for other_li are not modified.
+
+# Concatenate lists with "extend()"
+li.extend(other_li)   # Now li is [1, 2, 3, 4, 5, 6]
+
+# Remove first occurrence of a value
+li.remove(2)  # li is now [1, 3, 4, 5, 6]
+li.remove(2)  # Raises a ValueError as 2 is not in the list
+
+# Insert an element at a specific index
+li.insert(1, 2)  # li is now [1, 2, 3, 4, 5, 6] again
+
+# Get the index of the first item found
+li.index(2)  # => 1
+li.index(7)  # Raises a ValueError as 7 is not in the list
+
+# Check for existence in a list with "in"
+1 in li   # => True
+
+# Examine the length with "len()"
+len(li)   # => 6
+
+
+# Tuples are like lists but are immutable.
+tup = (1, 2, 3)
+tup[0]   # => 1
+tup[0] = 3  # Raises a TypeError
+
+# You can do all those list thingies on tuples too
+len(tup)   # => 3
+tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
+tup[:2]   # => (1, 2)
+2 in tup   # => True
+
+# You can unpack tuples (or lists) into variables
+a, b, c = (1, 2, 3)     # a is now 1, b is now 2 and c is now 3
+d, e, f = 4, 5, 6       # you can leave out the parentheses
+# Tuples are created by default if you leave out the parentheses
+g = 4, 5, 6             # => (4, 5, 6)
+# Now look how easy it is to swap two values
+e, d = d, e     # d is now 5 and e is now 4
+
+
+# Dictionaries store mappings
+empty_dict = {}
+# Here is a prefilled dictionary
+filled_dict = {"one": 1, "two": 2, "three": 3}
+
+# Look up values with []
+filled_dict["one"]   # => 1
+
+# Get all keys as a list with "keys()"
+filled_dict.keys()   # => ["three", "two", "one"]
+# Note - Dictionary key ordering is not guaranteed.
+# Your results might not match this exactly.
+
+# Get all values as a list with "values()"
+filled_dict.values()   # => [3, 2, 1]
+# Note - Same as above regarding key ordering.
+
+# Check for existence of keys in a dictionary with "in"
+"one" in filled_dict   # => True
+1 in filled_dict   # => False
+
+# Looking up a non-existing key is a KeyError
+filled_dict["four"]   # KeyError
+
+# Use "get()" method to avoid the KeyError
+filled_dict.get("one")   # => 1
+filled_dict.get("four")   # => None
+# The get method supports a default argument when the value is missing
+filled_dict.get("one", 4)   # => 1
+filled_dict.get("four", 4)   # => 4
+# note that filled_dict.get("four") is still => None
+# (get doesn't set the value in the dictionary)
+
+# set the value of a key with a syntax similar to lists
+filled_dict["four"] = 4  # now, filled_dict["four"] => 4
+
+# "setdefault()" inserts into a dictionary only if the given key isn't present
+filled_dict.setdefault("five", 5)  # filled_dict["five"] is set to 5
+filled_dict.setdefault("five", 6)  # filled_dict["five"] is still 5
+
+
+# Sets store ... well sets (which are like lists but can contain no duplicates)
+empty_set = set()
+# Initialize a "set()" with a bunch of values
+some_set = set([1, 2, 2, 3, 4])   # some_set is now set([1, 2, 3, 4])
+
+# order is not guaranteed, even though it may sometimes look sorted
+another_set = set([4, 3, 2, 2, 1])  # another_set is now set([1, 2, 3, 4])
+
+# Since Python 2.7, {} can be used to declare a set
+filled_set = {1, 2, 2, 3, 4}   # => {1, 2, 3, 4}
+
+# Add more items to a set
+filled_set.add(5)   # filled_set is now {1, 2, 3, 4, 5}
+
+# Do set intersection with &
+other_set = {3, 4, 5, 6}
+filled_set & other_set   # => {3, 4, 5}
+
+# Do set union with |
+filled_set | other_set   # => {1, 2, 3, 4, 5, 6}
+
+# Do set difference with -
+{1, 2, 3, 4} - {2, 3, 5}   # => {1, 4}
+
+# Do set symmetric difference with ^
+{1, 2, 3, 4} ^ {2, 3, 5}  # => {1, 4, 5}
+
+# Check if set on the left is a superset of set on the right
+{1, 2} >= {1, 2, 3} # => False
+
+# Check if set on the left is a subset of set on the right
+{1, 2} <= {1, 2, 3} # => True
+
+# Check for existence in a set with in
+2 in filled_set   # => True
+10 in filled_set   # => False
+
+
+####################################################
+## 3. Control Flow
+####################################################
+
+# Let's just make a variable
+some_var = 5
+
+# Here is an if statement. Indentation is significant in python!
+# prints "some_var is smaller than 10"
+if some_var > 10:
+    print "some_var is totally bigger than 10."
+elif some_var < 10:    # This elif clause is optional.
+    print "some_var is smaller than 10."
+else:           # This is optional too.
+    print "some_var is indeed 10."
+
+
+"""
+For loops iterate over lists
+prints:
+    dog is a mammal
+    cat is a mammal
+    mouse is a mammal
+"""
+for animal in ["dog", "cat", "mouse"]:
+    # You can use {0} to interpolate formatted strings. (See above.)
+    print "{0} is a mammal".format(animal)
+
+"""
+"range(number)" returns a list of numbers
+from zero to the given number
+prints:
+    0
+    1
+    2
+    3
+"""
+for i in range(4):
+    print i
+
+"""
+"range(lower, upper)" returns a list of numbers
+from the lower number to the upper number
+prints:
+    4
+    5
+    6
+    7
+"""
+for i in range(4, 8):
+    print i
+
+"""
+While loops go until a condition is no longer met.
+prints:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print x
+    x += 1  # Shorthand for x = x + 1
+
+# Handle exceptions with a try/except block
+
+# Works on Python 2.6 and up:
+try:
+    # Use "raise" to raise an error
+    raise IndexError("This is an index error")
+except IndexError as e:
+    pass    # Pass is just a no-op. Usually you would do recovery here.
+except (TypeError, NameError):
+    pass    # Multiple exceptions can be handled together, if required.
+else:   # Optional clause to the try/except block. Must follow all except blocks
+    print "All good!"   # Runs only if the code in try raises no exceptions
+finally: #  Execute under all circumstances
+    print "We can clean up resources here"
+
+# Instead of try/finally to cleanup resources you can use a with statement
+with open("myfile.txt") as f:
+    for line in f:
+        print line
+
+####################################################
+## 4. Functions
+####################################################
+
+# Use "def" to create new functions
+def add(x, y):
+    print "x is {0} and y is {1}".format(x, y)
+    return x + y    # Return values with a return statement
+
+# Calling functions with parameters
+add(5, 6)   # => prints out "x is 5 and y is 6" and returns 11
+
+# Another way to call functions is with keyword arguments
+add(y=6, x=5)   # Keyword arguments can arrive in any order.
+
+
+# You can define functions that take a variable number of
+# positional args, which will be interpreted as a tuple if you do not use the *
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3)   # => (1, 2, 3)
+
+
+# You can define functions that take a variable number of
+# keyword args, as well, which will be interpreted as a dict if you do not use **
+def keyword_args(**kwargs):
+    return kwargs
+
+# Let's call it to see what happens
+keyword_args(big="foot", loch="ness")   # => {"big": "foot", "loch": "ness"}
+
+
+# You can do both at once, if you like
+def all_the_args(*args, **kwargs):
+    print args
+    print kwargs
+"""
+all_the_args(1, 2, a=3, b=4) prints:
+    (1, 2)
+    {"a": 3, "b": 4}
+"""
+
+# When calling functions, you can do the opposite of args/kwargs!
+# Use * to expand positional args and use ** to expand keyword args.
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+all_the_args(*args)   # equivalent to foo(1, 2, 3, 4)
+all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
+all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
+
+# you can pass args and kwargs along to other functions that take args/kwargs
+# by expanding them with * and ** respectively
+def pass_all_the_args(*args, **kwargs):
+    all_the_args(*args, **kwargs)
+    print varargs(*args)
+    print keyword_args(**kwargs)
+
+# Function Scope
+x = 5
+
+def set_x(num):
+    # Local var x not the same as global variable x
+    x = num # => 43
+    print x # => 43
+
+def set_global_x(num):
+    global x
+    print x # => 5
+    x = num # global var x is now set to 6
+    print x # => 6
+
+set_x(43)
+set_global_x(6)
+
+# Python has first class functions
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3)   # => 13
+
+# There are also anonymous functions
+(lambda x: x > 2)(3)   # => True
+(lambda x, y: x ** 2 + y ** 2)(2, 1) # => 5
+
+# There are built-in higher order functions
+map(add_10, [1, 2, 3])   # => [11, 12, 13]
+map(max, [1, 2, 3], [4, 2, 1])   # => [4, 2, 3]
+
+filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
+
+# We can use list comprehensions for nice maps and filters
+[add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5]   # => [6, 7]
+
+
+####################################################
+## 5. Classes
+####################################################
+
+# We subclass from object to get a class.
+class Human(object):
+
+    # A class attribute. It is shared by all instances of this class
+    species = "H. sapiens"
+
+    # Basic initializer, this is called when this class is instantiated.
+    # Note that the double leading and trailing underscores denote objects
+    # or attributes that are used by python but that live in user-controlled
+    # namespaces. You should not invent such names on your own.
+    def __init__(self, name):
+        # Assign the argument to the instance's name attribute
+        self.name = name
+
+        # Initialize property
+        self.age = 0
+
+
+    # An instance method. All methods take "self" as the first argument
+    def say(self, msg):
+        return "{0}: {1}".format(self.name, msg)
+
+    # A class method is shared among all instances
+    # They are called with the calling class as the first argument
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # A static method is called without a class or instance reference
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+    # A property is just like a getter.
+    # It turns the method age() into an read-only attribute
+    # of the same name.
+    @property
+    def age(self):
+        return self._age
+
+    # This allows the property to be set
+    @age.setter
+    def age(self, age):
+        self._age = age
+
+    # This allows the property to be deleted
+    @age.deleter
+    def age(self):
+        del self._age
+
+
+# Instantiate a class
+i = Human(name="Ian")
+print i.say("hi")     # prints out "Ian: hi"
+
+j = Human("Joel")
+print j.say("hello")  # prints out "Joel: hello"
+
+# Call our class method
+i.get_species()   # => "H. sapiens"
+
+# Change the shared attribute
+Human.species = "H. neanderthalensis"
+i.get_species()   # => "H. neanderthalensis"
+j.get_species()   # => "H. neanderthalensis"
+
+# Call the static method
+Human.grunt()   # => "*grunt*"
+
+# Update the property
+i.age = 42
+
+# Get the property
+i.age # => 42
+
+# Delete the property
+del i.age
+i.age  # => raises an AttributeError
+
+
+####################################################
+## 6. Modules
+####################################################
+
+# You can import modules
+import math
+print math.sqrt(16)  # => 4
+
+# You can get specific functions from a module
+from math import ceil, floor
+print ceil(3.7)  # => 4.0
+print floor(3.7)   # => 3.0
+
+# You can import all functions from a module.
+# Warning: this is not recommended
+from math import *
+
+# You can shorten module names
+import math as m
+math.sqrt(16) == m.sqrt(16)   # => True
+# you can also test that the functions are equivalent
+from math import sqrt
+math.sqrt == m.sqrt == sqrt  # => True
+
+# Python modules are just ordinary python files. You
+# can write your own, and import them. The name of the
+# module is the same as the name of the file.
+
+# You can find out which functions and attributes
+# defines a module.
+import math
+dir(math)
+
+
+####################################################
+## 7. Advanced
+####################################################
+
+# Generators help you make lazy code
+def double_numbers(iterable):
+    for i in iterable:
+        yield i + i
+
+# A generator creates values on the fly.
+# Instead of generating and returning all values at once it creates one in each
+# iteration.  This means values bigger than 15 wont be processed in
+# double_numbers.
+# Note xrange is a generator that does the same thing range does.
+# Creating a list 1-900000000 would take lot of time and space to be made.
+# xrange creates an xrange generator object instead of creating the entire list
+# like range does.
+# We use a trailing underscore in variable names when we want to use a name that
+# would normally collide with a python keyword
+xrange_ = xrange(1, 900000000)
+
+# will double all numbers until a result >=30 found
+for i in double_numbers(xrange_):
+    print i
+    if i >= 30:
+        break
+
+
+# Decorators
+# in this example beg wraps say
+# Beg will call say. If say_please is True then it will change the returned
+# message
+from functools import wraps
+
+
+def beg(target_function):
+    @wraps(target_function)
+    def wrapper(*args, **kwargs):
+        msg, say_please = target_function(*args, **kwargs)
+        if say_please:
+            return "{} {}".format(msg, "Please! I am poor :(")
+        return msg
+
+    return wrapper
+
+
+@beg
+def say(say_please=False):
+    msg = "Can you buy me a beer?"
+    return msg, say_please
+
+
+print say()  # Can you buy me a beer?
+print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
+```
+
+## Ready For More?
+
+### Free Online
+
+* [Automate the Boring Stuff with Python](https://automatetheboringstuff.com)
+* [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+* [Dive Into Python](http://www.diveintopython.net/)
+* [The Official Docs](http://docs.python.org/2/)
+* [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
+* [Python Module of the Week](http://pymotw.com/2/)
+* [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
+* [First Steps With Python](https://realpython.com/learn/python-first-steps/)
+
+### Dead Tree
+
+* [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
+* [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
+* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)

From 09cd1ab461ad8b560824f687cc818d7708aea427 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 00:40:41 +0800
Subject: [PATCH 36/88] Add lang of translation. Translate to Line 255

---
 zh-tw/python-tw.html.markdown | 127 +++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 63 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 8381f325..8e9ca79a 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -8,6 +8,7 @@ contributors:
 translators:
     - ["Michael Yeh", "https://github.com/hinet60613"]
 filename: learnpython.py
+lang: zh-tw
 ---
 
 Python是在1990年代早期由Guido Van Rossum創建的。它是現在最流行的程式語言之一。我愛上Python是因為他極為清晰的語法，甚至可以說它就是可執行的虛擬碼。
@@ -142,115 +143,115 @@ None  # => None
 "etc" is None  # => False
 None is None  # => True
 
-# The 'is' operator tests for object identity. This isn't
-# very useful when dealing with primitive values, but is
-# very useful when dealing with objects.
+# 'is' 運算元是用來識別物件的。對原始型別來說或許沒什麼用，
+# 但對物件來說是很有用的。
 
-# Any object can be used in a Boolean context.
-# The following values are considered falsey:
-#    - None
-#    - zero of any numeric type (e.g., 0, 0L, 0.0, 0j)
-#    - empty sequences (e.g., '', (), [])
-#    - empty containers (e.g., {}, set())
-#    - instances of user-defined classes meeting certain conditions
-#      see: https://docs.python.org/2/reference/datamodel.html#object.__nonzero__
+# 任何物件都可以被當作布林值使用
+# 以下的值會被視為是False :
+#    - 無(None)
+#    - 任何型別的零 (例如: 0, 0L, 0.0, 0j)
+#    - 空序列 (例如: '', (), [])
+#    - 空容器 (例如: {}, set())
+#    - 自定義型別的實體，且滿足某些條件
+#      請參考文件: https://docs.python.org/2/reference/datamodel.html#object.__nonzero__
 #
-# All other values are truthy (using the bool() function on them returns True).
+# 其餘的值都會被視為True (用bool()函式讓他們回傳布林值).
 bool(0)  # => False
 bool("")  # => False
 
 
 ####################################################
-## 2. Variables and Collections
+## 2. 變數與集合
 ####################################################
 
-# Python has a print statement
+# Python的輸出很方便
 print "I'm Python. Nice to meet you!" # => I'm Python. Nice to meet you!
 
-# Simple way to get input data from console
-input_string_var = raw_input("Enter some data: ") # Returns the data as a string
-input_var = input("Enter some data: ") # Evaluates the data as python code
-# Warning: Caution is recommended for input() method usage
-# Note: In python 3, input() is deprecated and raw_input() is renamed to input()
+# 從命令列獲得值也很方便
+input_string_var = raw_input("Enter some data: ") # 資料會被視為字串存進變數
+input_var = input("Enter some data: ") # 輸入的資料會被當作Python程式碼執行
+# 注意: 請謹慎使用input()函式
+# 註: 在Python 3中，input()已被棄用，raw_input()已被更名為input()
 
-# No need to declare variables before assigning to them.
-some_var = 5    # Convention is to use lower_case_with_underscores
+# 使用變數前不需要先宣告
+some_var = 5    # 方便好用
+lower_case_with_underscores
 some_var  # => 5
 
-# Accessing a previously unassigned variable is an exception.
-# See Control Flow to learn more about exception handling.
-some_other_var  # Raises a name error
+# 存取沒有被賦值的變數會造成例外
+# 請參考錯誤流程部分做例外處理
+some_other_var  # 造成 NameError
 
-# if can be used as an expression
-# Equivalent of C's '?:' ternary operator
+# if可以當判斷式使用
+# 相當於C語言中的二元判斷式
 "yahoo!" if 3 > 2 else 2  # => "yahoo!"
 
-# Lists store sequences
+# 串列型態可以儲存集合
 li = []
-# You can start with a prefilled list
+# 你可以預先填好串列內容
 other_li = [4, 5, 6]
 
-# Add stuff to the end of a list with append
-li.append(1)    # li is now [1]
-li.append(2)    # li is now [1, 2]
-li.append(4)    # li is now [1, 2, 4]
-li.append(3)    # li is now [1, 2, 4, 3]
-# Remove from the end with pop
+# 用append()在串列後新增東西 append
+li.append(1)    # 此時 li 內容為 [1]
+li.append(2)    # 此時 li 內容為 [1, 2]
+li.append(4)    # 此時 li 內容為 [1, 2, 4]
+li.append(3)    # 此時 li 內容為 [1, 2, 4, 3]
+# 用pop()移除串列尾端的元素
 li.pop()        # => 3 and li is now [1, 2, 4]
-# Let's put it back
+# 然後再塞回去
 li.append(3)    # li is now [1, 2, 4, 3] again.
 
-# Access a list like you would any array
+# 你可以像存取陣列一樣的存取串列
 li[0]  # => 1
-# Assign new values to indexes that have already been initialized with =
+# 用等號 = 給串列中特定索引的元素賦值
 li[0] = 42
 li[0]  # => 42
-li[0] = 1  # Note: setting it back to the original value
-# Look at the last element
+li[0] = 1  # 註: 將其設定回原本的值
+# 用 -1 索引值查看串列最後一個元素
 li[-1]  # => 3
 
-# Looking out of bounds is an IndexError
+# 存取超過範圍會產生IndexError
 li[4]  # Raises an IndexError
 
-# You can look at ranges with slice syntax.
-# (It's a closed/open range for you mathy types.)
+# 你可以用切片語法來存取特定範圍的值
+# (相當於數學中的左閉右開區間，即包含最左邊界，但不包含右邊界)
 li[1:3]  # => [2, 4]
-# Omit the beginning
+# 略過開頭元素
 li[2:]  # => [4, 3]
-# Omit the end
+# 略過結尾元素
 li[:3]  # => [1, 2, 4]
-# Select every second entry
+# 每隔兩個元素取值
 li[::2]   # =>[1, 4]
-# Reverse a copy of the list
+# 串列反轉
 li[::-1]   # => [3, 4, 2, 1]
-# Use any combination of these to make advanced slices
-# li[start:end:step]
+# 你可以任意組合來達到你想要的效果
+# li[開始索引:結束索引:間隔]
 
-# Remove arbitrary elements from a list with "del"
-del li[2]   # li is now [1, 2, 3]
+# 用 "del" 從串列中移除任意元素
+del li[2]   # 現在 li 內容為 [1, 2, 3]
 
-# You can add lists
+# 你可以做串列相加
 li + other_li   # => [1, 2, 3, 4, 5, 6]
-# Note: values for li and for other_li are not modified.
+# 註: li 及 other_li 沒有被更動
 
-# Concatenate lists with "extend()"
-li.extend(other_li)   # Now li is [1, 2, 3, 4, 5, 6]
+# 用 "extend()" 做串列串接
+li.extend(other_li)   # 現在 li 內容為 [1, 2, 3, 4, 5, 6]
 
-# Remove first occurrence of a value
-li.remove(2)  # li is now [1, 3, 4, 5, 6]
-li.remove(2)  # Raises a ValueError as 2 is not in the list
+# 移除特定值的第一次出現
+li.remove(2)  # 現在 li 內容為 [1, 3, 4, 5, 6]
+li.remove(2)  # 2 不在串列中，造成 ValueError
 
-# Insert an element at a specific index
-li.insert(1, 2)  # li is now [1, 2, 3, 4, 5, 6] again
+# 在特定位置插入值
+li.insert(1, 2)  # 現在 li 內容再次回復為 [1, 2, 3, 4, 5, 6]
 
-# Get the index of the first item found
+# 取得特定值在串列中第一次出現的位置
 li.index(2)  # => 1
-li.index(7)  # Raises a ValueError as 7 is not in the list
+li.index(7)  # 7 不在串列中，造成 ValueError
 
-# Check for existence in a list with "in"
+# 用 "in" 檢查特定值是否出現在串列中
 1 in li   # => True
 
-# Examine the length with "len()"
+# 用 "len()" 取得串列長度
 len(li)   # => 6
 
 

From 6c9bf0dc5bccf644439346763f36b047a898a694 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 02:06:40 +0800
Subject: [PATCH 37/88] Translate to Sec. 4 finished.

---
 zh-tw/python-tw.html.markdown | 197 +++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 97 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 8e9ca79a..073c5e91 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -6,7 +6,7 @@ contributors:
     - ["Andre Polykanine", "https://github.com/Oire"]
     - ["evuez", "http://github.com/evuez"]
 translators:
-    - ["Michael Yeh", "https://github.com/hinet60613"]
+    - ["Michael Yeh", "https://hinet60613.github.io/"]
 filename: learnpython.py
 lang: zh-tw
 ---
@@ -255,137 +255,139 @@ li.index(7)  # 7 不在串列中，造成 ValueError
 len(li)   # => 6
 
 
-# Tuples are like lists but are immutable.
+# 元組(Tuple，以下仍用原文)類似於串列，但是它是不可改變的
 tup = (1, 2, 3)
 tup[0]   # => 1
-tup[0] = 3  # Raises a TypeError
+tup[0] = 3  # 產生TypeError
 
-# You can do all those list thingies on tuples too
+# 能對串列做的東西都可以對tuple做
 len(tup)   # => 3
 tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
 tup[:2]   # => (1, 2)
 2 in tup   # => True
 
-# You can unpack tuples (or lists) into variables
-a, b, c = (1, 2, 3)     # a is now 1, b is now 2 and c is now 3
-d, e, f = 4, 5, 6       # you can leave out the parentheses
-# Tuples are created by default if you leave out the parentheses
+# 你可以把tuple拆開並分別將值存入不同變數
+a, b, c = (1, 2, 3)     # a 現在是 1, b 現在是 2, c 現在是 3
+d, e, f = 4, 5, 6       # 也可以不寫括號
+# 如果不加括號，預設會產生tuple
 g = 4, 5, 6             # => (4, 5, 6)
-# Now look how easy it is to swap two values
+# 你看，交換兩個值很簡單吧
 e, d = d, e     # d is now 5 and e is now 4
 
 
-# Dictionaries store mappings
+# 字典(Dictionary)用來儲存映射關係
 empty_dict = {}
-# Here is a prefilled dictionary
+# 你可以對字典做初始化
 filled_dict = {"one": 1, "two": 2, "three": 3}
 
-# Look up values with []
+# 用 [] 取值
 filled_dict["one"]   # => 1
 
-# Get all keys as a list with "keys()"
+# 用 "keys()" 將所有的Key輸出到一個List中
 filled_dict.keys()   # => ["three", "two", "one"]
-# Note - Dictionary key ordering is not guaranteed.
-# Your results might not match this exactly.
+# 註: 字典裡key的排序是不固定的
+# 你的執行結果可能與上面不同
+# 譯註: 只能保證所有的key都有出現，但不保證順序
 
-# Get all values as a list with "values()"
+# 用 "valuess()" 將所有的Value輸出到一個List中
 filled_dict.values()   # => [3, 2, 1]
-# Note - Same as above regarding key ordering.
+# 註: 同上，不保證順序
 
-# Check for existence of keys in a dictionary with "in"
+# 用 "in" 來檢查指定的Key是否在字典中
 "one" in filled_dict   # => True
 1 in filled_dict   # => False
 
-# Looking up a non-existing key is a KeyError
+# 查詢不存在的Key會造成KeyError
 filled_dict["four"]   # KeyError
 
-# Use "get()" method to avoid the KeyError
+# 用 "get()" 來避免KeyError
+# 若指定的Key不存在的話會得到None
 filled_dict.get("one")   # => 1
 filled_dict.get("four")   # => None
-# The get method supports a default argument when the value is missing
+# "get()" 函式支援預設值，當找不到指定的值時，會回傳指定的預設值
 filled_dict.get("one", 4)   # => 1
 filled_dict.get("four", 4)   # => 4
-# note that filled_dict.get("four") is still => None
-# (get doesn't set the value in the dictionary)
+# 注意此時 filled_dict.get("four") 仍然為 None
+# (get()此時並沒有產生出任何的值)
 
-# set the value of a key with a syntax similar to lists
-filled_dict["four"] = 4  # now, filled_dict["four"] => 4
+# 像操作list一樣，對指定的Key賦值
+filled_dict["four"] = 4  # 此時 filled_dict["four"] => 4
 
-# "setdefault()" inserts into a dictionary only if the given key isn't present
-filled_dict.setdefault("five", 5)  # filled_dict["five"] is set to 5
-filled_dict.setdefault("five", 6)  # filled_dict["five"] is still 5
+# "setdefault()" 只在指定的Key不存在時才會將值插入dictionary
+filled_dict.setdefault("five", 5)  # filled_dict["five"] 被指定為 5
+filled_dict.setdefault("five", 6)  # filled_dict["five"] 仍保持 5
 
 
-# Sets store ... well sets (which are like lists but can contain no duplicates)
+# 集合(Set)被用來儲存...集合。
+# 跟串列(List)有點像，但集合內不會有重複的元素
 empty_set = set()
-# Initialize a "set()" with a bunch of values
-some_set = set([1, 2, 2, 3, 4])   # some_set is now set([1, 2, 3, 4])
+# 初始化 "set()" 並給定一些值
+some_set = set([1, 2, 2, 3, 4])   # 現在 some_set 為 set([1, 2, 3, 4])，注意重複的元素只有一個會被存入
 
-# order is not guaranteed, even though it may sometimes look sorted
-another_set = set([4, 3, 2, 2, 1])  # another_set is now set([1, 2, 3, 4])
+# 一樣，不保證順序，就算真的有照順序排也只是你運氣好
+another_set = set([4, 3, 2, 2, 1])  # another_set 現在為 set([1, 2, 3, 4])
 
-# Since Python 2.7, {} can be used to declare a set
+# 從 Python 2.7 開始，可以使用大括號 {} 來宣告Set
 filled_set = {1, 2, 2, 3, 4}   # => {1, 2, 3, 4}
 
-# Add more items to a set
+# 加入更多元素進入Set
 filled_set.add(5)   # filled_set is now {1, 2, 3, 4, 5}
 
-# Do set intersection with &
+# 用 & 來對兩個集合取交集
 other_set = {3, 4, 5, 6}
 filled_set & other_set   # => {3, 4, 5}
 
-# Do set union with |
+# 用 | 來對兩個集合取聯集
 filled_set | other_set   # => {1, 2, 3, 4, 5, 6}
 
-# Do set difference with -
+# 用 - 來將第二個集合內有的元素移出第一個集合
 {1, 2, 3, 4} - {2, 3, 5}   # => {1, 4}
 
-# Do set symmetric difference with ^
+# 用 ^ 來對兩個集合取差集
 {1, 2, 3, 4} ^ {2, 3, 5}  # => {1, 4, 5}
 
-# Check if set on the left is a superset of set on the right
+# 檢查左邊是否為右邊的母集
 {1, 2} >= {1, 2, 3} # => False
 
-# Check if set on the left is a subset of set on the right
+# 檢查左邊是否為右邊的子集
 {1, 2} <= {1, 2, 3} # => True
 
-# Check for existence in a set with in
+# 用 in 來檢查某元素是否存在於集合內
 2 in filled_set   # => True
 10 in filled_set   # => False
 
 
 ####################################################
-## 3. Control Flow
+## 3. 控制流程
 ####################################################
 
-# Let's just make a variable
+# 首先，先宣告一個變數
 some_var = 5
 
-# Here is an if statement. Indentation is significant in python!
-# prints "some_var is smaller than 10"
+# 這邊是 if 判斷式。注意，縮排對Python是很重要的。
+# 下面應該會印出 "some_var is smaller than 10"
 if some_var > 10:
     print "some_var is totally bigger than 10."
-elif some_var < 10:    # This elif clause is optional.
+elif some_var < 10:    # elif 可有可無
     print "some_var is smaller than 10."
-else:           # This is optional too.
+else:           # else 也可有可無
     print "some_var is indeed 10."
 
 
 """
-For loops iterate over lists
-prints:
+For 迴圈會遞迴整的List
+下面的程式碼會輸出:
     dog is a mammal
     cat is a mammal
     mouse is a mammal
 """
 for animal in ["dog", "cat", "mouse"]:
-    # You can use {0} to interpolate formatted strings. (See above.)
+    # 你可以用{0}來組合0出格式化字串 (見上面.)
     print "{0} is a mammal".format(animal)
 
 """
-"range(number)" returns a list of numbers
-from zero to the given number
-prints:
+"range(number)" 回傳一個包含從0到給定值的數字List，
+下面的程式碼會輸出:
     0
     1
     2
@@ -395,9 +397,9 @@ for i in range(4):
     print i
 
 """
-"range(lower, upper)" returns a list of numbers
-from the lower number to the upper number
-prints:
+"range(lower, upper)" 回傳一個包含從給定的下限
+到給定的上限的數字List
+下面的程式碼會輸出:
     4
     5
     6
@@ -407,8 +409,8 @@ for i in range(4, 8):
     print i
 
 """
-While loops go until a condition is no longer met.
-prints:
+While迴圈會執行到條件不成立為止
+下面的程式碼會輸出:
     0
     1
     2
@@ -417,62 +419,62 @@ prints:
 x = 0
 while x < 4:
     print x
-    x += 1  # Shorthand for x = x + 1
+    x += 1  # x = x + 1 的簡寫
 
-# Handle exceptions with a try/except block
+# 用try/except處理例外
 
-# Works on Python 2.6 and up:
+# 適用Python 2.6及以上版本
 try:
-    # Use "raise" to raise an error
+    # 用 "raise" 來發起例外
     raise IndexError("This is an index error")
 except IndexError as e:
-    pass    # Pass is just a no-op. Usually you would do recovery here.
+    pass    # 毫無反應，就只是個什麼都沒做的pass。通常這邊會讓你做對例外的處理
 except (TypeError, NameError):
-    pass    # Multiple exceptions can be handled together, if required.
-else:   # Optional clause to the try/except block. Must follow all except blocks
-    print "All good!"   # Runs only if the code in try raises no exceptions
-finally: #  Execute under all circumstances
+    pass    # 有需要的話，多種例外可以一起處理
+else:   # else 可有可無，但必須寫在所有的except後
+    print "All good!"   # 只有在try的時候沒有產生任何except才會被執行
+finally: # 不管什麼情況下一定會被執行
     print "We can clean up resources here"
 
-# Instead of try/finally to cleanup resources you can use a with statement
+# 除了try/finally以外，你可以用 with 來簡單的處理清理動作
 with open("myfile.txt") as f:
     for line in f:
         print line
 
 ####################################################
-## 4. Functions
+## 4. 函式
 ####################################################
 
-# Use "def" to create new functions
+# 用 "def" 來建立新函式
 def add(x, y):
     print "x is {0} and y is {1}".format(x, y)
-    return x + y    # Return values with a return statement
+    return x + y    # 用 "return" 來回傳值
 
-# Calling functions with parameters
-add(5, 6)   # => prints out "x is 5 and y is 6" and returns 11
+# 用參數來呼叫韓式
+add(5, 6)   # => 輸出 "x is 5 and y is 6" 並回傳 11
 
-# Another way to call functions is with keyword arguments
-add(y=6, x=5)   # Keyword arguments can arrive in any order.
+# 你也可以寫上參數名稱來呼叫函式
+add(y=6, x=5)   # 這種狀況下，兩個參數的順序並不影響執行
 
 
-# You can define functions that take a variable number of
-# positional args, which will be interpreted as a tuple if you do not use the *
+# 你可以定義接受多個變數的函式，這些變數是按照順序排序的
+# 如果不加*的話會被解讀為tuple
 def varargs(*args):
     return args
 
 varargs(1, 2, 3)   # => (1, 2, 3)
 
 
-# You can define functions that take a variable number of
-# keyword args, as well, which will be interpreted as a dict if you do not use **
+# 你可以定義接受多個變數的函式，這些變數是按照keyword排序的
+# 如果不加**的話會被解讀為dictionary
 def keyword_args(**kwargs):
     return kwargs
 
-# Let's call it to see what happens
+# 呼叫看看會發生什麼事吧
 keyword_args(big="foot", loch="ness")   # => {"big": "foot", "loch": "ness"}
 
 
-# You can do both at once, if you like
+# 如果你想要，你也可以兩個同時用
 def all_the_args(*args, **kwargs):
     print args
     print kwargs
@@ -482,39 +484,40 @@ all_the_args(1, 2, a=3, b=4) prints:
     {"a": 3, "b": 4}
 """
 
-# When calling functions, you can do the opposite of args/kwargs!
-# Use * to expand positional args and use ** to expand keyword args.
+# 呼叫函式時，你可以做反向的操作
+# 用 * 將變數展開為順序排序的變數
+# 用 ** 將變數展開為Keyword排序的變數
 args = (1, 2, 3, 4)
 kwargs = {"a": 3, "b": 4}
-all_the_args(*args)   # equivalent to foo(1, 2, 3, 4)
-all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
-all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
+all_the_args(*args)   # 等同於 foo(1, 2, 3, 4)
+all_the_args(**kwargs)   # 等同於 foo(a=3, b=4)
+all_the_args(*args, **kwargs)   # 等同於 foo(1, 2, 3, 4, a=3, b=4)
 
-# you can pass args and kwargs along to other functions that take args/kwargs
-# by expanding them with * and ** respectively
+# 你可以把args跟kwargs傳到下一個函式內
+# 分別用 * 跟 ** 將它展開就可以了
 def pass_all_the_args(*args, **kwargs):
     all_the_args(*args, **kwargs)
     print varargs(*args)
     print keyword_args(**kwargs)
 
-# Function Scope
+# 函式範圍
 x = 5
 
 def set_x(num):
-    # Local var x not the same as global variable x
+    # 區域變數 x 和全域變數 x 不是同一個東西
     x = num # => 43
     print x # => 43
 
 def set_global_x(num):
     global x
     print x # => 5
-    x = num # global var x is now set to 6
+    x = num # 全域變數 x 在set_global_x(6)被設定為 6 
     print x # => 6
 
 set_x(43)
 set_global_x(6)
 
-# Python has first class functions
+# Python有一級函式
 def create_adder(x):
     def adder(y):
         return x + y
@@ -523,23 +526,23 @@ def create_adder(x):
 add_10 = create_adder(10)
 add_10(3)   # => 13
 
-# There are also anonymous functions
+# 也有匿名函式
 (lambda x: x > 2)(3)   # => True
 (lambda x, y: x ** 2 + y ** 2)(2, 1) # => 5
 
-# There are built-in higher order functions
+# 還有內建的高階函式
 map(add_10, [1, 2, 3])   # => [11, 12, 13]
 map(max, [1, 2, 3], [4, 2, 1])   # => [4, 2, 3]
 
 filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
 
-# We can use list comprehensions for nice maps and filters
+# 我們可以用List列表的方式對map和filter等高階函式做更有趣的應用
 [add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
 [x for x in [3, 4, 5, 6, 7] if x > 5]   # => [6, 7]
 
 
 ####################################################
-## 5. Classes
+## 5. 類別
 ####################################################
 
 # We subclass from object to get a class.

From e2b93f579cbcbb58612081b46f4460cd0255edb3 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 02:18:21 +0800
Subject: [PATCH 38/88] Finish translation of Sec. 6

---
 zh-tw/python-tw.html.markdown | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 073c5e91..d113f90c 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -545,25 +545,25 @@ filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
 ## 5. 類別
 ####################################################
 
-# We subclass from object to get a class.
+# 我們可以由object繼承出一個新的類別
 class Human(object):
 
-    # A class attribute. It is shared by all instances of this class
+    # 類別的參數，被所有這個類別的實體所共用
     species = "H. sapiens"
 
-    # Basic initializer, this is called when this class is instantiated.
-    # Note that the double leading and trailing underscores denote objects
-    # or attributes that are used by python but that live in user-controlled
-    # namespaces. You should not invent such names on your own.
+    # 基礎建構函式，當class被實體化的時候會被呼叫
+    # 注意前後的雙底線代表物件
+    # 還有被python用，但實際上是在使用者控制的命名
+    # 空間內的參數。你不應該自己宣告這樣的名稱。
     def __init__(self, name):
-        # Assign the argument to the instance's name attribute
+        # 將函式引入的參數 name 指定給實體的 name 參數
         self.name = name
 
-        # Initialize property
+        # 初始化屬性
         self.age = 0
 
 
-    # An instance method. All methods take "self" as the first argument
+    # 一個實體的方法(method)。 所有的method都以self為第一個參數
     def say(self, msg):
         return "{0}: {1}".format(self.name, msg)
 
@@ -626,41 +626,41 @@ i.age  # => raises an AttributeError
 
 
 ####################################################
-## 6. Modules
+## 6. 模組
 ####################################################
 
-# You can import modules
+# 你可以引入模組來做使用
 import math
 print math.sqrt(16)  # => 4
+                     # math.sqrt()為取根號
 
-# You can get specific functions from a module
+# 你可以只從模組取出特定幾個函式
 from math import ceil, floor
 print ceil(3.7)  # => 4.0
 print floor(3.7)   # => 3.0
 
-# You can import all functions from a module.
-# Warning: this is not recommended
+# 你可以將所有的函式從模組中引入
+# 注意：不建議這麼做
 from math import *
 
-# You can shorten module names
+# 你可以用 as 簡寫模組名稱
 import math as m
 math.sqrt(16) == m.sqrt(16)   # => True
-# you can also test that the functions are equivalent
+# 你也可以測試函示是否相等
 from math import sqrt
 math.sqrt == m.sqrt == sqrt  # => True
 
-# Python modules are just ordinary python files. You
-# can write your own, and import them. The name of the
-# module is the same as the name of the file.
+# Python的模組就只是一般的Python檔。
+# 你可以自己的模組自己寫、自己的模組自己引入
+# 模組的名稱和檔案名稱一樣
 
-# You can find out which functions and attributes
-# defines a module.
+# 你可以用dir()來查看有哪些可用函式和屬性
 import math
 dir(math)
 
 
 ####################################################
-## 7. Advanced
+## 7. 進階
 ####################################################
 
 # Generators help you make lazy code

From 3544a43d117d7b63de2c3443250270d92d00dce9 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 02:27:42 +0800
Subject: [PATCH 39/88] Finish Sec. 7 translation.

---
 zh-tw/python-tw.html.markdown | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index d113f90c..797fc6ed 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -663,34 +663,30 @@ dir(math)
 ## 7. 進階
 ####################################################
 
-# Generators help you make lazy code
+# 產生器(Generator)可以讓你寫更懶惰的程式碼
 def double_numbers(iterable):
     for i in iterable:
         yield i + i
 
-# A generator creates values on the fly.
-# Instead of generating and returning all values at once it creates one in each
-# iteration.  This means values bigger than 15 wont be processed in
-# double_numbers.
-# Note xrange is a generator that does the same thing range does.
-# Creating a list 1-900000000 would take lot of time and space to be made.
-# xrange creates an xrange generator object instead of creating the entire list
-# like range does.
-# We use a trailing underscore in variable names when we want to use a name that
-# would normally collide with a python keyword
+# 產生器可以讓你即時的產生值
+# 不是全部產生完之後再一次回傳，產生器會在每一個遞迴時
+# 產生值。 這也意味著大於15的值不會在double_numbers中產生。
+# 這邊，xrange()做的事情和range()一樣
+# 建立一個 1-900000000 的List會消耗很多時間和記憶體空間
+# xrange() 建立一個產生器物件，而不是如range()建立整個List
+# 我們用底線來避免可能和python的關鍵字重複的名稱
 xrange_ = xrange(1, 900000000)
 
-# will double all numbers until a result >=30 found
+# 下面的程式碼會把所有的值乘以兩倍，直到出現大於30的值
 for i in double_numbers(xrange_):
     print i
     if i >= 30:
         break
 
 
-# Decorators
-# in this example beg wraps say
-# Beg will call say. If say_please is True then it will change the returned
-# message
+# 裝飾子
+# 在這個範例中，beg會綁在say上
+# Beg會呼叫say。 如果say_please為True的話，它會更改回傳的訊息
 from functools import wraps
 
 
@@ -715,9 +711,9 @@ print say()  # Can you buy me a beer?
 print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
 ```
 
-## Ready For More?
+## 準備好學更多了嗎?
 
-### Free Online
+### 線上免費資源
 
 * [Automate the Boring Stuff with Python](https://automatetheboringstuff.com)
 * [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
@@ -728,7 +724,7 @@ print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 * [First Steps With Python](https://realpython.com/learn/python-first-steps/)
 
-### Dead Tree
+### 或買本書?
 
 * [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
 * [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)

From 2ecf370ce4e8b6644863e92652f9b63717ab3e6e Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Mon, 2 Nov 2015 02:32:25 +0800
Subject: [PATCH 40/88] Sec. 6 translated. All sections translated. Hooray.

---
 zh-tw/python-tw.html.markdown | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 797fc6ed..10b4669c 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -567,60 +567,59 @@ class Human(object):
     def say(self, msg):
         return "{0}: {1}".format(self.name, msg)
 
-    # A class method is shared among all instances
-    # They are called with the calling class as the first argument
+    # 一個類別方法會被所有的實體所共用
+    # 他們會以類別為第一參數的方式被呼叫
     @classmethod
     def get_species(cls):
         return cls.species
 
-    # A static method is called without a class or instance reference
+    # 靜態方法
     @staticmethod
     def grunt():
         return "*grunt*"
 
-    # A property is just like a getter.
-    # It turns the method age() into an read-only attribute
-    # of the same name.
+    # 屬性就像是用getter取值一樣
+    # 它將方法 age() 轉為同名的、只能讀取的屬性
     @property
     def age(self):
         return self._age
 
-    # This allows the property to be set
+    # 這樣寫的話可以讓屬性被寫入新的值
     @age.setter
     def age(self, age):
         self._age = age
 
-    # This allows the property to be deleted
+    # 這樣寫的話允許屬性被刪除
     @age.deleter
     def age(self):
         del self._age
 
 
-# Instantiate a class
+# 將類別實體化
 i = Human(name="Ian")
 print i.say("hi")     # prints out "Ian: hi"
 
 j = Human("Joel")
 print j.say("hello")  # prints out "Joel: hello"
 
-# Call our class method
+# 呼叫類別方法
 i.get_species()   # => "H. sapiens"
 
-# Change the shared attribute
+# 更改共用的屬性
 Human.species = "H. neanderthalensis"
 i.get_species()   # => "H. neanderthalensis"
 j.get_species()   # => "H. neanderthalensis"
 
-# Call the static method
+# 呼叫靜態方法
 Human.grunt()   # => "*grunt*"
 
-# Update the property
+# 更新屬性
 i.age = 42
 
-# Get the property
+# 取得屬性
 i.age # => 42
 
-# Delete the property
+# 移除屬性
 del i.age
 i.age  # => raises an AttributeError
 

From a25d4db0bcfb9325f69f68a2532df6fd88f4e78d Mon Sep 17 00:00:00 2001
From: rainjay <RainJay0117@gmail.com>
Date: Tue, 3 Nov 2015 11:09:19 +0800
Subject: [PATCH 41/88] fix typo

---
 zh-tw/python-tw.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 10b4669c..c4706c43 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -450,7 +450,7 @@ def add(x, y):
     print "x is {0} and y is {1}".format(x, y)
     return x + y    # 用 "return" 來回傳值
 
-# 用參數來呼叫韓式
+# 用參數來呼叫函式
 add(5, 6)   # => 輸出 "x is 5 and y is 6" 並回傳 11
 
 # 你也可以寫上參數名稱來呼叫函式

From 3d19a951926f52b7cafca301919233f4cda513ff Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Mon, 30 Nov 2015 12:48:13 -0800
Subject: [PATCH 42/88] [TypeScript/fr] Make TypeScript indentation
 consistently 2 spaces

fr version of #2041
---
 fr-fr/typescript-fr.html.markdown | 56 +++++++++++++++----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/fr-fr/typescript-fr.html.markdown b/fr-fr/typescript-fr.html.markdown
index b8807104..52d34650 100644
--- a/fr-fr/typescript-fr.html.markdown
+++ b/fr-fr/typescript-fr.html.markdown
@@ -87,22 +87,22 @@ mySearch = function(src: string, sub: string) {
 
 // Les membres des classes sont publiques par défaut.
 class Point {
-    // Propriétés
-    x: number;
+  // Propriétés
+  x: number;
 
-    // Constructeur - Les mots clés "public" et "private" dans ce contexte
-    //  génèrent le code de la propriété et son initialisation dans le
-    // constructeur. Ici, "y" sera défini de la même façon que "x",
-    // mais avec moins de code. Les valeurs par défaut sont supportées.
-    constructor(x: number, public y: number = 0) {
-        this.x = x;
-    }
+  // Constructeur - Les mots clés "public" et "private" dans ce contexte
+  //  génèrent le code de la propriété et son initialisation dans le
+  // constructeur. Ici, "y" sera défini de la même façon que "x",
+  // mais avec moins de code. Les valeurs par défaut sont supportées.
+  constructor(x: number, public y: number = 0) {
+    this.x = x;
+  }
 
-    // Fonctions
-    dist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+  // Fonctions
+  dist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
 
-    // Membres statiques
-    static origin = new Point(0, 0);
+  // Membres statiques
+  static origin = new Point(0, 0);
 }
 
 var p1 = new Point(10 ,20);
@@ -110,17 +110,17 @@ var p2 = new Point(25); // y sera 0
 
 // Héritage
 class Point3D extends Point {
-    constructor(x: number, y: number, public z: number = 0) {
-        // Un appel explicite au constructeur de la super classe
-        // est obligatoire.
-        super(x, y);
-    }
+  constructor(x: number, y: number, public z: number = 0) {
+    // Un appel explicite au constructeur de la super classe
+    // est obligatoire.
+    super(x, y);
+  }
 
-    // Redéfinition
-    dist() {
-        var d = super.dist();
-        return Math.sqrt(d * d + this.z * this.z);
-    }
+  // Redéfinition
+  dist() {
+    var d = super.dist();
+    return Math.sqrt(d * d + this.z * this.z);
+  }
 }
 
 // Modules, "." peut être utilisé comme un séparateur de sous modules.
@@ -144,19 +144,19 @@ var s2 = new G.Square(10);
 // Génériques
 // Classes
 class Tuple<T1, T2> {
-    constructor(public item1: T1, public item2: T2) {
-    }
+  constructor(public item1: T1, public item2: T2) {
+  }
 }
 
 // Interfaces
 interface Pair<T> {
-    item1: T;
-    item2: T;
+  item1: T;
+  item2: T;
 }
 
 // Et fonctions
 var pairToTuple = function<T>(p: Pair<T>) {
-    return new Tuple(p.item1, p.item2);
+  return new Tuple(p.item1, p.item2);
 };
 
 var tuple = pairToTuple({ item1:"hello", item2:"world"});

From b9cde57bc7efdfd9b9ba8e5fdbe9932c11562d0d Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Thu, 3 Dec 2015 17:04:28 +0500
Subject: [PATCH 43/88] Update d-ru.html.markdown

fixed typo
---
 ru-ru/d-ru.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index cbd5b127..ecd6c44c 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -17,7 +17,7 @@ D - это С++, сделанный правильно.
    комментарий  */
 
 /+
-    // вложенные кометарии
+    // вложенные комментарии
 
     /* еще вложенные
        комментарии */

From 410cc03b09870be6da4931725120b44f93b3bcfc Mon Sep 17 00:00:00 2001
From: Robb Shecter <robb@weblaws.org>
Date: Thu, 3 Dec 2015 14:27:24 -0800
Subject: [PATCH 44/88] Updating dev environment installation info

---
 haskell.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskell.html.markdown b/haskell.html.markdown
index 936744a0..34eee748 100644
--- a/haskell.html.markdown
+++ b/haskell.html.markdown
@@ -426,7 +426,7 @@ qsort (p:xs) = qsort lesser ++ [p] ++ qsort greater
           greater = filter (>= p) xs
 ```
 
-Haskell is easy to install. Get it [here](http://www.haskell.org/platform/).
+There are two popular ways to install Haskell: The traditional [Cabal-based installation](http://www.haskell.org/platform/), and the newer [Stack-based process](https://www.stackage.org/install).
 
 You can find a much gentler introduction from the excellent
 [Learn you a Haskell](http://learnyouahaskell.com/) or

From 3f91dff4282962a30e30c4831c328a682dfc4924 Mon Sep 17 00:00:00 2001
From: JustBlah <justbeblah@gmail.com>
Date: Fri, 4 Dec 2015 06:12:54 +0200
Subject: [PATCH 45/88] Commas added.

---
 ru-ru/objective-c-ru.html.markdown | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ru-ru/objective-c-ru.html.markdown b/ru-ru/objective-c-ru.html.markdown
index bebd36d3..e987dd53 100644
--- a/ru-ru/objective-c-ru.html.markdown
+++ b/ru-ru/objective-c-ru.html.markdown
@@ -387,13 +387,13 @@ if ([myClass respondsToSelector:selectorVar]) { // Проверяет содер
     NSNumber height;
 }
 
-// Для доступа к public переменной, объявленной в интерфейсе используйте '_' перед названием переменной:
+// Для доступа к public переменной, объявленной в интерфейсе, используйте '_' перед названием переменной:
 _count = 5; // Ссылается на "int count" из интерфейса MyClass
-// Получение доступа к переменной, объявленной в имлементации происходит следующим образом:
-distance = 18; // Ссылается на "long distance" из имлементации MyClass
+// Получение доступа к переменной, объявленной в реализации происходит следующим образом:
+distance = 18; // Ссылается на "long distance" из реализации MyClass
 // Для использования в иплементации переменной, объявленной в интерфейсе с помощью @property,
 // следует использовать @synthesize для создания переменной аксессора:
-@synthesize roString = _roString; // Теперь _roString доступна в @implementation (имплементации интерфейса)
+@synthesize roString = _roString; // Теперь _roString доступна в @implementation (реализации интерфейса)
 
 // Вызывается в первую очередь, перед вызовом других медотов класса или инициализации других объектов
 + (void)initialize 
@@ -507,7 +507,7 @@ distance = 18; // Ссылается на "long distance" из имлемент
 @end
 
 // Теперь, если мы хотим создать объект Truck - грузовик, мы должны создать подкласс класса Car, что
-// изменит функционал Car и позволит вести себя подобно грузовику. Но что если мы хотим только добавить
+// изменит функционал Car и позволит вести себя подобно грузовику. Но что, если мы хотим только добавить
 // определенный функционал в уже существующий класс Car? Например - чистка автомобиля. Мы просто создадим
 // категорию, которая добавит несколько методов для чистки автомобиля в класс Car:
 // @interface ИмяФайла: Car+Clean.h (ИмяБазовогоКласса+ИмяКатегории.h)

From ad19e8803a4ebc21f16d3407cf64f368b0745597 Mon Sep 17 00:00:00 2001
From: Laoujin <woutervs@hotmail.com>
Date: Sat, 5 Dec 2015 15:18:15 +0100
Subject: [PATCH 46/88] [PowerShell/en]: didn't recognize code blocks

---
 powershell.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/powershell.html.markdown b/powershell.html.markdown
index 4bc1ab39..8920d254 100644
--- a/powershell.html.markdown
+++ b/powershell.html.markdown
@@ -18,6 +18,7 @@ rather than plain text.
 [Read more here.](https://technet.microsoft.com/en-us/library/bb978526.aspx)
 
 If you are uncertain about your environment:
+
 ```
 Get-ExecutionPolicy -List
 Set-ExecutionPolicy AllSigned
@@ -33,6 +34,7 @@ $PSVersionTable
 ```
 
 Getting help:
+
 ```
 # Find commands
 Get-Command about_* # alias: gcm
@@ -49,6 +51,7 @@ Update-Help # Run as admin
 ```
 
 The tutorial starts here:
+
 ```
 # As you already figured, comments start with #
 
@@ -292,6 +295,7 @@ $Shortcut.Save()
 
 
 Configuring your shell
+
 ```
 # $Profile is the full path for your `Microsoft.PowerShell_profile.ps1`
 # All code there will be executed when the PS session starts

From 73fbc7f75512ac61493e4f82f0fc5108229124f3 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Sun, 6 Dec 2015 00:00:07 +0800
Subject: [PATCH 47/88] Rename file by adding -tw suffix.

---
 zh-tw/python-tw.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index c4706c43..472b39ab 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -7,7 +7,7 @@ contributors:
     - ["evuez", "http://github.com/evuez"]
 translators:
     - ["Michael Yeh", "https://hinet60613.github.io/"]
-filename: learnpython.py
+filename: learnpython-tw.py
 lang: zh-tw
 ---
 

From d75d8e133a5d7d2e23c7afc1ea16ec68db61cff7 Mon Sep 17 00:00:00 2001
From: Max Goldstein <maxgoldstein1@gmail.com>
Date: Tue, 8 Dec 2015 15:06:37 -0500
Subject: [PATCH 48/88] Add Elm

---
 elm.html.markdown | 346 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 346 insertions(+)
 create mode 100644 elm.html.markdown

diff --git a/elm.html.markdown b/elm.html.markdown
new file mode 100644
index 00000000..8c191509
--- /dev/null
+++ b/elm.html.markdown
@@ -0,0 +1,346 @@
+---
+language: Elm
+contributors:
+    - ["Max Goldstein", "http://maxgoldste.in/"]
+---
+
+Elm is a functional reactive programming language that compiles to (client-side)
+JavaScript. Elm is statically typed, meaning that the compiler catches most
+errors immediately and provides a clear and understandable error message. Elm is
+great for designing user interfaces and games for the web.
+
+
+```haskell
+-- Single line comments start with two dashes.
+{- Multiline comments can be enclosed in a block like this.
+{- They can be nested. -}
+-}
+
+{-- The Basics --}
+
+-- Arithmetic
+1 + 1 -- 2
+8 - 1 -- 7
+10 * 2 -- 20
+
+-- Every number literal without a decimal point can be either an Int or a Float.
+33 / 2 -- 16.5 with floating point division
+33 // 2 -- 16 with integer division
+
+-- Exponents
+5 ^ 2 -- 25
+
+-- Booleans
+not True -- False
+not False -- True
+1 == 1 -- True
+1 /= 1 -- False
+1 < 10 -- True
+
+-- Strings and characters
+"This is a string."
+'a' -- character
+'You cant use single quotes for strings.' -- error!
+
+-- Strings can be appended
+"Hello " ++ "world!" -- "Hello world!"
+
+{-- Lists, Tuples, and Records --}
+
+-- Every element in a list must have the same type.
+["the", "quick", "brown", "fox"]
+[1, 2, 3, 4, 5]
+-- The second example can also be written with two dots.
+[1..5]
+
+-- Append lists just like strings
+[1..5] ++ [6..10] == [1..10] -- True
+
+-- To add one item, use "cons"
+0 :: [1..5] -- [0, 1, 2, 3, 4, 5]
+
+-- The head and tail of a list are returned as a Maybe. Instead of checking
+-- every value to see if it's null, you deal with missing values explicitly.
+List.head [1..5] -- Just 1
+List.tail [1..5] -- Just [2, 3, 4, 5]
+List.head [] -- Nothing
+
+-- Every element in a tuple can be a different type, but a tuple has a
+-- fixed length.
+("elm", 42)
+
+-- Access the elements of a pair with the first and second functions.
+-- (This is a shortcut; we'll come to the "real way" in a bit.)
+fst ("elm", 42) -- "elm"
+snd ("elm", 42) -- 42
+
+-- Records are like tuples but the fields have names.
+-- Notice that equals signs, not colons, are used.
+{ x = 3, y = 7}
+
+-- Access a field with a dot and the field name.
+{ x = 3, y = 7}.x -- 3
+
+-- Or with an accessor fuction, a dot and then the field name.
+.y { x = 3, y = 7} -- 7
+
+-- Update the fields of a record. (It must have the fields already.)
+{ person |
+  name = "George" }
+
+{ physics |
+  position = physics.position + physics.velocity,
+  velocity = physics.velocity + physics.acceleration }
+
+{-- Control Flow --}
+
+-- If statements always have an else, and the branches must be the same type.
+if powerLevel > 9000 then
+  "WHOA!"
+else
+  "meh"
+
+-- If statements can be chained.
+if n < 0 then
+  "n is negative"
+else if n > 0 then
+  "n is positive"
+else
+  "n is zero"
+
+-- Use case statements to pattern match on different possibilities.
+case aList of
+  [] -> "matches the empty list"
+  x::xs -> "matches a list of at least one item whose head is " ++ toString x
+
+case List.head aList of
+  Just x -> "The head is " ++ toString x
+  Nothing -> "The list was empty"
+
+{-- Functions --}
+
+-- Elm's syntax for functions is very minimal, relying mostly on whitespace
+-- rather than parentheses and curly brackets. There is no "return" keyword.
+
+-- Define a function with its name, arguments, an equals sign, and the body.
+multiply a b =
+  a * b
+
+-- Apply (call) a function by passing it arguments (no commas necessay).
+multiply 7 6 -- 42
+
+-- Partially apply a function by passing only some of its arguments.
+-- Then give that function a new name.
+double =
+  multiply 2
+
+-- Constants are similar, except there are no arguments.
+answer =
+  42
+
+-- Pass functions as arguments to other functions.
+List.map double [1..4] -- [2, 4, 6, 8]
+
+-- Or write an anonymous function.
+List.map (\a -> a * 2) [1..4] -- [2, 4, 6, 8]
+
+-- You can pattern match in function definitions when there's only one case.
+-- This function takes one tuple rather than two arguments.
+area (width, height) =
+  width * height
+
+area (6, 7) -- 42
+
+-- Use curly brackets to pattern match record field names
+-- Use let to define intermediate values
+volume {width, height, depth} =
+  let
+    area = width * height
+  in
+    area * depth
+
+volume { width = 3, height = 2, depth = 7 } -- 42
+
+-- Functions can be recursive
+fib n =
+  if n < 2 then
+    1
+  else
+    fib (n - 1) + fib (n - 2)
+
+List.map fib [0..8] -- [1, 1, 2, 3, 5, 8,13, 21, 34]
+
+listLength aList =
+  case aList of
+    [] -> 0
+    x::xs -> 1 + listLength xs
+
+-- Function application happens before any infix operation
+cos (degrees 30) ^ 2 + sin (degrees 30) ^ 2 -- 1
+-- First degrees is applied to 30, then the result is passed to the trig
+-- functions, which is then squared, and the addition happens last.
+
+{-- Types and Type Annotations --}
+
+-- The compiler will infer the type of every value in your program.
+-- Types are always uppercase. Read x : T as "x has type T".
+-- Some common types, which you might see in Elm's REPL.
+5 : Int
+6.7 : Float
+"hello" : String
+True : Bool
+
+-- Functions have types too. Read -> as "goes to". Think of the rightmost type
+-- as the type of the return value.
+not : Bool -> Bool
+round : Float -> Int
+
+-- When you define a value, it's good practice to write its type above it.
+-- The annotation is a form of documentation, which is verified by the compiler.
+double : Int -> Int
+double x = x * 2
+
+-- Function arguments are passed in parentheses.
+-- Lowercase types are type variables: they can be any type, as long as each
+-- call is consistent.
+List.map : (a -> b) -> List a -> List b
+-- "List dot map has type a-goes-to-b, goes to list of a, goes to list of b."
+
+-- There are three special lowercase types: number, comparable, and appendable.
+-- Numbers allow you to use arithmetic on Ints and Floats.
+-- Comparable allows you to order numbers and strings, like a < b.
+-- Appendable things can be combined with a ++ b.
+
+{-- Type Aliases and Union Types --}
+
+-- When you write a record or tuple, its type already exists.
+-- (Notice that record types use colon and record values use equals.)
+origin : { x : Float, y : Float, z : Float }
+origin =
+  { x = 0, y = 0, z = 0 }
+
+-- You can give existing types a nice name with a type alias.
+type alias Point3D = { x : Float, y : Float, z : Float }
+
+-- If you alias a record, you can use the name as a constructor function.
+otherOrigin : Point3D
+otherOrigin = Point3D 0 0 0
+
+-- But it's still the same type, you can equate them
+origin == otherOrigin -- True
+
+-- By contrast, defining a union type creates a type that didn't exist before.
+-- A union type is so called because it can be one of many possibilities.
+-- Each of the possibilities is represented as a "tag".
+type Direction = North | South | East | West
+
+-- Tags can carry other values of known type. This can work recursively.
+type IntTree = Leaf | Node Int IntTree IntTree
+
+-- "Leaf" and "Node" are the tags. Everything following a tag is a type.
+-- Tags can be used as values or functions.
+root : IntTree
+root = Node 7 Leaf Leaf
+
+-- Union types (and type aliases) can use type variables.
+type Tree a = Leaf | Node a (Tree a) (Tree a)
+
+-- You can pattern match union tags. The uppercase tags must be matched exactly.
+-- The lowercase variables will match anything. Underscore also matches
+-- anything, but signifies that you aren't using it.
+leftmostElement : Tree a -> Maybe a
+leftmostElement tree =
+  case tree of
+    Leaf -> Nothing
+    Node x Leaf _ -> Just x
+    Node _ subtree _ -> leftmostElement subtree
+
+-- That's pretty much it for the language itself. Now let's see how to organize
+-- and run your code.
+
+{-- Modules and Imports --}
+
+-- The core libraries are organized into modulues, as are any third-party
+-- libraries you may use. For large projects, you can define your own modulues.
+
+-- Put this at the top of the file. If omitted, you're in Main.
+module Name where
+
+-- By default, everything is exported.
+-- Limit what values and types are exported
+module Name (Type, value) where
+
+-- One common pattern is to export a union type but not its tags. This is known
+-- as an "opaque type", and is frequently used in libraries.
+
+-- Import code from other modules to use it in this one
+-- Places Dict in scope, so you can call Dict.insert
+import Dict
+
+-- Imports the Dict module and the Dict type, so your annotations don't have to
+-- say Dict.Dict. You can still use Dict.insert.
+import Dict exposing (Dict)
+
+-- Rename an import.
+import Graphics.Collage as C
+
+{-- Ports --}
+
+-- A port indicates that you will be communicating with the outside world.
+-- Ports are only allowed in the Main module.
+
+-- An incoming port is just a type signature.
+port clientID : Int
+
+-- An outgoing port has a defintion.
+port clientOrders : List String
+port clientOrders = ["Books", "Groceries", "Furniture"]
+
+-- We won't go into the details, but you set up callbacks in JavaScript to send
+-- on incoming ports and receive on outgoing ports.
+
+{-- Command Line Tools --}
+
+-- Compile a file.
+$ elm make MyFile.elm
+
+-- The first time you do this, Elm will install the core libraries and create
+-- elm-package.json, where information about your project is kept.
+
+-- The reactor is a server that compiles and runs your files.
+-- Click the wrench next to file names to enter the time-travelling debugger!
+$ elm reactor
+
+-- Experiment with simple expressions in a Read-Eval-Print Loop.
+$ elm repl
+
+-- Packages are identified by GitHub username and repo name.
+-- Install a new package, and record it in elm-package.json.
+$ elm package install evancz/elm-html
+
+-- Elm's package manager enforces semantic versioning, so minor version bumps
+-- will never break your build!
+```
+
+The Elm language is surprisingly small. You can now look through almost any Elm
+source code and have a rough idea of what is going on. However, the possibilties
+for error-resistant and easy-to-refactor code are endless!
+
+Here are some useful resources.
+
+* The [Elm website](http://elm-lang.org/). Includes:
+  * Links to the [installers](http://elm-lang.org/install)
+  * [Documentation guides](http://elm-lang.org/docs), including the [syntax reference](http://elm-lang.org/docs/syntax)
+  * Lots of helpful [examples](http://elm-lang.org/examples)
+
+* Documentation for [Elm's core libraries](http://package.elm-lang.org/packages/elm-lang/core/latest/). Take note of:
+  * [Basics](http://package.elm-lang.org/packages/elm-lang/core/latest/Basics), which is imported by default
+  * Data structures like [Array](http://package.elm-lang.org/packages/elm-lang/core/latest/Array), [Dict](http://package.elm-lang.org/packages/elm-lang/core/latest/Dict), and [Set](http://package.elm-lang.org/packages/elm-lang/core/latest/Set)
+  * JSON [encoding](http://package.elm-lang.org/packages/elm-lang/core/latest/Json-Encode) and [decoding](http://package.elm-lang.org/packages/elm-lang/core/latest/Json-Decode)
+
+* [The Elm Architecture](https://github.com/evancz/elm-architecture-tutorial#the-elm-architecture). An essay with examples on how to organize code into components.
+
+* The [Elm mailing list](https://groups.google.com/forum/#!forum/elm-discuss). Everyone is friendly and helpful.
+
+
+Go out and write some Elm!

From 2f85645c9f988663c2f584fb23392d873fc3c8e9 Mon Sep 17 00:00:00 2001
From: Anton Davydov <don.mist@gmail.com>
Date: Wed, 9 Dec 2015 00:03:06 +0300
Subject: [PATCH 49/88] [common-lisp/en] Fix code in examples

---
 common-lisp.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common-lisp.html.markdown b/common-lisp.html.markdown
index 2b1f5de4..9a23bc26 100644
--- a/common-lisp.html.markdown
+++ b/common-lisp.html.markdown
@@ -339,7 +339,7 @@ nil                  ; for false - and the empty list
 
 ;; The () in the above is the list of arguments for the function
 (defun hello (name)
-   (format nil "Hello, ~a " name))
+   (format nil "Hello, ~a" name))
 
 (hello "Steve") ; => "Hello, Steve"
 
@@ -430,7 +430,7 @@ nil                  ; for false - and the empty list
 (defun walker (n)
   (if (zerop n)
       :walked
-      (walker (1- n))))
+      (walker (- n 1))))
 
 (walker 5) ; => :walked
 

From 38f2fb9a0bbd478bbbb4ccce0b33d1dcd34aa63a Mon Sep 17 00:00:00 2001
From: MichalMartinek <martinek8@gmail.com>
Date: Thu, 10 Dec 2015 22:45:40 +0100
Subject: [PATCH 50/88] Update sass.html.markdown

---
 cs-cz/sass.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs-cz/sass.html.markdown b/cs-cz/sass.html.markdown
index e890debe..0d2fca64 100644
--- a/cs-cz/sass.html.markdown
+++ b/cs-cz/sass.html.markdown
@@ -1,12 +1,12 @@
 ---
 language: sass
-filename: learnsass.scss
+filename: learnsass-cz.scss
 contributors:
   - ["Laura Kyle", "https://github.com/LauraNK"]
   - ["Sean Corrales", "https://github.com/droidenator"]
 translators:
   - ["Michal Martinek", "https://github.com/MichalMartinek"]
-
+lang: cs-cz
 ---
 
 Sass je rozšíření jazyka CSS, který přidává nové vlastnosti jako proměnné, zanořování, mixiny a další.

From 8bc9ebe08d792f560939db1e39077c800d15497b Mon Sep 17 00:00:00 2001
From: Mario Martinez <amakenadog@gmail.com>
Date: Fri, 11 Dec 2015 11:01:23 -0600
Subject: [PATCH 51/88] Updated to sdkman instead of GVM for installing groovy

---
 groovy.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/groovy.html.markdown b/groovy.html.markdown
index 8fb1b346..37e3b20c 100644
--- a/groovy.html.markdown
+++ b/groovy.html.markdown
@@ -13,8 +13,8 @@ Groovy - A dynamic language for the Java platform [Read more here.](http://groov
 /*
   Set yourself up:
 
-  1) Install GVM - http://gvmtool.net/
-  2) Install Groovy: gvm install groovy
+  1) Install SDKMAN - http://sdkman.io/
+  2) Install Groovy: sdk install groovy
   3) Start the groovy console by typing: groovyConsole
 
 */

From f854fe1111186a9b8ba36c8d6ed057461f376b35 Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Sat, 12 Dec 2015 14:43:56 +0500
Subject: [PATCH 52/88] Update d-ru.html.markdown

---
 ru-ru/d-ru.html.markdown | 138 ++++++++++++++++++++++-----------------
 1 file changed, 78 insertions(+), 60 deletions(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index ecd6c44c..0a8726c9 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -1,16 +1,17 @@
----
+/*---
 language: d
 filename: learnd-ru.d
 contributors:
     - ["Anton Pastukhov", "http://dprogramming.ru/"]
     - ["Robert Brights-Gray", "http://lhs-blog.info/"]
+    - ["Andre Polykanine", "http://oire.me/"]
 lang: ru-ru
 ---
 D - современный компилируемый язык общего назначения с Си-подобным синтаксисом,
 который сочетает удобство, продуманный дизайн и высокую производительность.
 D - это С++, сделанный правильно.
 
-```d
+```d */
 // Welcome to D! Это однострочный комментарий
 
 /* многострочный
@@ -53,7 +54,7 @@ void main()
 
 int a; // объявление переменной типа int (32 бита)
 float b = 12.34; // тип с плавающей точкой
-double с = 56.78; // тип с плавающей точкой (64 бита)
+double c = 56.78; // тип с плавающей точкой (64 бита)
 
 /*
     Численные типы в D, за исключением типов с плавающей точкой и типов
@@ -63,15 +64,17 @@ double с = 56.78; // тип с плавающей точкой (64 бита)
 uint d = 10; ulong e = 11;
 bool b = true; // логический тип
 char d = 'd';  // UTF-символ, 8 бит. D поддерживает UTF "из коробки"
-wchar = 'é';   // символ UTF-16
+wchar e = 'é';   // символ UTF-16
 dchar f;       // и даже UTF-32, если он вам зачем-то понадобится
 
 string s = "для строк есть отдельный тип, это не просто массив char-ов из Си";
 wstring ws = "поскольку у нас есть wchar, должен быть и  wstring";
 dstring ds = "...и dstring, конечно";
 
+string кириллица = "Имена переменных должны быть в Unicode, но не обязательно на латинице.";
+
 typeof(a) b = 6; // typeof возвращает тип своего выражения.
-                 // В результате, b имеет такой же тип как и a
+                 // В результате, b имеет такой же тип, как и a
 
 // Тип переменной, помеченной ключевым словом auto,
 // присваивается компилятором исходя из значения этой переменной
@@ -84,11 +87,11 @@ int[] arr2 = [1, 2, 3, 4]; // динамический массив
 int[string] aa = ["key1": 5, "key2": 6]; // ассоциативный массив
 
 /*
-   Cтроки и массивы в D — встроенные типы. Для их использования не нужно
+   Строки и массивы в D — встроенные типы. Для их использования не нужно
    подключать ни внешние, ни даже стандартную библиотеку, хотя в последней
    есть множество дополнительных инструментов для работы с ними.
  */
-immutalbe int ia = 10;  // неизменяемый тип,
+immutable int ia = 10;  // неизменяемый тип,
                         // обозначается ключевым словом immutable
 ia += 1;                // — вызовет ошибку на этапе компиляции
 
@@ -100,7 +103,7 @@ enum myConsts = { Const1, Const2, Const3 };
 writeln("Имя типа               : ", int.stringof); // int
 writeln("Размер в байтах        : ", int.sizeof);   // 4
 writeln("Минимальное значение   : ", int.min);      // -2147483648
-writeln("Максимальное значениеe : ", int.max);      // 2147483647
+writeln("Максимальное значение : ", int.max);      // 2147483647
 writeln("Начальное значение     : ", int.init);     // 0. Это значение,
                                                     // присвоенное по умолчанию
 
@@ -111,17 +114,13 @@ writeln("Начальное значение     : ", int.init);     // 0. Эт
 
 /*** Приведение типов ***/
 
-// Простейший вариант
-int i;
-double j = double(i) / 2;
-
 // to!(имя типа)(выражение) - для большинства конверсий
 import std.conv : to; // функция "to" - часть стандартной библиотеки, а не языка
 double d = -1.75;
 short s = to!short(d); // s = -1
 
 /*
-   cast - если вы знаете, что делаете. Кроме того, это единственный способ 
+   cast - если вы знаете, что делаете. Кроме того, это единственный способ
    преобразования типов-указателей в "обычные" и наоборот
 */
 void* v;
@@ -129,7 +128,7 @@ int* p = cast(int*)v;
 
 // Для собственного удобства можно создавать псевдонимы
 // для различных встроенных объектов
-alias int newInt; // теперь можно обращаться к int так, как будто бы это newInt
+alias int newInt; // теперь можно обращаться к newInt так, как будто бы это int
 newInt a = 5;
 
 alias newInt = int; // так тоже допустимо
@@ -203,6 +202,25 @@ switch (a) {
         break;
 }
 
+// в D есть констукция "final switch". Она не может содержать секцию "defaul"
+// и применяется, когда все перечисляемые в switch варианты должны быть
+// обработаны явным образом
+
+int dieValue = 1;
+final switch (dieValue) {
+    case 1:
+        writeln("You won");
+        break;
+
+    case 2, 3, 4, 5:
+        writeln("It's a draw");
+        break;
+
+    case 6:
+        writeln("I won");
+        break;
+}
+
 // while
 while (a > 10) {
     // ..
@@ -245,31 +263,33 @@ foreach (c; "hello") {
 
 foreach (number; 10..15) {
     writeln(number); // численные интервалы можно указывать явным образом
+                     // этот цикл выведет значения с 10 по 15, но не 15,
+                     // поскольку диапазон не включает в себя верхнюю границу
 }
 
 // foreach_reverse - в обратную сторону
-auto container = [ 1, 2, 3 ];
+auto container = [1, 2, 3];
 foreach_reverse (element; container) {
     writefln("%s ", element); // 3, 2, 1
 }
 
 // foreach в массивах и им подобных структурах не меняет сами структуры
-int[] a = [1,2,3,4,5];
+int[] a = [1, 2 ,3 ,4 ,5];
 foreach (elem; array) {
     elem *= 2; // сам массив останется неизменным
 }
 
-writeln(a); // вывод: [1,2,3,4,5] Т.е изменений нет
+writeln(a); // вывод: [1, 2, 3, 4, 5] Т.е изменений нет
 
 // добавление ref приведет к тому, что массив будет изменяться
 foreach (ref elem; array) {
-    elem *= 2; // сам массив останется неизменным
+    elem *= 2;
 }
 
-writeln(a); // [2,4,6,8,10]
+writeln(a); // [2, 4, 6, 8, 10]
 
-// foreach умеет расчитывать индексы элементов
-int[] a = [1,2,3,4,5];
+// foreach умеет рассчитывать индексы элементов
+int[] a = [1, 2, 3, 4, 5];
 foreach (ind, elem; array) {
     writeln(ind, " ", elem); // через ind - доступен индекс элемента,
                              // а через elem - сам элемент
@@ -288,7 +308,7 @@ int test(int argument) {
 }
 
 
-// В D используется унифицированныйй синтаксис вызова функций
+// В D используется единый синтаксис вызова функций
 // (UFCS, Uniform Function Call Syntax), поэтому так тоже можно:
 int var = 42.test();
 
@@ -299,11 +319,11 @@ int var2 = 42.test;
 int var3 = 42.test.test;
 
 /*
-    Аргументы в функцию передаются по значению (т. е.  функция работает не с
+    Аргументы в функцию передаются по значению (т.е. функция работает не с
     оригинальными значениями, переданными ей, а с их локальными копиями.
     Исключение составляют объекты классов, которые передаются по ссылке.
     Кроме того, любой параметр можно передать в функцию по ссылке с помощью
-    ключевого слова ref
+    ключевого слова "ref"
 */
 int var = 10;
 
@@ -318,7 +338,7 @@ void fn2(ref int arg) {
 fn1(var); // var все еще = 10
 fn2(var); // теперь var = 11
 
-// Возвращаемое значение тоже может быть auto, 
+// Возвращаемое значение тоже может быть auto,
 // если его можно "угадать" из контекста
 auto add(int x, int y) {
     return x + y;
@@ -373,13 +393,13 @@ printFloat(a); // использование таких функций - сам
 // без посредства глобальных переменных или массивов
 uint remMod(uint a, uint b, out uint modulus)
 {
-    uint remainder = a / b; 
+    uint remainder = a / b;
     modulus = a % b;
     return remainder;
 }
 
 uint modulus;                   // пока в этой переменной ноль
-uint rem = remMod(5,2,modulus); // наша "хитрая" функция, и теперь,
+uint rem = remMod(5, 2, modulus); // наша "хитрая" функция, и теперь
                                 // в modulus - остаток от деления
 writeln(rem, " ", modulus);     // вывод: 2 1
 
@@ -400,9 +420,9 @@ struct MyStruct {
 MyStruct str1; // Объявление переменной с типом MyStruct
 str1.a = 10;   // Обращение к полю
 str1.b = 20;
-auto result = str1.multiply();  
-MyStruct str2 = {4, 8}          // Объявление + инициальзация  в стиле Си
-auto str3 = MyStruct(5, 10);    // Объявление + инициальзация  в стиле D
+auto result = str1.multiply();
+MyStruct str2 = {4, 8}          // Объявление + инициализация  в стиле Си
+auto str3 = MyStruct(5, 10);    // Объявление + инициализация  в стиле D
 
 
 // области видимости полей и методов - 3 способа задания
@@ -420,7 +440,7 @@ struct MyStruct2 {
     }
     /*
         в дополнение к знакомым public, private и protected, в D есть еще
-        область видимости "package". Поля и методы с этим атрибутам будут
+        область видимости "package". Поля и методы с этим атрибутом будут
         доступны изо всех модулей, включенных в "пакет" (package), но не
         за его пределами. package - это "папка", в которой может храниться
         несколько модулей. Например, в "import.std.stdio", "std" - это
@@ -428,8 +448,8 @@ struct MyStruct2 {
     */
     package:
         string d;
-        
-    /* помимо этого, имеется еще один модификатор - export, который позволяет 
+
+    /* помимо этого, имеется еще один модификатор - export, который позволяет
     использовать объявленный с ним идентификатор даже вне самой программы !
     */
     export:
@@ -442,10 +462,10 @@ struct MyStruct3 {
              // в этом случае пустой конструктор добавляется компилятором
         writeln("Hello, world!");
     }
-    
-    
-    // а вот это конструкция, одна из интересных идиом и представлет собой 
-    // конструктор копирования, т.е конструктор возвращающий копию структуры.
+
+
+    // а вот это конструкция - одна из интересных идиом и представляет собой
+    // конструктор копирования, т.е конструктор, возвращающий копию структуры.
     // Работает только в структурах.
     this(this)
     {
@@ -488,7 +508,7 @@ class Outer
     {
         int foo()
         {
-            return m; // можно обращаться к полям "родительского" класса
+            return m; // можно обращаться к полям "внешнего" класса
         }
     }
 }
@@ -497,10 +517,10 @@ class Outer
 class Base {
     int a = 1;
     float b = 2.34;
-    
-    
-    // это статический метод, т.е метод который можно вызывать обращаясь
-    // классу напрямую, а не через создание экземпляра объекта
+
+
+    // это статический метод, т.е метод который можно вызывать, обращаясь
+    // к классу напрямую, а не через создание экземпляра объекта
     static void multiply(int x, int y)
     {
         writeln(x * y);
@@ -511,13 +531,13 @@ Base.multiply(2, 5); // используем статический метод.
 
 class Derived : Base {
     string c = "Поле класса - наследника";
-    
-    
+
+
     // override означает то, что наследник предоставит свою реализацию метода,
     // переопределив метод базового класса
     override static void multiply(int x, int y)
     {
-        super.multiply(x, y);  // super - это ссылка на класс-предок или базовый класс
+        super.multiply(x, y);  // super - это ссылка на класс-предок, или базовый класс
         writeln(x * y * 2);
     }
 }
@@ -538,7 +558,7 @@ class Derived : FC { // это вызовет ошибку
     float b;
 }
 
-// Абстрактный класс не можен быть истанциирован, но может иметь наследников
+// Абстрактный класс не может быть истанциирован, но может иметь наследников
 abstract class AC {
     int a;
 }
@@ -547,8 +567,8 @@ auto ac = new AC(); // это вызовет ошибку
 
 class Implementation : AC {
     float b;
-    
-     // final перед методом нефинального класса означает запрет возможности 
+
+     // final перед методом нефинального класса означает запрет возможности
      // переопределения метода
     final void test()
     {
@@ -560,7 +580,7 @@ auto impl = new Implementation(); // ОК
 
 
 
-/*** Микшины (mixins) ***/
+/*** Примеси (mixins) ***/
 
 // В D можно вставлять код как строку, если эта строка известна на этапе
 // компиляции. Например:
@@ -583,8 +603,8 @@ void main() {
 /*** Шаблоны ***/
 
 /*
-    Шаблон функции. Эта функция принимает аргументы разеых типов, которые
-    подсталяются вместо T на этапе компиляции. "T" - это не специальный
+    Шаблон функции. Эта функция принимает аргументы разных типов, которые
+    подставляются вместо T на этапе компиляции. "T" - это не специальный
     символ, а просто буква. Вместо "T" может быть любое слово, кроме ключевого.
  */
 void print(T)(T value) {
@@ -633,8 +653,8 @@ class Stack(T)
 
 void main() {
     /*
-        восклицательный знак - признак шаблона В данном случае мы создаем 
-        класс и указывем, что "шаблонное" поле будет иметь тип string
+        восклицательный знак - признак шаблона. В данном случае мы создаем
+        класс и указываем, что "шаблонное" поле будет иметь тип string
     */
    auto stack = new Stack!string;
 
@@ -660,9 +680,7 @@ void main() {
    несколько единообразных функций, определяющих, _как_ мы получаем доступ
    к элементам контейнера, вместо того, чтобы описывать внутреннее устройство
    этого контейнера. Сложно? На самом деле не очень.
-*/
 
-/*
     Простейший вид диапазона - Input Range. Для того, чтобы превратить любой
     контейнер в Input Range, достаточно реализовать для него 3 метода:
     - empty - проверяет, пуст ли контейнер
@@ -706,8 +724,8 @@ struct StudentRange
 
 void main(){
     auto school = School([
-            Student("Mike", 1), 
-            Student("John", 2) , 
+            Student("Mike", 1),
+            Student("John", 2) ,
             Student("Dan", 3)
     ]);
     auto range = StudentRange(school);
@@ -730,6 +748,6 @@ void main(){
 ```
 ## Что дальше?
 
-[Официальный сайт](http://dlang.org/)
-[Онлайн-книга](http://ddili.org/ders/d.en/)
-[Официальная вики](http://wiki.dlang.org/)
+- [Официальный сайт](http://dlang.org/)
+- [Онлайн-книга](http://ddili.org/ders/d.en/)
+- [Официальная вики](http://wiki.dlang.org/)

From 5e6a0269b32bccca6872075dfd2b6be031236874 Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Sat, 12 Dec 2015 14:44:12 +0500
Subject: [PATCH 53/88] Update d-ru.html.markdown

---
 ru-ru/d-ru.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index 0a8726c9..645eceeb 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -1,4 +1,4 @@
-/*---
+---
 language: d
 filename: learnd-ru.d
 contributors:
@@ -11,7 +11,7 @@ D - современный компилируемый язык общего на
 который сочетает удобство, продуманный дизайн и высокую производительность.
 D - это С++, сделанный правильно.
 
-```d */
+```d
 // Welcome to D! Это однострочный комментарий
 
 /* многострочный

From 3663b10bfab490e65f22a345e98d352ef93876e8 Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Sat, 12 Dec 2015 14:46:10 +0500
Subject: [PATCH 54/88] Update d-ru.html.markdown

---
 ru-ru/d-ru.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index 645eceeb..fad5c69b 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -263,7 +263,7 @@ foreach (c; "hello") {
 
 foreach (number; 10..15) {
     writeln(number); // численные интервалы можно указывать явным образом
-                     // этот цикл выведет значения с 10 по 15, но не 15,
+                     // этот цикл выведет значения с 10 по 14, но не 15,
                      // поскольку диапазон не включает в себя верхнюю границу
 }
 

From 7b8929f0cc477fe5db4e189c4ce3d6a7fdbdc3fd Mon Sep 17 00:00:00 2001
From: Anton Pastukhoff <pastuhov85@gmail.com>
Date: Sat, 12 Dec 2015 14:47:02 +0500
Subject: [PATCH 55/88] Update d-ru.html.markdown

---
 ru-ru/d-ru.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru-ru/d-ru.html.markdown b/ru-ru/d-ru.html.markdown
index fad5c69b..8f4233fd 100644
--- a/ru-ru/d-ru.html.markdown
+++ b/ru-ru/d-ru.html.markdown
@@ -713,7 +713,7 @@ struct StudentRange
         return students.length == 0;
     }
 
-    ref Student front() {
+    Student front() {
         return students[0];
     }
 

From fd26c8ddfb6d4bfa969b323a2e98ce1b74bc8127 Mon Sep 17 00:00:00 2001
From: John Rocamora <johnrocamora@gmail.com>
Date: Sat, 12 Dec 2015 17:51:23 -0500
Subject: [PATCH 56/88] Added missing semicolon

---
 c++.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c++.html.markdown b/c++.html.markdown
index 6b452b1b..f4aa2f5a 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -149,7 +149,7 @@ namespace First {
 namespace Second {
     void foo()
     {
-        printf("This is Second::foo\n")
+        printf("This is Second::foo\n");
     }
 }
 

From 16cc4d464e135560c5d9f1495b6d9cd871e7182d Mon Sep 17 00:00:00 2001
From: Mark Green <mark@antelope.nildram.co.uk>
Date: Wed, 16 Dec 2015 16:47:32 +0000
Subject: [PATCH 57/88] Add a Factor tutorial

---
 factor.html | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 factor.html

diff --git a/factor.html b/factor.html
new file mode 100644
index 00000000..a0726420
--- /dev/null
+++ b/factor.html
@@ -0,0 +1,182 @@
+---
+language: factor
+contributors:
+    - ["hyphz", "http://github.com/hyphz/"]
+filename: learnfactor.factor
+---
+
+Factor is a modern stack-based language, based on Forth, created by Slava Pestov.
+
+Code in this file can be typed into Factor, but not directly imported because the vocabulary and import header would make the beginning thoroughly confusing.
+
+```
+! This is a comment
+
+! Like Forth, all programming is done by manipulating the stack.
+! Stating a literal value pushes it onto the stack.
+5 2 3 56 76 23 65    ! No output, but stack is printed out in interactive mode
+
+! Those numbers get added to the stack, from left to right.
+! .s prints out the stack non-destructively.
+.s     ! 5 2 3 56 76 23 65
+
+! Arithmetic works by manipulating data on the stack.
+5 4 +    ! No output
+
+! `.` pops the top result from the stack and prints it.
+.    ! 9 
+
+! More examples of arithmetic:
+6 7 * .        ! 42 
+1360 23 - .    ! 1337 
+12 12 / .      ! 1 
+13 2 mod .     ! 1 
+
+99 neg .       ! -99 
+-99 abs .      ! 99 
+52 23 max .    ! 52 
+52 23 min .    ! 23 
+
+! A number of words are provided to manipulate the stack, collectively known as shuffle words.
+
+3 dup -          ! duplicate the top item (1st now equals 2nd): 3 - 3
+2 5 swap /       ! swap the top with the second element:        5 / 2
+4 0 drop 2 /     ! remove the top item (dont print to screen):  4 / 2
+1 2 3 nip .s     ! remove the second item (similar to drop):    1 3
+1 2 clear .s     ! wipe out the entire stack
+1 2 3 4 over .s  ! duplicate the second item to the top: 1 2 3 4 3 
+1 2 3 4 2 pick .s ! duplicate the third item to the top: 1 2 3 4 2 3
+
+! Creating Words 
+! The `:` word sets Factor into compile mode until it sees the `;` word.
+: square ( n -- n ) dup * ;    ! No output
+5 square .                     ! 25 
+
+! We can view what a word does too.
+! \ suppresses evaluation of a word and pushes its identifier on the stack instead.
+\ square see    ! : square ( n -- n ) dup * ;
+
+! After the name of the word to create, the declaration between brackets gives the stack effect.
+! We can use whatever names we like inside the declaration:
+: weirdsquare ( camel -- llama ) dup * ;
+
+! Provided their count matches the word's stack effect:
+: doubledup ( a -- b ) dup dup ; ! Error: Stack effect declaration is wrong
+: doubledup ( a -- a a a ) dup dup ; ! Ok
+: weirddoubledup ( i -- am a fish ) dup dup ; ! Also Ok
+
+! Where Factor differs from Forth is in the use of quotations.
+! A quotation is a block of code that is pushed on the stack as a value.
+! [ starts quotation mode; ] ends it.
+[ 2 + ]       ! Quotation that adds 2 is left on the stack
+4 swap call . ! 6
+
+! And thus, higher order words. TONS of higher order words.
+2 3 [ 2 + ] dip .s      ! Pop top stack value, run quotation, push it back: 4 3
+3 4 [ + ] keep .s       ! Copy top stack value, run quotation, push the copy: 7 4
+1 [ 2 + ] [ 3 + ] bi .s ! Run each quotation on the top value, push both results: 3 4
+4 3 1 [ + ] [ + ] bi .s ! Quotations in a bi can pull values from deeper on the stack: 4 5 ( 1+3 1+4 )
+1 2 [ 2 + ] bi@ .s      ! Run the quotation on first and second values
+2 [ + ] curry           ! Inject the given value at the start of the quotation: [ 2 + ] is left on the stack
+
+! Conditionals
+! Any value is true except the built-in value f.
+! A built-in value t does exist, but its use isn't essential.
+! Conditionals are higher order words as with the combinators above.
+
+5 [ "Five is true" . ] when                     ! Five is true
+0 [ "Zero is true" . ] when                     ! Zero is true
+f [ "F is true" . ] when                        ! No output
+f [ "F is false" . ] unless                     ! F is false
+2 [ "Two is true" . ] [ "Two is false" . ] if   ! Two is true 
+
+! By default the conditionals consume the value under test, but starred variants 
+! leave it alone if it's true:
+
+5 [ . ] when*      ! 5
+f [ . ] when*      ! No output, empty stack, f is consumed because it's false
+
+
+! Loops
+! You've guessed it.. these are higher order words too.
+
+5 [ . ] each-integer               ! 0 1 2 3 4 
+4 3 2 1 0 5 [ + . ] each-integer   ! 0 2 4 6 8
+5 [ "Hello" . ] times              ! Hello Hello Hello Hello Hello
+
+! Here's a list:
+{ 2 4 6 8 }                        ! Goes on the stack as one item
+
+! Loop through the list:
+{ 2 4 6 8 } [ 1 + . ] each          ! Prints 3 5 7 9
+{ 2 4 6 8 } [ 1 + ] map             ! Leaves { 3 5 7 9 } on stack
+
+! Loop reducing or building lists:
+{ 1 2 3 4 5 } [ 2 mod 0 = ] filter  ! Keeps only list members for which quotation yields true: { 2 4 }  
+{ 2 4 6 8 } 0 [ + ] reduce .        ! Like "fold" in functional languages: prints 20 (0+2+4+6+8)
+{ 2 4 6 8 } 0 [ + ] accumulate . .  ! Like reduce but keeps the intermediate values in a list: prints { 0 2 6 12 } then 20 
+1 5 [ 2 * dup ] replicate .         ! Loops the quotation 5 times and collects the results in a list: { 2 4 8 16 32 }
+1 [ dup 100 < ] [ 2 * dup ] produce ! Loops the second quotation until the first returns false and collects the results: { 2 4 8 16 32 64 128 }
+
+! If all else fails, a general purpose while loop:
+1 [ dup 10 < ] [ "Hello" . 1 + ] while  ! Prints "Hello" 10 times
+                                        ! Yes, it's hard to read
+                                        ! That's what all those variant loops are for
+
+! Variables
+! Usually Factor programs are expected to keep all data on the stack.
+! Using named variables makes refactoring harder (and it's called Factor for a reason)
+! Global variables, if you must:
+
+SYMBOL: name            ! Creates name as an identifying word
+"Bob" name set-global   ! No output
+name get-global .       ! "Bob"                     
+
+! Named local variables are considered an extension but are available
+! In a quotation..
+[| m n                  ! Quotation captures top two stack values into m and n
+ | m n + ]              ! Read them
+
+! Or in a word..
+:: lword ( -- )           ! Note double colon to invoke lexical variable extension
+   2 :> c                 ! Declares immutable variable c to hold 2
+   c . ;                  ! Print it out
+
+! In a word declared this way,  the input side of the stack declaration 
+! becomes meaningful and gives the variable names stack values are captured into
+:: double ( a -- result ) a 2 * ;
+
+! Variables are declared mutable by ending their name with a shriek
+:: mword2 ( a! -- x y )   ! Capture top of stack in mutable variable a
+   a                      ! Push a
+   a 2 * a!               ! Multiply a by 2 and store result back in a
+   a ;                    ! Push new value of a 
+5 mword2                  ! Stack: 5 10
+
+! Lists and Sequences
+! We saw above how to push a list onto the stack
+
+0 { 1 2 3 4 } nth         ! Access a particular member of a list: 1
+10 { 1 2 3 4 } nth        ! Error: sequence index out of bounds
+1 { 1 2 3 4 } ?nth        ! Same as nth if index is in bounds: 2
+10 { 1 2 3 4 } ?nth       ! No error if out of bounds: f
+
+{ "at" "the" "beginning" } "Append" prefix    ! { "Append" "at" "the" "beginning" }
+{ "Append" "at" "the" } "end" suffix          ! { "Append" "at" "the" "end" }
+"in" 1 { "Insert" "the" "middle" } insert-nth ! { "Insert" "in" "the" "middle" }
+"Concat" "enate" append                       ! "Concatenate" - strings are sequences too
+"Concatenate" "Reverse " prepend              ! "Reverse Concatenate"
+{ "Concatenate " "seq " "of " "seqs" } concat ! "Concatenate seq of seqs"
+{ "Connect" "subseqs" "with" "separators" } " " join  ! "Connect subseqs with separators" 
+
+! And if you want to get meta, quotations are sequences and can be dismantled..
+0 [ 2 + ] nth                              ! 2
+1 [ 2 + ] nth                              ! +
+[ 2 + ] \ - suffix                         ! Quotation [ 2 + - ]
+
+
+```
+
+##Ready For More?
+
+* [Factor Documentation](http://docs.factorcode.org/content/article-help.home.html)

From b19714080a8ac76c027851e9b4c80372def81f7b Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Thu, 17 Dec 2015 01:48:19 +0800
Subject: [PATCH 58/88] Fix some typo and non-fluency.

---
 zh-tw/python-tw.html.markdown | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index 472b39ab..f8602769 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -69,11 +69,11 @@ from __future__ import division
 # 指數 (x的y次方)
 2**4 # => 16
 
-# 括號即先乘除後加減
+# 用括號改變運算順序
 (1 + 3) * 2  # => 8
 
 # 布林運算
-# 注意 "and" 和 "or" 的大小寫
+# 注意 "and" 和 "or" 要用小寫
 True and False #=> False
 False or True #=> True
 
@@ -178,7 +178,7 @@ some_var = 5    # 方便好用
 lower_case_with_underscores
 some_var  # => 5
 
-# 存取沒有被賦值的變數會造成例外
+# 對沒有被賦值的變數取值會造成例外
 # 請參考錯誤流程部分做例外處理
 some_other_var  # 造成 NameError
 
@@ -191,15 +191,15 @@ li = []
 # 你可以預先填好串列內容
 other_li = [4, 5, 6]
 
-# 用append()在串列後新增東西 append
+# 用append()在串列後新增東西
 li.append(1)    # 此時 li 內容為 [1]
 li.append(2)    # 此時 li 內容為 [1, 2]
 li.append(4)    # 此時 li 內容為 [1, 2, 4]
 li.append(3)    # 此時 li 內容為 [1, 2, 4, 3]
 # 用pop()移除串列尾端的元素
-li.pop()        # => 3 and li is now [1, 2, 4]
+li.pop()        # => 3 ，此時 li 內容為 [1, 2, 4]
 # 然後再塞回去
-li.append(3)    # li is now [1, 2, 4, 3] again.
+li.append(3)    # 此時 li 內容再次為 [1, 2, 4, 3]
 
 # 你可以像存取陣列一樣的存取串列
 li[0]  # => 1
@@ -272,7 +272,7 @@ d, e, f = 4, 5, 6       # 也可以不寫括號
 # 如果不加括號，預設會產生tuple
 g = 4, 5, 6             # => (4, 5, 6)
 # 你看，交換兩個值很簡單吧
-e, d = d, e     # d is now 5 and e is now 4
+e, d = d, e     # 此時 d 的值為 5 且 e 的值為 4
 
 
 # 字典(Dictionary)用來儲存映射關係
@@ -289,7 +289,7 @@ filled_dict.keys()   # => ["three", "two", "one"]
 # 你的執行結果可能與上面不同
 # 譯註: 只能保證所有的key都有出現，但不保證順序
 
-# 用 "valuess()" 將所有的Value輸出到一個List中
+# 用 "values()" 將所有的Value輸出到一個List中
 filled_dict.values()   # => [3, 2, 1]
 # 註: 同上，不保證順序
 
@@ -457,16 +457,14 @@ add(5, 6)   # => 輸出 "x is 5 and y is 6" 並回傳 11
 add(y=6, x=5)   # 這種狀況下，兩個參數的順序並不影響執行
 
 
-# 你可以定義接受多個變數的函式，這些變數是按照順序排序的
-# 如果不加*的話會被解讀為tuple
+# 你可以定義接受多個變數的函式，用*來表示參數tuple
 def varargs(*args):
     return args
 
 varargs(1, 2, 3)   # => (1, 2, 3)
 
 
-# 你可以定義接受多個變數的函式，這些變數是按照keyword排序的
-# 如果不加**的話會被解讀為dictionary
+# 你可以定義接受多個變數的函式，用**來表示參數dictionary
 def keyword_args(**kwargs):
     return kwargs
 
@@ -555,6 +553,7 @@ class Human(object):
     # 注意前後的雙底線代表物件
     # 還有被python用，但實際上是在使用者控制的命名
     # 空間內的參數。你不應該自己宣告這樣的名稱。
+    # 注意前後的雙底線代表此物件或屬性雖然在使用者控制的命名空間內，但是被python使用
     def __init__(self, name):
         # 將函式引入的參數 name 指定給實體的 name 參數
         self.name = name

From 4b4024b49581d0f80aa3ce815b726bac1af99ef7 Mon Sep 17 00:00:00 2001
From: Hinet60613 <hinet60613@gmail.com>
Date: Thu, 17 Dec 2015 01:51:19 +0800
Subject: [PATCH 59/88] Fix typo

---
 zh-tw/python-tw.html.markdown | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/zh-tw/python-tw.html.markdown b/zh-tw/python-tw.html.markdown
index f8602769..553181d8 100644
--- a/zh-tw/python-tw.html.markdown
+++ b/zh-tw/python-tw.html.markdown
@@ -550,10 +550,8 @@ class Human(object):
     species = "H. sapiens"
 
     # 基礎建構函式，當class被實體化的時候會被呼叫
-    # 注意前後的雙底線代表物件
-    # 還有被python用，但實際上是在使用者控制的命名
-    # 空間內的參數。你不應該自己宣告這樣的名稱。
-    # 注意前後的雙底線代表此物件或屬性雖然在使用者控制的命名空間內，但是被python使用
+    # 注意前後的雙底線
+    # 代表此物件或屬性雖然在使用者控制的命名空間內，但是被python使用
     def __init__(self, name):
         # 將函式引入的參數 name 指定給實體的 name 參數
         self.name = name

From ecf5050e07747f4cc33a57ea11513a7ab3f66285 Mon Sep 17 00:00:00 2001
From: Chris Warrick <kwpolska@gmail.com>
Date: Thu, 17 Dec 2015 16:54:53 +0100
Subject: [PATCH 60/88] Remove incorrect list indentation in perl-pl

---
 pl-pl/perl-pl.html.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pl-pl/perl-pl.html.markdown b/pl-pl/perl-pl.html.markdown
index 9e8ade5b..029ca006 100644
--- a/pl-pl/perl-pl.html.markdown
+++ b/pl-pl/perl-pl.html.markdown
@@ -163,7 +163,7 @@ z repozytorium CPAN do zrealizowania konkretnego zadania.
 
 #### Do doczytania
 
-    - [perl-tutorial](http://perl-tutorial.org/)
-    - [Naucz się Perla na www.perl.com](http://www.perl.org/learn.html)
-    - [perldoc](http://perldoc.perl.org/)
-    - wbudowane w Perla: `perldoc perlintro`
\ No newline at end of file
+ - [perl-tutorial](http://perl-tutorial.org/)
+ - [Naucz się Perla na www.perl.com](http://www.perl.org/learn.html)
+ - [perldoc](http://perldoc.perl.org/)
+ - wbudowane w Perla: `perldoc perlintro`

From 442479a3c87d41fe1abf6ad344bb8733ef924fc8 Mon Sep 17 00:00:00 2001
From: Ondrej Simek <andrew@ondrejsimek.com>
Date: Thu, 17 Dec 2015 21:30:03 +0100
Subject: [PATCH 61/88] [markdown/cz] Fix missing 'lang' in front matter

---
 cs-cz/markdown.html.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cs-cz/markdown.html.markdown b/cs-cz/markdown.html.markdown
index 637f0ab6..4cba38b4 100644
--- a/cs-cz/markdown.html.markdown
+++ b/cs-cz/markdown.html.markdown
@@ -5,6 +5,7 @@ contributors:
 translators:
     - ["Michal Martinek", "https://github.com/MichalMartinek"]
 filename: markdown.md
+lang: cs-cz
 ---
 
 Markdown byl vytvořen Johnem Gruberem v roce 2004. Je zamýšlen jako lehce čitelná

From d0527c0428698c325a55ee046d0897c4e70a6ccc Mon Sep 17 00:00:00 2001
From: Mark Green <mark@antelope.nildram.co.uk>
Date: Fri, 18 Dec 2015 01:17:08 +0000
Subject: [PATCH 62/88] Wolfram Language tutorial

---
 wolfram.md | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 wolfram.md

diff --git a/wolfram.md b/wolfram.md
new file mode 100644
index 00000000..4514006d
--- /dev/null
+++ b/wolfram.md
@@ -0,0 +1,137 @@
+---
+language: wolfram
+contributors:
+    - ["hyphz", "http://github.com/hyphz/"]
+filename: learnwolfram.nb
+---
+
+The Wolfram Language is the underlying language originally used in Mathematica, but now available for use in multiple contexts.
+
+Wolfram Language has several interfaces:
+* The command line kernel interface on Raspberry Pi (just called _The Wolfram Language_) which runs interactively and can't produce graphical input.
+* _Mathematica_ which is a rich text/maths editor with interactive Wolfram built in: pressing shift+Return on a "code cell" creates an output cell with the result, which is not dynamic
+* _Wolfram Workbench_ which is Eclipse interfaced to the Wolfram Language backend
+
+The code in this example can be typed in to any interface and edited with Wolfram Workbench. Loading directly into Mathematica may be awkward because the file contains no cell formatting information (which would make the file a huge mess to read as text) - it can be viewed/edited but may require some setting up.
+
+```
+(* This is a comment *)
+
+(* In Mathematica instead of using these comments you can create a text cell
+   and annotate your code with nicely typeset text and images *)
+
+(* Typing an expression returns the result *)
+2*2              (* 4 *)
+5+8              (* 13 *)
+
+(* Function Call *)
+(* Note, function names (and everything else) are case sensitive *)
+Sin[Pi/2]        (* 1 *)
+
+(* Alternate Syntaxes for Function Call with one parameter *)
+Sin@(Pi/2)       (* 1 *)
+(Pi/2) // Sin    (* 1 *)
+
+(* Every syntax in WL has some equivalent as a function call *)
+Times[2, 2]      (* 4 *)
+Plus[5, 8]       (* 13 *)
+
+(* Using a variable for the first time defines it and makes it global *)
+x = 5            (* 5 *)
+x == 5           (* True, C-style assignment and equality testing *)
+x                (* 5 *)
+x = x + 5        (* 10 *)
+x                (* 10 *)
+Set[x, 20]       (* I wasn't kidding when I said EVERYTHING has a function equivalent *)
+x                (* 20 *)
+
+(* Because WL is based on a computer algebra system, *)
+(* using undefined variables is fine, they just obstruct evaluation *)
+cow + 5          (* 5 + cow, cow is undefined so can't evaluate further *)
+cow + 5 + 10     (* 15 + cow, it'll evaluate what it can *)
+%                (* 15 + cow, % fetches the last return *)
+% - cow          (* 15, undefined variable cow cancelled out *)
+moo = cow + 5    (* Beware, moo now holds an expression, not a number! *)
+
+(* Defining a function *)
+Double[x_] := x * 2    (* Note := to prevent immediate evaluation of the RHS
+                          And _ after x to indicate no pattern matching constraints *)
+Double[10]             (* 20 *)
+Double[Sin[Pi/2]]      (* 2 *)
+Double @ Sin @ (Pi/2)  (* 2, @-syntax avoids queues of close brackets *)
+(Pi/2) // Sin // Double(* 2, //-syntax lists functions in execution order *)
+
+(* For imperative-style programming use ; to separate statements *)
+(* Discards any output from LHS and runs RHS *)
+MyFirst[] := (Print@"Hello"; Print@"World")  (* Note outer parens are critical
+                                                ;'s precedence is lower than := *)
+MyFirst[]                                    (* Hello World *)
+
+(* C-Style For Loop *)
+PrintTo[x_] := For[y=0, y<x, y++, (Print[y])]  (* Start, test, incr, body *)
+PrintTo[5]                                     (* 0 1 2 3 4 *)
+
+(* While Loop *)
+x = 0; While[x < 2, (Print@x; x++)]     (* While loop with test and body *)
+
+(* If and conditionals *)
+x = 8; If[x==8, Print@"Yes", Print@"No"]   (* Condition, true case, else case *)
+Switch[x, 2, Print@"Two", 8, Print@"Yes"]  (* Value match style switch *)
+Which[x==2, Print@"No", x==8, Print@"Yes"] (* Elif style switch *)
+
+(* Variables other than parameters are global by default, even inside functions *)
+y = 10             (* 10, global variable y *)
+PrintTo[5]         (* 0 1 2 3 4 *)
+y                  (* 5, global y clobbered by loop counter inside PrintTo *)
+x = 20             (* 20, global variable x *)
+PrintTo[5]         (* 0 1 2 3 4 *)
+x                  (* 20, x in PrintTo is a parameter and automatically local *)
+
+(* Local variables are declared using the Module metafunction *)
+(* Version with local variable *)
+BetterPrintTo[x_] := Module[{y}, (For[y=0, y<x, y++, (Print@y)])]
+y = 20             (* Global variable y *)
+BetterPrintTo[5]   (* 0 1 2 3 4 *)
+y                  (* 20, that's better *)
+
+(* Module actually lets us declare any scope we like *)
+Module[{count}, count=0;        (* Declare scope of this variable count *)
+  (IncCount[] := ++count);      (* These functions are inside that scope *)
+  (DecCount[] := --count)]
+count              (* count - global variable count is not defined *)
+IncCount[]         (* 1, using the count variable inside the scope *)
+IncCount[]         (* 2, incCount updates it *)
+DecCount[]         (* 1, so does decCount *)
+count              (* count - still no global variable by that name *)
+
+(* Lists *)
+myList = {1, 2, 3, 4}     (* {1, 2, 3, 4} *)
+myList[[1]]               (* 1 - note list indexes start at 1, not 0 *)
+Map[Double, myList]       (* {2, 4, 6, 8} - functional style list map function *)
+Double /@ myList          (* {2, 4, 6, 8} - Abbreviated syntax for above *)
+Scan[Print, myList]       (* 1 2 3 4 - imperative style loop over list *)
+Fold[Plus, 0, myList]     (* 10 (0+1+2+3+4) *)
+FoldList[Plus, 0, myList] (* {0, 1, 3, 6, 10} - fold storing intermediate results *)
+Append[myList, 5]         (* {1, 2, 3, 4, 5} - note myList is not updated *)
+Prepend[myList, 5]        (* {5, 1, 2, 3, 4} - add "myList = " if you want it to be *)
+Join[myList, {3, 4}]      (* {1, 2, 3, 4, 3, 4} *)
+myList[[2]] = 5          (* {1, 5, 3, 4} - this does update myList *)
+
+(* Associations, aka Dictionaries/Hashes *)
+myHash = <|"Green" -> 2, "Red" -> 1|>   (* Create an association *)
+myHash[["Green"]]                       (* 2, use it *)
+myHash[["Green"]] := 5                  (* 5, update it *)
+myHash[["Puce"]] := 3.5                 (* 3.5, extend it *)
+KeyDropFrom[myHash, "Green"]            (* Wipes out key Green *)
+Keys[myHash]                            (* {Red} *)
+Values[myHash]                          (* {1} *)
+
+(* And you can't do any demo of Wolfram without showing this off *)
+Manipulate[y^2, {y, 0, 20}] (* Return a reactive user interface that displays y^2
+                               and allows y to be adjusted between 0-20 with a slider.
+                               Only works on graphical frontends *)
+```
+
+##Ready For More?
+
+* [Wolfram Language Documentation Center](http://reference.wolfram.com/language/)

From dc97e779bce838ea4f1d1e51a20d78b253048406 Mon Sep 17 00:00:00 2001
From: Eric McCormick <edm00se@users.noreply.github.com>
Date: Fri, 18 Dec 2015 09:35:15 -0600
Subject: [PATCH 63/88] replaced &lt; and &gt; in pre block

the pre block was already inside a pre/code block in the rendered page, making it harder to read
---
 coldfusion.html.markdown | 48 +++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/coldfusion.html.markdown b/coldfusion.html.markdown
index d49ad254..482612fe 100644
--- a/coldfusion.html.markdown
+++ b/coldfusion.html.markdown
@@ -233,40 +233,38 @@ ColdFusion started as a tag-based language. Almost all functionality is availabl
 
 <em>Code for reference (Functions must return something to support IE)</em>
 
-<pre>
-&lt;cfcomponent&gt;
-	&lt;cfset this.hello = "Hello" /&gt;
-	&lt;cfset this.world = "world" /&gt;
+<cfcomponent>
+	<cfset this.hello = "Hello" />
+	<cfset this.world = "world" />
 
-	&lt;cffunction name="sayHello"&gt;
-		&lt;cfreturn this.hello & ", " & this.world & "!" /&gt;
-	&lt;/cffunction&gt;
+	<cffunction name="sayHello">
+		<cfreturn this.hello & ", " & this.world & "!" />
+	</cffunction>
 	
-	&lt;cffunction name="setHello"&gt;
-		&lt;cfargument name="newHello" type="string" required="true" /&gt;
+	<cffunction name="setHello">
+		<cfargument name="newHello" type="string" required="true" />
 		
-		&lt;cfset this.hello = arguments.newHello /&gt;
+		<cfset this.hello = arguments.newHello />
 		 
-		&lt;cfreturn true /&gt;
-	&lt;/cffunction&gt;
+		<cfreturn true />
+	</cffunction>
 	
-	&lt;cffunction name="setWorld"&gt;
-		&lt;cfargument name="newWorld" type="string" required="true" /&gt;
+	<cffunction name="setWorld">
+		<cfargument name="newWorld" type="string" required="true" />
 		
-		&lt;cfset this.world = arguments.newWorld /&gt;
+		<cfset this.world = arguments.newWorld />
 		 
-		&lt;cfreturn true /&gt;
-	&lt;/cffunction&gt;
+		<cfreturn true />
+	</cffunction>
 	
-	&lt;cffunction name="getHello"&gt;
-		&lt;cfreturn this.hello /&gt;
-	&lt;/cffunction&gt;
+	<cffunction name="getHello">
+		<cfreturn this.hello />
+	</cffunction>
 	
-	&lt;cffunction name="getWorld"&gt;
-		&lt;cfreturn this.world /&gt;
-	&lt;/cffunction&gt;
-&lt;/cfcomponent&gt;
-</pre>
+	<cffunction name="getWorld">
+		<cfreturn this.world />
+	</cffunction>
+</cfcomponent>
 
 <cfset this.hello = "Hello" />
 <cfset this.world = "world" />

From e7d5e2878841aae872b293127f47e4a4d211475b Mon Sep 17 00:00:00 2001
From: Ale46 <ale467@gmail.com>
Date: Sat, 19 Dec 2015 17:09:57 +0100
Subject: [PATCH 64/88] fix typos/mistakes

---
 it-it/python-it.html.markdown | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/it-it/python-it.html.markdown b/it-it/python-it.html.markdown
index 49bbab08..3a4099e7 100644
--- a/it-it/python-it.html.markdown
+++ b/it-it/python-it.html.markdown
@@ -44,7 +44,7 @@ Python 2.x. Per Python 3.x, dai un'occhiata a [Python 3 tutorial](http://learnxi
 # restituito in automatico il risultato intero.
 5 / 2  # => 2
 
-# Per le divisioni con la virgbola abbiamo bisogno di parlare delle variabili floats.
+# Per le divisioni con la virgola abbiamo bisogno di parlare delle variabili floats.
 2.0     # Questo è un float
 11.0 / 4.0  # => 2.75 ahhh...molto meglio
 
@@ -118,7 +118,7 @@ not False  # => True
 # Un nuovo modo per fomattare le stringhe è il metodo format.
 # Questo metodo è quello consigliato
 "{0} possono essere {1}".format("le stringhe", "formattate")
-# Puoi usare della parole chiave se non vuoi contare
+# Puoi usare delle parole chiave se non vuoi contare
 "{nome} vuole mangiare {cibo}".format(nome="Bob", cibo="lasagna")
 
 # None è un oggetto
@@ -202,7 +202,7 @@ li[::-1]   # => [3, 4, 2, 1]
 del li[2]   # li è ora [1, 2, 3]
 # Puoi sommare le liste
 li + altra_li   # => [1, 2, 3, 4, 5, 6]
-# Nota: i valori per li ed _altri_li non sono modificati.
+# Nota: i valori per li ed altra_li non sono modificati.
 
 # Concatena liste con "extend()"
 li.extend(altra_li)   # Ora li è [1, 2, 3, 4, 5, 6]
@@ -288,7 +288,7 @@ filled_set = {1, 2, 2, 3, 4}   # => {1, 2, 3, 4}
 # Aggiungere elementi ad un set
 filled_set.add(5)   # filled_set è ora {1, 2, 3, 4, 5}
 
-# Fai interazioni su un set con &
+# Fai intersezioni su un set con &
 other_set = {3, 4, 5, 6}
 filled_set & other_set   # => {3, 4, 5}
 
@@ -378,8 +378,8 @@ except IndexError as e:
     pass    # Pass è solo una non-operazione. Solitamente vorrai fare un recupero.
 except (TypeError, NameError):
     pass    # Eccezioni multiple possono essere gestite tutte insieme, se necessario.
-else:   # Optional clause to the try/except block. Must follow all except blocks
-    print "All good!"   # Viene eseguita solo se il codice dentro try non genera eccezioni
+else:   # Clausola opzionale al blocco try/except. Deve seguire tutti i blocchi except
+    print "Tutto ok!"   # Viene eseguita solo se il codice dentro try non genera eccezioni
 finally: #  Eseguito sempre
     print "Possiamo liberare risorse qui"
 
@@ -405,7 +405,7 @@ aggiungi(y=6, x=5)   # Le parole chiave come argomenti possono arrivare in ogni
 
 
 # Puoi definire funzioni che accettano un numero variabile di argomenti posizionali
-# che verranno interpretati come come tuple se non usi il *
+# che verranno interpretati come tuple se non usi il *
 def varargs(*args):
     return args
 
@@ -495,7 +495,7 @@ class Human(object):
     species = "H. sapiens"
 
     # Costruttore base, richiamato quando la classe viene inizializzata.
-    # Si noti che il doppio leading e l'underscore finali denotano oggetti
+    # Si noti che il doppio leading e gli underscore finali denotano oggetti
     # o attributi che sono usati da python ma che vivono nello spazio dei nome controllato
     # dall'utente. Non dovresti usare nomi di questo genere.
     def __init__(self, name):
@@ -575,7 +575,7 @@ dir(math)
 ## 7. Avanzate
 ####################################################
 
-# Generators help you make lazy code
+# I generatori ti aiutano a fare codice pigro
 def double_numbers(iterable):
     for i in iterable:
         yield i + i
@@ -611,7 +611,7 @@ def beg(target_function):
     def wrapper(*args, **kwargs):
         msg, say_please = target_function(*args, **kwargs)
         if say_please:
-            return "{} {}".format(msg, "Please! I am poor :(")
+            return "{} {}".format(msg, "Per favore! Sono povero :(")
         return msg
 
     return wrapper
@@ -619,17 +619,17 @@ def beg(target_function):
 
 @beg
 def say(say_please=False):
-    msg = "Can you buy me a beer?"
+    msg = "Puoi comprarmi una birra?"
     return msg, say_please
 
 
-print say()  # Can you buy me a beer?
-print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
+print say()  # Puoi comprarmi una birra?
+print say(say_please=True)  # Puoi comprarmi una birra? Per favore! Sono povero :(
 ```
 
-## Ready For More?
+## Pronto per qualcosa di più?
 
-### Free Online
+### Gratis Online
 
 * [Automate the Boring Stuff with Python](https://automatetheboringstuff.com)
 * [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
@@ -640,7 +640,7 @@ print say(say_please=True)  # Can you buy me a beer? Please! I am poor :(
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 * [First Steps With Python](https://realpython.com/learn/python-first-steps/)
 
-### Dead Tree
+### Libri cartacei
 
 * [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
 * [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)

From 7560ea819965604099a3ed1dbf4e2fa8919e929b Mon Sep 17 00:00:00 2001
From: George Gognadze <dreamtocode@users.noreply.github.com>
Date: Thu, 24 Dec 2015 23:24:09 +0400
Subject: [PATCH 65/88] typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

some type mistakes.
It is: syntaxtically
It should be: syntactically
It is: iLoveC
Better: ILoveC
It is: passed to ≈the function
It should be: passed to the function
It is: error
It should be: Error
---
 c.html.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/c.html.markdown b/c.html.markdown
index 8226ddef..d92d2ee6 100644
--- a/c.html.markdown
+++ b/c.html.markdown
@@ -239,7 +239,7 @@ int main (int argc, char** argv)
   z = (e > f) ? e : f; // => 10 "if e > f return e, else return f."
 
   // Increment and decrement operators:
-  char *s = "iLoveC";
+  char *s = "ILoveC";
   int j = 0;
   s[j++]; // => "i". Returns the j-th item of s THEN increments value of j.
   j = 0;
@@ -321,7 +321,7 @@ int main (int argc, char** argv)
     break;
   default:
     // if `some_integral_expression` didn't match any of the labels
-    fputs("error!\n", stderr);
+    fputs("Error!\n", stderr);
     exit(-1);
     break;
   }
@@ -497,7 +497,7 @@ int add_two_ints(int x1, int x2)
 
 /*
 Functions are call by value. When a function is called, the arguments passed to
-≈the function are copies of the original arguments (except arrays). Anything you
+the function are copies of the original arguments (except arrays). Anything you
 do to the arguments in the function do not change the value of the original
 argument where the function was called.
 
@@ -726,7 +726,7 @@ Header files are an important part of c as they allow for the connection of c
 source files and can simplify code and definitions by seperating them into
 seperate files.
 
-Header files are syntaxtically similar to c source files but reside in ".h"
+Header files are syntactically similar to c source files but reside in ".h"
 files. They can be included in your c source file by using the precompiler
 command #include "example.h", given that example.h exists in the same directory
 as the c file.

From 5556d6e839796e06179afec99443bf0a63a23afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leo=20B=C3=A4rring?= <leo.barring@gmail.com>
Date: Sat, 26 Dec 2015 20:15:51 +0100
Subject: [PATCH 66/88] changed code output to as stated in comments

The comments state that Foo::Bar::inc in the package variable example should increase $Foo::Bar::n and then print it.
This did not happen, as `say ++$n;` was placed outside the block of the sub Foo::Bar::inc.
The commit puts `say ++$n;` inside the block of Foo::Bar::inc.
---
 perl6.html.markdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/perl6.html.markdown b/perl6.html.markdown
index 1829f964..1457999a 100644
--- a/perl6.html.markdown
+++ b/perl6.html.markdown
@@ -803,9 +803,8 @@ module Foo::Bar {
     my sub unavailable { # `my sub` is the default
       say "Can't access me from outside, I'm my !";
     }
+    say ++$n; # increment the package variable and output its value
   }
-
-  say ++$n; # lexically-scoped variables are still available
 }
 say $Foo::Bar::n; #=> 1
 Foo::Bar::inc; #=> 2

From e31dc8b5a7937d25a681747d05b6227d63849c6d Mon Sep 17 00:00:00 2001
From: Owen Rodda <owen.rodda@gmail.com>
Date: Sun, 27 Dec 2015 16:29:52 -0500
Subject: [PATCH 67/88] Fix #2040

---
 perl6.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl6.html.markdown b/perl6.html.markdown
index 1829f964..323bc0b3 100644
--- a/perl6.html.markdown
+++ b/perl6.html.markdown
@@ -103,7 +103,7 @@ sub say-hello-to(Str $name) { # You can provide the type of an argument
 
 ## It can also have optional arguments:
 sub with-optional($arg?) { # the "?" marks the argument optional
-  say "I might return `(Any)` (Perl's "null"-like value) if I don't have
+  say "I might return `(Any)` (Perl's 'null'-like value) if I don't have
         an argument passed, or I'll return my argument";
   $arg;
 }

From 4a3538d60c156cf82598dfd06d2ae4f7e0c4404f Mon Sep 17 00:00:00 2001
From: Pranit Bauva <pranit.bauva@gmail.com>
Date: Mon, 28 Dec 2015 21:43:09 +0530
Subject: [PATCH 68/88] Add different array declaration syntax

---
 julia.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/julia.html.markdown b/julia.html.markdown
index ef3ea244..2810555e 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -151,12 +151,16 @@ a = Int64[] # => 0-element Int64 Array
 
 # 1-dimensional array literals can be written with comma-separated values.
 b = [4, 5, 6] # => 3-element Int64 Array: [4, 5, 6]
+b = [4; 5; 6] # => 3-element Int64 Array: [4, 5, 6]
 b[1] # => 4
 b[end] # => 6
 
 # 2-dimentional arrays use space-separated values and semicolon-separated rows.
 matrix = [1 2; 3 4] # => 2x2 Int64 Array: [1 2; 3 4]
 
+# Arrays of a particular Type
+b = Int8[4, 5, 6] # => 3-element Int8 Array: [4, 5, 6]
+
 # Add stuff to the end of a list with push! and append!
 push!(a,1)     # => [1]
 push!(a,2)     # => [1,2]

From 00d4fa09de191b9580dd534b8b3e6e7a297fb8d7 Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Tue, 29 Dec 2015 16:59:19 +0800
Subject: [PATCH 69/88] Fetch lsp typo fix from upstream

---
 zh-cn/tmux-cn.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 00bf35f3..64781346 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -39,7 +39,7 @@ lang: zh-cn
     lsp              # 列出窗格
      -a              # 列出所有窗格
      -s              # 列出会话中的所有窗格
-     -t              # List app panes in target
+     -t              # 列出 target 中的所有窗格
 
     kill-window      # 关闭当前窗口
      -t "#"          # 关闭指定的窗口

From bf609a3a0f0ce84faa617bc5c6a51b56f3571f4f Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Tue, 29 Dec 2015 17:14:18 +0800
Subject: [PATCH 70/88] Update tmux home page.

Tmux has moved to github.
---
 tmux.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmux.html.markdown b/tmux.html.markdown
index 868302a8..6763a781 100644
--- a/tmux.html.markdown
+++ b/tmux.html.markdown
@@ -240,7 +240,7 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 
 ### References
 
-[Tmux | Home](http://tmux.sourceforge.net)
+[Tmux | Home](http://tmux.github.io)
 
 [Tmux Manual page](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
 

From 8dd19e58eeaed93f4489ae711ef72e79135d8795 Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Wed, 30 Dec 2015 18:56:24 +0800
Subject: [PATCH 71/88] Fetch tmuxinator from upstream

---
 zh-cn/tmux-cn.html.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 64781346..540bbf23 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -247,3 +247,5 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 [Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux)
 
 [如何在 tmux 状态栏中显示 CPU / 内存占用百分比](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
+
+[管理复杂 tmux 会话的工具 - tmuxinator](https://github.com/tmuxinator/tmuxinator)

From 9b8c680a2e2e1238f4130bc589367baf1a62119e Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Wed, 30 Dec 2015 19:07:19 +0800
Subject: [PATCH 72/88] Update translations.

---
 zh-cn/tmux-cn.html.markdown | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 540bbf23..3b38ca6b 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -39,7 +39,7 @@ lang: zh-cn
     lsp              # 列出窗格
      -a              # 列出所有窗格
      -s              # 列出会话中的所有窗格
-     -t              # 列出 target 中的所有窗格
+     -t "#"          # 列出指定窗口中的所有窗格
 
     kill-window      # 关闭当前窗口
      -t "#"          # 关闭指定的窗口
@@ -56,7 +56,7 @@ lang: zh-cn
 
 ### 快捷键
 
-通过“前缀”快捷键，可以控制一个已经连入的tmux会话。
+通过“前缀”快捷键，可以控制一个已经连入的 tmux 会话。
 
 ```
 ----------------------------------------------------------------------
@@ -66,7 +66,7 @@ lang: zh-cn
 ----------------------------------------------------------------------
 
   ?                  # 列出所有快捷键
-  :                  # 进入tmux的命令提示符
+  :                  # 进入 tmux 的命令提示符
   r                  # 强制重绘当前客户端
   c                  # 创建一个新窗口
 
@@ -127,7 +127,7 @@ set-option -g status-utf8 on
 # 命令回滚/历史数量限制
 set -g history-limit 2048
 
-# Index Start
+# 从 1 开始编号，而不是从 0 开始
 set -g base-index 1
 
 # 启用鼠标
@@ -144,10 +144,10 @@ bind r source-file ~/.tmux.conf
 # 取消默认的前缀键 C-b
 unbind C-b
 
-# 设置新的前缀键
+# 设置新的前缀键 `
 set-option -g prefix `
 
-# 再次按下前缀键时，回到之前的窗口
+# 多次按下前缀键时，切换到上一个窗口
 bind C-a last-window
 bind ` last-window
 
@@ -159,7 +159,7 @@ bind F12 set-option -g prefix `
 setw -g mode-keys vi
 set-option -g status-keys vi
 
-# 使用 vim 风格的按键在窗格间移动
+# 使用 Vim 风格的按键在窗格间移动
 bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
@@ -238,14 +238,14 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 
 ### 参考资料
 
-[Tmux 主页](http://tmux.sourceforge.net)
+[Tmux 主页](http://tmux.github.io)
 
 [Tmux 手册](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
 
 [Gentoo Wiki](http://wiki.gentoo.org/wiki/Tmux)
 
-[Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux)
+[Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux_(简体中文))
 
-[如何在 tmux 状态栏中显示 CPU / 内存占用百分比](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
+[如何在 tmux 状态栏中显示 CPU / 内存占用的百分比](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
 
 [管理复杂 tmux 会话的工具 - tmuxinator](https://github.com/tmuxinator/tmuxinator)

From aed4bbbc36bf28a815d6751cde02b6b025452fb9 Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Wed, 30 Dec 2015 21:38:18 +0800
Subject: [PATCH 73/88] Update Wiki link

---
 zh-cn/tmux-cn.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 3b38ca6b..390fd4fc 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -242,7 +242,7 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 
 [Tmux 手册](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
 
-[Gentoo Wiki](http://wiki.gentoo.org/wiki/Tmux)
+[FreeBSDChina Wiki](https://wiki.freebsdchina.org/software/t/tmux)
 
 [Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux_(简体中文))
 

From 4af768019ced6c179a09180adc2b0fb9adebc1d8 Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Wed, 30 Dec 2015 21:54:44 +0800
Subject: [PATCH 74/88] Add a tmux Chinese tutorial

---
 zh-cn/tmux-cn.html.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 390fd4fc..87afa565 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -246,6 +246,8 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 
 [Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux_(简体中文))
 
+[Tmux 快速教程](http://blog.jeswang.org/blog/2013/06/24/tmux-kuai-su-jiao-cheng)
+
 [如何在 tmux 状态栏中显示 CPU / 内存占用的百分比](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
 
 [管理复杂 tmux 会话的工具 - tmuxinator](https://github.com/tmuxinator/tmuxinator)

From 8fdb648cbc691de5ff8f30c7bb5d0c29385a253c Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Thu, 31 Dec 2015 15:51:09 +0800
Subject: [PATCH 75/88] Update tmux home page, again.

---
 tmux.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmux.html.markdown b/tmux.html.markdown
index 6763a781..c9e3db6b 100644
--- a/tmux.html.markdown
+++ b/tmux.html.markdown
@@ -7,7 +7,7 @@ filename: LearnTmux.txt
 ---
 
 
-[tmux](http://tmux.sourceforge.net)
+[tmux](http://tmux.github.io)
 is a terminal multiplexer: it enables a number of terminals
 to be created, accessed, and controlled from a single screen. tmux
 may be detached from a screen and continue running in the background

From d56ae11e30ff85a0b8b632506abf4ec1bad1d28e Mon Sep 17 00:00:00 2001
From: Arnie97 <arnie97@gmail.com>
Date: Thu, 31 Dec 2015 16:16:02 +0800
Subject: [PATCH 76/88] Finish tmux translations.

---
 zh-cn/tmux-cn.html.markdown | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zh-cn/tmux-cn.html.markdown b/zh-cn/tmux-cn.html.markdown
index 87afa565..cf865dce 100644
--- a/zh-cn/tmux-cn.html.markdown
+++ b/zh-cn/tmux-cn.html.markdown
@@ -10,9 +10,9 @@ lang: zh-cn
 ---
 
 
-[tmux](http://tmux.sourceforge.net)是一款终端复用工具。
+[tmux](http://tmux.github.io)是一款终端复用工具。
 在它的帮助下，你可以在同一个控制台上建立、访问并控制多个终端。
-你可以断开与一个tmux终端的连接，此时程序将在后台运行，
+你可以断开与一个 tmux 终端的连接，此时程序将在后台运行，
 当你需要时，可以随时重新连接到这个终端。
 
 ```
@@ -70,7 +70,7 @@ lang: zh-cn
   r                  # 强制重绘当前客户端
   c                  # 创建一个新窗口
 
-  !                  # Break the current pane out of the window.
+  !                  # 将当前窗格从窗口中移出，成为为一个新的窗口
   %                  # 将当前窗格分为左右两半
   "                  # 将当前窗格分为上下两半
 
@@ -93,11 +93,11 @@ lang: zh-cn
   Left, Right
 
   M-1 到 M-5         # 排列窗格：
-                       # 1) even-horizontal
-                       # 2) even-vertical
-                       # 3) main-horizontal
-                       # 4) main-vertical
-                       # 5) tiled
+                       # 1) 水平等分
+                       # 2) 垂直等分
+                       # 3) 将一个窗格作为主要窗格，其他窗格水平等分
+                       # 4) 将一个窗格作为主要窗格，其他窗格垂直等分
+                       # 5) 平铺
 
   C-Up, C-Down       # 改变当前窗格的大小，每按一次增减一个单位
   C-Left, C-Right

From 15bd3ff223b998aad3ed2d5fc6a530adc31cb56c Mon Sep 17 00:00:00 2001
From: hyphz <mark@antelope.nildram.co.uk>
Date: Fri, 1 Jan 2016 01:54:11 +0000
Subject: [PATCH 77/88] Rename wolfram.md to wolfram.html.markdown

---
 wolfram.md => wolfram.html.markdown | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename wolfram.md => wolfram.html.markdown (100%)

diff --git a/wolfram.md b/wolfram.html.markdown
similarity index 100%
rename from wolfram.md
rename to wolfram.html.markdown

From 01ab402100a08e30d6f88406a55b08b744fcb375 Mon Sep 17 00:00:00 2001
From: hyphz <mark@antelope.nildram.co.uk>
Date: Fri, 1 Jan 2016 01:54:45 +0000
Subject: [PATCH 78/88] Rename factor.html to factor.html.markdown

---
 factor.html => factor.html.markdown | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename factor.html => factor.html.markdown (100%)

diff --git a/factor.html b/factor.html.markdown
similarity index 100%
rename from factor.html
rename to factor.html.markdown

From 1f0b1bfb7a8d7abe3563015bad0110d6c319208f Mon Sep 17 00:00:00 2001
From: Borislav Kosharov <bosakmaw@gmail.com>
Date: Sat, 2 Jan 2016 18:43:19 +0200
Subject: [PATCH 79/88] fix parallelism example typo

---
 d.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/d.html.markdown b/d.html.markdown
index 6f88cf84..edb3bff5 100644
--- a/d.html.markdown
+++ b/d.html.markdown
@@ -254,7 +254,7 @@ void main() {
     // Use an index, access every array element by reference (because we're
     // going to change each element) and just call parallel on the array!
     foreach(i, ref elem; parallel(arr)) {
-        ref = sqrt(i + 1.0);
+        elem = sqrt(i + 1.0);
     }
 }
 ```

From bde8645cc7bb7f0a88b5d106cd0bd0b7e40886d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Migda=C5=82?= <pmigdal@gmail.com>
Date: Sun, 3 Jan 2016 19:45:54 +0100
Subject: [PATCH 80/88] pep8 fixes (spaces and multiline statements)

in Python readability and code style matters
---
 pythonstatcomp.html.markdown | 99 ++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 44 deletions(-)

diff --git a/pythonstatcomp.html.markdown b/pythonstatcomp.html.markdown
index 78b62e33..f8d83b98 100644
--- a/pythonstatcomp.html.markdown
+++ b/pythonstatcomp.html.markdown
@@ -9,6 +9,8 @@ This is a tutorial on how to do some typical statistical programming tasks using
 
 ```python
 
+
+
 # 0. Getting set up ====
 
 """ Get set up with IPython and pip install the following: numpy, scipy, pandas,
@@ -25,17 +27,17 @@ This is a tutorial on how to do some typical statistical programming tasks using
     already using Python, there's a benefit to sticking with one language.
 """
 
-import requests # for HTTP requests (web scraping, APIs)
+import requests  # for HTTP requests (web scraping, APIs)
 import os
 
 # web scraping
 r = requests.get("https://github.com/adambard/learnxinyminutes-docs")
-r.status_code # if 200, request was successful
-r.text # raw page source
-print(r.text) # prettily formatted
+r.status_code  # if 200, request was successful
+r.text  # raw page source
+print(r.text)  # prettily formatted
 # save the page source in a file:
-os.getcwd() # check what's the working directory
-f = open("learnxinyminutes.html","wb")
+os.getcwd()  # check what's the working directory
+f = open("learnxinyminutes.html", "wb")
 f.write(r.text.encode("UTF-8"))
 f.close()
 
@@ -44,7 +46,7 @@ fp = "https://raw.githubusercontent.com/adambard/learnxinyminutes-docs/master/"
 fn = "pets.csv"
 r = requests.get(fp + fn)
 print(r.text)
-f = open(fn,"wb")
+f = open(fn, "wb")
 f.write(r.text.encode("UTF-8"))
 f.close()
 
@@ -58,7 +60,9 @@ f.close()
     you've used R, you will be familiar with the idea of the "data.frame" already.
 """
 
-import pandas as pd, numpy as np, scipy as sp
+import pandas as pd
+import numpy as np
+import scipy as sp
 pets = pd.read_csv(fn)
 pets
 #        name  age  weight species
@@ -74,20 +78,20 @@ pets
 pets.age
 pets["age"]
 
-pets.head(2) # prints first 2 rows
-pets.tail(1) # prints last row
+pets.head(2)  # prints first 2 rows
+pets.tail(1)  # prints last row
 
-pets.name[1] # 'vesuvius'
-pets.species[0] # 'cat'
-pets["weight"][2] # 34
+pets.name[1]  # 'vesuvius'
+pets.species[0]  # 'cat'
+pets["weight"][2]  # 34
 
 # in R, you would expect to get 3 rows doing this, but here you get 2:
 pets.age[0:2]
 # 0    3
 # 1    6
 
-sum(pets.age)*2 # 28
-max(pets.weight) - min(pets.weight) # 20
+sum(pets.age) * 2  # 28
+max(pets.weight) - min(pets.weight)  # 20
 
 """ If you are doing some serious linear algebra and number-crunching, you may
     just want arrays, not DataFrames. DataFrames are ideal for combining columns
@@ -96,7 +100,8 @@ max(pets.weight) - min(pets.weight) # 20
 
 # 3. Charts ====
 
-import matplotlib as mpl, matplotlib.pyplot as plt
+import matplotlib as mpl
+import matplotlib.pyplot as plt
 %matplotlib inline
 
 # To do data vizualization in Python, use matplotlib
@@ -105,13 +110,17 @@ plt.hist(pets.age);
 
 plt.boxplot(pets.weight);
 
-plt.scatter(pets.age, pets.weight); plt.xlabel("age"); plt.ylabel("weight");
+plt.scatter(pets.age, pets.weight)
+plt.xlabel("age")
+plt.ylabel("weight");
 
 # seaborn sits atop matplotlib and makes plots prettier
 
 import seaborn as sns
 
-plt.scatter(pets.age, pets.weight); plt.xlabel("age"); plt.ylabel("weight");
+plt.scatter(pets.age, pets.weight)
+plt.xlabel("age")
+plt.ylabel("weight");
 
 # there are also some seaborn-specific plotting functions
 # notice how seaborn automatically labels the x-axis on this barplot
@@ -141,7 +150,7 @@ ggplot(aes(x="age",y="weight"), data=pets) + geom_point() + labs(title="pets")
 url = "https://raw.githubusercontent.com/e99n09/R-notes/master/data/hre.csv"
 r = requests.get(url)
 fp = "hre.csv"
-f = open(fp,"wb")
+f = open(fp, "wb")
 f.write(r.text.encode("UTF-8"))
 f.close()
 
@@ -149,33 +158,33 @@ hre = pd.read_csv(fp)
 
 hre.head()
 """
-   Ix      Dynasty        Name        Birth             Death Election 1  
-0 NaN  Carolingian   Charles I  2 April 742    28 January 814        NaN   
-1 NaN  Carolingian     Louis I          778       20 June 840        NaN   
-2 NaN  Carolingian   Lothair I          795  29 September 855        NaN   
-3 NaN  Carolingian    Louis II          825     12 August 875        NaN   
-4 NaN  Carolingian  Charles II  13 June 823     6 October 877        NaN   
+   Ix      Dynasty        Name        Birth             Death Election 1
+0 NaN  Carolingian   Charles I  2 April 742    28 January 814        NaN
+1 NaN  Carolingian     Louis I          778       20 June 840        NaN
+2 NaN  Carolingian   Lothair I          795  29 September 855        NaN
+3 NaN  Carolingian    Louis II          825     12 August 875        NaN
+4 NaN  Carolingian  Charles II  13 June 823     6 October 877        NaN
 
-  Election 2      Coronation 1   Coronation 2 Ceased to be Emperor  
-0        NaN   25 December 800            NaN       28 January 814   
-1        NaN  11 September 813  5 October 816          20 June 840   
-2        NaN       5 April 823            NaN     29 September 855   
-3        NaN        Easter 850     18 May 872        12 August 875   
-4        NaN   29 December 875            NaN        6 October 877   
+  Election 2      Coronation 1   Coronation 2 Ceased to be Emperor
+0        NaN   25 December 800            NaN       28 January 814
+1        NaN  11 September 813  5 October 816          20 June 840
+2        NaN       5 April 823            NaN     29 September 855
+3        NaN        Easter 850     18 May 872        12 August 875
+4        NaN   29 December 875            NaN        6 October 877
 
-  Descent from whom 1 Descent how 1 Descent from whom 2 Descent how 2  
-0                 NaN           NaN                 NaN           NaN  
-1           Charles I           son                 NaN           NaN  
-2             Louis I           son                 NaN           NaN  
-3           Lothair I           son                 NaN           NaN  
-4             Louis I           son                 NaN           NaN  
+  Descent from whom 1 Descent how 1 Descent from whom 2 Descent how 2
+0                 NaN           NaN                 NaN           NaN
+1           Charles I           son                 NaN           NaN
+2             Louis I           son                 NaN           NaN
+3           Lothair I           son                 NaN           NaN
+4             Louis I           son                 NaN           NaN
 """
 
 # clean the Birth and Death columns
 
-import re # module for regular expressions
+import re  # module for regular expressions
 
-rx = re.compile(r'\d+$') # match trailing digits
+rx = re.compile(r'\d+$')  # match trailing digits
 
 """ This function applies the regular expression to an input column (here Birth,
     Death), flattens the resulting list, converts it to a Series object, and
@@ -185,8 +194,9 @@ rx = re.compile(r'\d+$') # match trailing digits
       - http://stackoverflow.com/questions/11860476/how-to-unlist-a-python-list
       - http://pandas.pydata.org/pandas-docs/stable/generated/pandas.Series.html
 """
+
 def extractYear(v):
-    return(pd.Series(reduce(lambda x,y: x+y,map(rx.findall,v),[])).astype(int))
+    return(pd.Series(reduce(lambda x, y: x + y, map(rx.findall, v), [])).astype(int))
 
 hre["BirthY"] = extractYear(hre.Birth)
 hre["DeathY"] = extractYear(hre.Death)
@@ -199,17 +209,17 @@ sns.lmplot("BirthY", "EstAge", data=hre, hue="Dynasty", fit_reg=False);
 
 # use scipy to run a linear regression
 from scipy import stats
-(slope,intercept,rval,pval,stderr)=stats.linregress(hre.BirthY,hre.EstAge)
+(slope, intercept, rval, pval, stderr) = stats.linregress(hre.BirthY, hre.EstAge)
 # code source: http://wiki.scipy.org/Cookbook/LinearRegression
 
 # check the slope
-slope # 0.0057672618839073328
+slope  # 0.0057672618839073328
 
 # check the R^2 value:
-rval**2 # 0.020363950027333586
+rval**2  # 0.020363950027333586
 
 # check the p-value
-pval # 0.34971812581498452
+pval  # 0.34971812581498452
 
 # use seaborn to make a scatterplot and plot the linear regression trend line
 sns.lmplot("BirthY", "EstAge", data=hre);
@@ -223,6 +233,7 @@ sns.lmplot("BirthY", "EstAge", data=hre);
     To see a version of the Holy Roman Emperors analysis using R, see
       - http://github.com/e99n09/R-notes/blob/master/holy_roman_emperors_dates.R
 """
+
 ```
 
 If you want to learn more, get _Python for Data Analysis_ by Wes McKinney. It's a superb resource and I used it as a reference when writing this tutorial.

From 746df3268afcd0307c0da434bf162632be3d53ea Mon Sep 17 00:00:00 2001
From: Bruno Volcov <volcov.bruno@gmail.com>
Date: Mon, 4 Jan 2016 17:28:36 -0200
Subject: [PATCH 81/88] remove contributors name

---
 ruby.html.markdown | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruby.html.markdown b/ruby.html.markdown
index b3ef2a4d..267889b1 100644
--- a/ruby.html.markdown
+++ b/ruby.html.markdown
@@ -13,7 +13,6 @@ contributors:
   - ["Levi Bostian", "https://github.com/levibostian"]
   - ["Rahil Momin", "https://github.com/iamrahil"]
   - ["Gabriel Halley", https://github.com/ghalley]
-  - ["Bruno Volcov", https://github.com/volcov]
 
 ---
 

From a5730e4ab931b8355704d35ee08acef75435bd83 Mon Sep 17 00:00:00 2001
From: bk2dcradle <ankitsultana@gmail.com>
Date: Tue, 5 Jan 2016 13:25:56 +0530
Subject: [PATCH 82/88] Update

---
 c++.html.markdown | 48 +++++++----------------------------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/c++.html.markdown b/c++.html.markdown
index 6033ca06..c1bacf6a 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -809,7 +809,7 @@ void doSomethingWithAFile(const std::string& filename)
 // object right at the location where it is invoked or passed as 
 // an argument to a function.
 
-// Example consider sorting a vector of pairs using the second 
+// For example, consider sorting a vector of pairs using the second 
 // value of the pair
 
 vector<pair<int, int> > tester;
@@ -820,7 +820,7 @@ tester.push_back(make_pair(5, 0));
 // Pass a lambda expression as third argument to the sort function
 // sort is from the <algorithm> header
 
-sort(tester.begin(), tester.end(), [](const pair<int, int> &lhs, const pair<int, int> &rhs) {
+sort(tester.begin(), tester.end(), [](const pair<int, int>& lhs, const pair<int, int>& rhs) {
 		return lhs.second < rhs.second;
 	});
 
@@ -834,48 +834,22 @@ for(int i = 0; i < 3; i++){
 	dog_ids.push_back(i);  
 }
 
-int weight[3];
-weight[0] = 30, weight[1] = 50, weight[2] = 10;
+int weight[3] = {30, 50, 10};
 
 // Say you want to sort dog_ids according to the dogs' weights
 // So dog_ids should in the end become: [2, 0, 1]
 
 // Here's where lambda expressions come in handy
 
-sort(dog_ids.begin(), dog_ids.end(), [weight](const int &lhs, const int &rhs) {
+sort(dog_ids.begin(), dog_ids.end(), [&weight](const int &lhs, const int &rhs) {
 		return weight[lhs] < weight[rhs];
 	});
-// Note we captured "weight" in the above example.
+// Note we captured "weight" by reference in the above example.
 
 // lambda are really useful for the case of structs
 // You can use lambda expressions instead of overloading
 // the "<" operator
 
-struct dog{
-	int weight, age;
-}dogs[3];
-
-dogs[0].weight = 30, dogs[0].age = 4;
-dogs[1].weight = 40, dogs[1].age = 10;
-dogs[2].weight = 20, dogs[2].age = 9;
-
-// Say I want to sort the dogs array by the dogs' weights
-
-sort(dogs, dogs+3, [](const dog &lhs, const dog &rhs) {
-		return lhs.weight < rhs.weight;
-	});
-// dogs is now sorted according to their weight
-
-// Do something with the dogs
-
-// Now I want to sort the dogs by in descending order of their age
-
-sort(dogs, dogs+3, [](const dog &lhs, const dog &rhs) {
-		return lhs.age > rhs.age;
-	});
-// dogs is now sorted in descending order of their age
-
-
 ///////////////////////////////
 // Range For (C++11 and above)
 ///////////////////////////////
@@ -884,24 +858,16 @@ sort(dogs, dogs+3, [](const dog &lhs, const dog &rhs) {
 int arr[] = {1, 10, 3};
 
 for(int elem: arr){
-	cout<<elem<<'\n';  
+	cout << elem << endl;
 }
 
 // You can use "auto" and not worry about the type of the elements of the container
-// Caveat: Don't assign inside the range for loop
 // For example:
 
 for(auto elem: arr) {
-	elem = -1;  
+	// Do something with each element of arr
 }
 
-// "arr" remains unchanged
-
-// Why doesn't it change?
-// What actually is happening is that the value of "arr[i]" is stored in 
-// the variable "elem" in every iteration. So assigning "elem" doesn't assign "arr[i]".
-// For more, checkout: http://en.cppreference.com/w/cpp/language/range-for
-
 /////////////////////
 // Fun stuff
 /////////////////////

From 19ead59c1fde3623bc29e1fe56f33f2587c97d3a Mon Sep 17 00:00:00 2001
From: bk2dcradle <ankitsultana@gmail.com>
Date: Tue, 5 Jan 2016 13:36:23 +0530
Subject: [PATCH 83/88] Add my Changes

---
 c++.html.markdown | 67 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/c++.html.markdown b/c++.html.markdown
index f4aa2f5a..31dbe064 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -820,6 +820,73 @@ std::map<Foo, int, compareFunction> fooMap;
 fooMap[Foo(1)]  = 1;
 fooMap.find(Foo(1)); //true
 
+///////////////////////////////////////
+// Lambda Expressions (C++11 and above)
+///////////////////////////////////////
+
+// lambdas are a convenient way of defining an anonymous function
+// object right at the location where it is invoked or passed as 
+// an argument to a function.
+
+// For example, consider sorting a vector of pairs using the second 
+// value of the pair
+
+vector<pair<int, int> > tester;
+tester.push_back(make_pair(3, 6));
+tester.push_back(make_pair(1, 9));
+tester.push_back(make_pair(5, 0));
+
+// Pass a lambda expression as third argument to the sort function
+// sort is from the <algorithm> header
+
+sort(tester.begin(), tester.end(), [](const pair<int, int>& lhs, const pair<int, int>& rhs) {
+		return lhs.second < rhs.second;
+	});
+
+// Notice the syntax of the lambda expression,
+// [] in the lambda is used to "capture" variables.
+// For Example:
+
+vector<int> dog_ids;
+// number_of_dogs = 3;
+for(int i = 0; i < 3; i++){
+	dog_ids.push_back(i);  
+}
+
+int weight[3] = {30, 50, 10};
+
+// Say you want to sort dog_ids according to the dogs' weights
+// So dog_ids should in the end become: [2, 0, 1]
+
+// Here's where lambda expressions come in handy
+
+sort(dog_ids.begin(), dog_ids.end(), [&weight](const int &lhs, const int &rhs) {
+		return weight[lhs] < weight[rhs];
+	});
+// Note we captured "weight" by reference in the above example.
+
+// lambda are really useful for the case of structs
+// You can use lambda expressions instead of overloading
+// the "<" operator
+
+///////////////////////////////
+// Range For (C++11 and above)
+///////////////////////////////
+
+// You can use a range for loop to iterate over a container
+int arr[] = {1, 10, 3};
+
+for(int elem: arr){
+	cout << elem << endl;
+}
+
+// You can use "auto" and not worry about the type of the elements of the container
+// For example:
+
+for(auto elem: arr) {
+	// Do something with each element of arr
+}
+
 /////////////////////
 // Fun stuff
 /////////////////////

From 0fbf289e3cbce3f2b6e830d5dcf1c8d3685a88a1 Mon Sep 17 00:00:00 2001
From: Adam Bard <github@adambard.com>
Date: Wed, 6 Jan 2016 03:14:04 +0800
Subject: [PATCH 84/88] Update go-fr.html.markdown

---
 fr-fr/go-fr.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr-fr/go-fr.html.markdown b/fr-fr/go-fr.html.markdown
index 16558e7e..9d8bef70 100644
--- a/fr-fr/go-fr.html.markdown
+++ b/fr-fr/go-fr.html.markdown
@@ -3,7 +3,7 @@ name: Go
 category: language
 language: Go
 lang: fr-fr
-filename: learngo.go
+filename: learngo-fr.go
 contributors:
     - ["Sonia Keys", "https://github.com/soniakeys"]
     - ["Christopher Bess", "https://github.com/cbess"]

From e47099866bee5e5f6d2852f4e4cbf92e4d4b0053 Mon Sep 17 00:00:00 2001
From: Adam Bard <github@adambard.com>
Date: Wed, 6 Jan 2016 03:17:33 +0800
Subject: [PATCH 85/88] Fix formatting.

---
 powershell.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/powershell.html.markdown b/powershell.html.markdown
index 4bc1ab39..8920d254 100644
--- a/powershell.html.markdown
+++ b/powershell.html.markdown
@@ -18,6 +18,7 @@ rather than plain text.
 [Read more here.](https://technet.microsoft.com/en-us/library/bb978526.aspx)
 
 If you are uncertain about your environment:
+
 ```
 Get-ExecutionPolicy -List
 Set-ExecutionPolicy AllSigned
@@ -33,6 +34,7 @@ $PSVersionTable
 ```
 
 Getting help:
+
 ```
 # Find commands
 Get-Command about_* # alias: gcm
@@ -49,6 +51,7 @@ Update-Help # Run as admin
 ```
 
 The tutorial starts here:
+
 ```
 # As you already figured, comments start with #
 
@@ -292,6 +295,7 @@ $Shortcut.Save()
 
 
 Configuring your shell
+
 ```
 # $Profile is the full path for your `Microsoft.PowerShell_profile.ps1`
 # All code there will be executed when the PS session starts

From 1d65107a8fd74e67b2b9fe7e2e503a04d0db4df0 Mon Sep 17 00:00:00 2001
From: Adam Bard <github@adambard.com>
Date: Wed, 6 Jan 2016 04:13:33 +0800
Subject: [PATCH 86/88] Update latex-es.html.markdown

---
 es-es/latex-es.html.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/es-es/latex-es.html.markdown b/es-es/latex-es.html.markdown
index 6743ad80..aff3c603 100644
--- a/es-es/latex-es.html.markdown
+++ b/es-es/latex-es.html.markdown
@@ -1,5 +1,6 @@
 ---
 language: latex
+lang: es-es
 contributors:
     - ["Chaitanya Krishna Ande", "http://icymist.github.io"]
     - ["Colton Kohnke", "http://github.com/voltnor"]

From e6866f5a26dab28d2d1b5628fbb18139c36a5139 Mon Sep 17 00:00:00 2001
From: bk2dcradle <ankitsultana@gmail.com>
Date: Fri, 8 Jan 2016 01:21:38 +0530
Subject: [PATCH 87/88] More Fixes

---
 c++.html.markdown | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/c++.html.markdown b/c++.html.markdown
index 31dbe064..44cad665 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -840,16 +840,22 @@ tester.push_back(make_pair(5, 0));
 // sort is from the <algorithm> header
 
 sort(tester.begin(), tester.end(), [](const pair<int, int>& lhs, const pair<int, int>& rhs) {
-		return lhs.second < rhs.second;
-	});
+        return lhs.second < rhs.second;
+    });
 
 // Notice the syntax of the lambda expression,
-// [] in the lambda is used to "capture" variables.
-// For Example:
+// [] in the lambda is used to "capture" variables
+// The "Capture List" defines what from the outside of the lambda should be available inside the function body and how.
+// It can be either:
+//     1. a value : [x]
+//     2. a reference : [&x]
+//     3. any variable currently in scope by reference [&]
+//     4. same as 3, but by value [=]
+// Example:
 
 vector<int> dog_ids;
 // number_of_dogs = 3;
-for(int i = 0; i < 3; i++){
+for(int i = 0; i < 3; i++) {
 	dog_ids.push_back(i);  
 }
 
@@ -861,13 +867,10 @@ int weight[3] = {30, 50, 10};
 // Here's where lambda expressions come in handy
 
 sort(dog_ids.begin(), dog_ids.end(), [&weight](const int &lhs, const int &rhs) {
-		return weight[lhs] < weight[rhs];
-	});
+        return weight[lhs] < weight[rhs];
+    });
 // Note we captured "weight" by reference in the above example.
-
-// lambda are really useful for the case of structs
-// You can use lambda expressions instead of overloading
-// the "<" operator
+// More on Lambdas in C++ : http://stackoverflow.com/questions/7627098/what-is-a-lambda-expression-in-c11
 
 ///////////////////////////////
 // Range For (C++11 and above)

From cc31c2f0c5032b723a1d57c971580121be07bf7f Mon Sep 17 00:00:00 2001
From: Jacob Ward <jacobward1898@gmail.com>
Date: Thu, 7 Jan 2016 22:08:17 -0700
Subject: [PATCH 88/88] Fix typo referenced in Issue #2075

---
 perl6.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl6.html.markdown b/perl6.html.markdown
index 6633b322..5082a433 100644
--- a/perl6.html.markdown
+++ b/perl6.html.markdown
@@ -1329,7 +1329,7 @@ so 'ayc' ~~ / a [ b | y ] c /; # `True`. Obviously enough ...
 
 
 
-### Extra: the MAIN subroutime
+### Extra: the MAIN subroutine
 # The `MAIN` subroutine is called when you run a Perl 6 file directly.
 # It's very powerful, because Perl 6 actually parses the arguments
 #  and pass them as such to the sub. It also handles named argument (`--foo`)