Merge b98bc6f95a into 00e817db85

Update javascript-es.html.markdown

angularjs.html.markdown

@@ -3,7 +3,7 @@ category: framework
 framework: AngularJS
 contributors:
     - ["Walter Cordero", "http://waltercordero.com"]
-filename: learnangular.html
+filename: learnangular.txt
 ---
 
 ## AngularJS Tutorial.

ar-ar/html-ar.html.markdown

@@ -1,7 +1,7 @@
 ---
 language: HTML
 lang: ar-ar
-filename: learnhtml-tf.html
+filename: learnhtml-tf.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

ca-es/html-ca.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: html-ca.md
+filename: html-ca.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

cs-cz/bf.html.markdown

@@ -14,7 +14,7 @@ Turingovsky kompletní (ekvivalentní) programovací jazyk a má pouze 8 příka
 
 Můžete si ho vyzkoušet přímo v prohlížeči s [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/).
 
-```
+```bf
 Jakýkoliv znak mimo "><+-.,[]" (bez uvozovek) je ignorován.
 
 Brainfuck je reprezentován jako pole, které má 30.000 buněk s počátkem v nule 

de-de/bf-de.html.markdown

@@ -16,7 +16,7 @@ mit lediglich 8 Befehlen.
 Mit dem [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/) kann
 Brainfuck im Browser ausprobiert werden.
 
-```
+```bf
 Alle Zeichen außer "><+-.,[]" (ohne die Klammern) werden ignoriert.
 
 Brainfuck besteht aus einem Array mit unendlich vielen Elementen, die alle mit Null initialisiert

de-de/git-de.html.markdown

@@ -26,7 +26,7 @@ Eine Versionsverwaltung erfasst die Änderungen einer Datei oder eines Verzeichn
 * Verteilte Versionsverwaltung konzentriert sich auf das Teilen der Änderungen. Jede Änderung hat eine eindeutige ID.
 * Verteilte Systeme haben keine vorbestimmte Struktur. Ein SVN-ähnliches, zentrales System wäre mit Git ebenso umsetzbar.
 
-[Weiterführende Informationen](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Weiterführende Informationen](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Warum Git?
 
@@ -50,7 +50,7 @@ Ein Repository besteht in Git aus dem .git-Verzeichnis und dem Arbeitsverzeichni
 ### .git-Verzeichnis (Teil des Repositorys)
 
 Das .git-Verzeichnis enthält alle Einstellungen, Logs, Branches, den HEAD und mehr.
-[Ausführliche Übersicht](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Ausführliche Übersicht](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Arbeitsverzeichnis (Teil des Repositorys)
 
@@ -74,12 +74,6 @@ HEAD ist ein Pointer auf den aktuellen Branch. Ein Repository hat nur einen *akt
 
 Ein *head* ist ein Pointer, der auf einen beliebigen Commit zeigt.  Ein Repository kann eine beliebige Zahl von *heads* enthalten.
 
-### Konzeptionelle Hintergründe
-
-* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## Befehle
 
 
@@ -104,7 +98,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
 $ git config --global user.name "My Name"
 ```
 
-[Mehr über git config](http://git-scm.com/docs/git-config)
+[Mehr über git config](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -255,7 +249,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Google ist dein Freund; für mehr Beispiele:
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -338,7 +332,7 @@ Nimm alle Änderungen, die in einem Branch durch Commits vorgenommen wurden, und
 $ git rebase master experimentBranch
 ```
 
-[Weiterführende Informationen](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Weiterführende Informationen](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (mit Vorsicht einsetzen)
 
@@ -375,14 +369,12 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## Weiterführende Informationen
 
-* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)
+* [git-scm - Video Tutorials](https://git-scm.com/videos)
 
-* [git-scm - Video Tutorials](http://git-scm.com/videos)
+* [git-scm - Documentation](https://git-scm.com/docs)
-
-* [git-scm - Documentation](http://git-scm.com/docs)
 
 * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [gitflow - Ein Modell um mit Branches zu arbeiten](https://nvie.com/posts/a-successful-git-branching-model/)
 
-* [gitflow - Ein Modell um mit Branches zu arbeiten](http://nvie.com/posts/a-successful-git-branching-model/)
+* [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

de-de/hq9+-de.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HQ9+
-filename: hq9+-de.html
+filename: hq9+-de.txt
 contributors:
     - ["Alexey Nazaroff", "https://github.com/rogaven"]
 translators:

de-de/html-de.html.markdown

@@ -4,7 +4,7 @@ contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:
     - ["Dennis Keller", "https://github.com/denniskeller"]
-filename: learnhtml-de.html
+filename: learnhtml-de.txt
 lang: de-de
 ---
 

de-de/processing-de.html.markdown

@@ -6,7 +6,6 @@ contributors:
     - ["Divay Prakash", "https://github.com/divayprakash"]
 translators:
   - ["caminsha", "https://github.com/caminsha"]
-filename: processing-de.md
 lang: de-de
 ---
 

de-de/shutit-de.html.markdown

@@ -1,6 +1,6 @@
 ---
 category: framework
-filename: learnshutit-de.html
+filename: learnshutit-de.py
 framework: ShutIt
 contributors:
     - ["Ian Miell", "http://ian.meirionconsulting.tk"]

el-gr/css-gr.html.markdown

@@ -2,7 +2,7 @@
 language: CSS
 contributors:
     - ["Kostas Bariotis", "http://kostasbariotis.com"]
-filename: css-gr.html.markdown
+filename: css-gr.css
 lang: el-gr
 ---
 

el-gr/html-gr.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-gr.html
+filename: learnhtml-gr.txt
 contributors:
     - ["Dimitri Kokkonis", "https://github.com/kokkonisd"]
 lang: el-gr

el-gr/json-gr.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: JSON
-filename: json-gr.html.markdown
+filename: json-gr.json
 contributors:
   - ["Anna Harren", "https://github.com/iirelu"]
   - ["Marco Scannadinari", "https://github.com/marcoms"]

es-es/bf-es.html.markdown

@@ -15,7 +15,7 @@ lenguaje de programación extremadamente pequeño, Turing completo con sólo 8 c
 Puedes probar brainfuck en tu navegador con [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/).
 
 
-```
+```bf
 Cualquier caracter que no sea "><+-.,[]" (sin incluir las comillas)
 será ignorado.
 

es-es/dart-es.html.markdown

@@ -4,7 +4,7 @@ contributors:
     - ["Joao Pedrosa", "https://github.com/jpedrosa/"]
 translators:
     - ["Jorge Antonio Atempa", "http://www.twitter.com/atempa09"]
-filename: dart-es.md
+filename: dart-es.dart
 lang: es-es
 ---
 

es-es/git-es.html.markdown

@@ -31,7 +31,7 @@ uno o varios archivos, a lo largo del tiempo.
 + El versionamiento distribuido no tiene una estructura definida, incluso se
   puede mantener el estilo de los repositorios SVN con git.
 
-[Información adicional](http://git-scm.com/book/es/Empezando-Acerca-del-control-de-versiones)
+[Información adicional](https://git-scm.com/book/es/v2/Inicio---Sobre-el-Control-de-Versiones-Acerca-del-Control-de-Versiones)
 
 ### ¿Por qué usar Git?
 
@@ -58,7 +58,7 @@ Un repositorio esta compuesto por la carpeta .git y un "árbol de trabajo".
 El directorio .git contiene todas las configuraciones, registros, branches, HEAD
 y mas.
 
-[Lista detallada.](http://es.gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Lista detallada.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Directorio de trabajo (componentes del repositorio)
 
@@ -91,15 +91,8 @@ repositorio solo puede tener un HEAD activo. En cambio "head", es un apuntador a
 cualquier commit realizado, un repositorio puede tener cualquier número de
 "heads".
 
-### conceptos - recursos.
-
-* [Git para informáticos](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git para diseñadores](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## Comandos.
 
-
 ### init
 
 Crear un repositorio de git vacio. Las configuraciones, información almacenada y
@@ -123,7 +116,7 @@ $ git config --global user.email "corre@gmail.com"
 $ git config --global user.name "nombre"
 ```
 
-[Más sobre git config.](http://git-scm.com/book/es/Personalizando-Git-Configuración-de-Git)
+[Más sobre git config.](https://git-scm.com/book/es/v2/Personalizaci%c3%b3n-de-Git-Configuraci%c3%b3n-de-Git)
 
 ### help
 
@@ -275,7 +268,7 @@ $ git grep -e 'nombreArreglo' --and \( -e agregar -e remover \)
 
 Más ejemplos:
 
-- [Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+- [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -354,7 +347,7 @@ de otra rama. *No reescribe los commits que se han empujado antes a un repositor
 $ git rebase master experimentBranch
 ```
 
-[Información adicional.](http://git-scm.com/book/es/Ramificaciones-en-Git-Procedimientos-básicos-para-ramificar-y-fusionar)
+[Información adicional.](https://git-scm.com/book/es/v2/Ramificaciones-en-Git-Reorganizar-el-Trabajo-Realizado)
 
 ### reset (precaución)
 
@@ -396,22 +389,18 @@ $ git rm /directorio/del/archivo/FooBar.c
 
 ## Información Adicional
 
-* [tryGit - Una forma entretenida y rapida de aprender Git.](http://try.github.io/levels/1/challenges/1)
-
 * [Udemy tutorial de Git: Una guía completa](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [Inmersión Git - Una visita guiada caminando a través de los fundamentos de git](http://gitimmersion.com/)
+* [Inmersión Git - Una visita guiada caminando a través de los fundamentos de git](https://gitimmersion.com/)
 
-* [git-scm - Video-tutoriales](http://git-scm.com/videos)
+* [git-scm - Video-tutoriales](https://git-scm.com/videos)
-
-* [git-scm - Documentacion](http://git-scm.com/book/es)
 
 * [Atlassian Git - Tutoriales y Flujos de trabajo](https://www.atlassian.com/git/)
 
-* [SalesForce Chuleta](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [git - la guía sencilla](https://rogerdudler.github.io/git-guide/index.es.html)
 
-* [Git - La guía simple](http://rogerdudler.github.io/git-guide/index.html)
+* [Pro Git](https://git-scm.com/book/es/v2)
 
-* [Pro Git](http://www.git-scm.com/book/en/v2)
+* [Una introducción a Git y GitHub para principiantes (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
 
-* [Una introducción a Git y GitHub para principiantes (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+* [Git para informáticos](https://eagain.net/articles/git-for-computer-scientists/)

es-es/groovy-es.html.markdown

@@ -5,7 +5,7 @@ contributors:
 translators:
     - ["Jhoon Saravia", "https://github.com/jhoon"]
 lang: es-es
-filename: groovy-es.html
+filename: groovy-es.groovy
 ---
 
 Groovy - Un lenguaje dinámico para la plataforma Java. [Leer más aquí](http://www.groovy-lang.org/).

es-es/haskell-es.html.markdown

@@ -4,7 +4,7 @@ contributors:
     - ["Adit Bhargava", "http://adit.io"]
 translators:
     - ["Jorge Antonio Atempa", "http://www.twitter.com/atempa09"]
-filename: haskell-es.md
+filename: haskell-es.hs
 lang: es-es
 ---
 

es-es/hq9+-es.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HQ9+
-filename: hq9+-es.html
+filename: hq9+-es.txt
 contributors:
     - ["Alexey Nazaroff", "https://github.com/rogaven"]
 translators:

es-es/html-es.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-es.html
+filename: learnhtml-es.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

es-es/javascript-es.html.markdown

@@ -277,7 +277,7 @@ miFuncion(); // = undefined al mandar a llamar la función
 // Las funciones en JavaScript son de primera clase, así que pueden ser asignadas
 // a variables y pasadas a otras funciones como argumentos - por ejemplo:
 function miFuncion(){
-    // este código será llamado cada cinco segundos
+    // este código será llamado después de cinco segundos
 }
 setTimeout(miFuncion, 5000);
 // Note: setTimeout no es parte de JS, pero lo puedes obtener de los browsers
@@ -286,7 +286,7 @@ setTimeout(miFuncion, 5000);
 // Es posible declarar funciones sin nombre - se llaman funciones anónimas
 // y se definen como argumentos de otras funciones.
 setTimeout(function(){
-    // este código se ejecuta cada cinco segundos
+    // este código se ejecuta después de cinco segundos
 }, 5000);
 
 // JavaScript tiene ámbitos de funciones; las funciones tienen su propio ámbito pero

es-es/wolfram-es.html.markdown

@@ -3,7 +3,7 @@ language: Wolfram
 lang: es-es
 contributors:
     - ["Daniel Caballero", "http://github.com/danielcaballero796/"]
-filename: learnwolfram-es.md
+filename: learnwolfram-es.nb
 ---
 
 Wolfram es un lenguaje subyacente originalmente utilizado en Mathematica, pero ahora esta disponible para su uso en múltiples contextos.

fa-ir/bf-fa.html.markdown

@@ -33,7 +33,7 @@ lang: fa-ir
 
 <p dir='rtl'>در اینجا یک برنامه ی ساره برین فاک را مشاهده میکنید.</p>
 
-```
+```bf
 ++++++ [ > ++++++++++ < - ] > +++++ .
 ```
 
@@ -44,7 +44,7 @@ lang: fa-ir
 <p dir='rtl'>-- و در انتهای حلقه به خانه ی اول برگشته تا حلقه کنترل شود</p>
 <p dir='rtl'>بعد از اتمام حلقه به خانه ی دوم میرود و پنج بار به این خانه اضافه کرده و سپس آنرا چاپ میکند.</p>
 
-```
+```bf
 , [ > + < - ] > .
 ```
 
@@ -55,13 +55,13 @@ lang: fa-ir
 <p dir='rtl'>توجه داشته باشید که ردر بالا فواصل بین دستور ها فقط برای خوانایی بیشتر گذاشته شده اند.</p>
 <p dir='rtl'>در واقع برنامه بالا به شکل زیر صحیح می باشد.</p>
 
-```
+```bf
 ,[>+<-]>.
 ```
 
 <p dir='rtl'>حال سعی کنید ببینید که برنامه ی زیر چه کاری انجام می دهد؟</p>
 
-```
+```bf
 ,>,< [ > [ >+ >+ << -] >> [- << + >>] <<< -] >>
 ```
 

fortran.html.markdown

@@ -41,7 +41,7 @@ program example         ! declare a program called example.
     real :: v, x        ! WARNING: default initial values are compiler dependent!
     real :: a = 3, b = 2E12, c = 0.01
     integer :: i, j, k = 1, m
-    real, parameter :: PI = 3.1415926535897931    ! declare a constant.
+    real, parameter :: PI = 3.14159265            ! declare a constant.
     logical :: y = .TRUE., n = .FALSE.            ! boolean type.
     complex :: w = (0, 1)                         ! sqrt(-1)
     character(len=3) :: month                     ! string of 3 characters.
@@ -461,10 +461,10 @@ end module fruity
 ! to express loop-level parallelism
 
 integer :: i
-real :: array(100)
+real :: array(10)
 
 DO CONCURRENT (i = 1:size(array))
-    array(i) = sqrt(i**i)
+    array(i) = sqrt(real(i)**i)
 END DO
 
 

fr-fr/bf-fr.html.markdown

@@ -12,7 +12,7 @@ lang: fr-fr
 Brainfuck (sans majuscule à part au début d’une phrase) est un langage
 Turing-complet extrêmement simple avec seulement 8 commandes.
 
-```
+```bf
 Tout caractère en dehors de "><+-.,[]" (en dehors des guillemets) est ignoré.
 
 Brainfuck est représenté par un tableau de 30 000 cellules initialisées à 0 et

fr-fr/git-fr.html.markdown

@@ -35,7 +35,7 @@ Chaque changement a un identifiant unique.
 * Les systèmes distribués n'ont pas de structure définie. Vous pouvez aisément
 avoir un système centralisé de type SVN, avec Git.
 
-[Informations additionnelles](http://git-scm.com/book/fr/v1/D%C3%A9marrage-rapide-%C3%80-propos-de-la-gestion-de-version)
+[Informations additionnelles](https://git-scm.com/book/fr/v2/D%C3%A9marrage-rapide-%C3%80-propos-de-la-gestion-de-version)
 
 ### Pourquoi utiliser Git ?
 
@@ -63,7 +63,7 @@ Un dépôt Git comprend un répertoire .git et "l'arbre de travail" (working tre
 
 Le répertoire .git contient toutes les configurations, logs (journaux),
 branches, HEAD et plus.
-[Liste détaillée (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Liste détaillée (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Arbre de travail (composant du dépôt)
 
@@ -110,12 +110,6 @@ encore été rajouté à l'ensemble des fichiers Git
 * Validé ("committed") - Les fichiers ont été validés dans l'ensemble de
 fichiers
 
-### Ressources conceptuelles
-
-* [Git pour les informaticiens (EN)](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git pour les designers (EN)](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## Commandes
 
 
@@ -141,7 +135,7 @@ $ git config --global user.email "monEmail@foo.com"
 $ git config --global user.name "Mon nom"
 ```
 
-[Apprenez-en plus à propos de git config.](https://git-scm.com/book/fr/v1/Personnalisation-de-Git-Configuration-de-Git)
+[Apprenez-en plus à propos de git config.](https://git-scm.com/book/fr/v2/Personnalisation-de-Git-Configuration-de-Git)
 
 ### help
 
@@ -355,7 +349,7 @@ $ git grep -e 'nomDeTableau' --and \( -e rajouter -e enlever \)
 ```
 
 Google est votre ami; pour plus d'exemples :
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -507,7 +501,7 @@ $ git stash pop
 
 Vous êtes maintenant prêt à retourner sur vos tâches de travail !
 
-[Lecture additionelle.](https://git-scm.com/book/fr/v1/Utilitaires-Git-Le-remisage)
+[Lecture additionelle.](https://git-scm.com/book/fr/v2/Utilitaires-Git-Remisage-et-nettoyage)
 
 ### rebase (attention)
 
@@ -521,7 +515,7 @@ ré-applique sur une autre branche.
 $ git rebase master brancheExperience
 ```
 
-[Lecture additionelle.](https://git-scm.com/book/fr/v1/Les-branches-avec-Git-Rebaser)
+[Lecture additionelle.](https://git-scm.com/book/fr/v2/Les-branches-avec-Git-Rebaser-Rebasing)
 
 ### reset (attention)
 
@@ -564,20 +558,18 @@ $ git rm /chemin/vers/le/fichier/HelloWorld.c
 
 ## Informations complémentaires
 
-* [tryGit - A fun interactive way to learn Git (EN)](http://try.github.io/levels/1/challenges/1)
-
 * [Udemy Git Tutorial: A Comprehensive Guide (EN)](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [git-scm - Tutoriaux vidéos](http://git-scm.com/videos)
+* [git-scm - Tutoriaux vidéos](https://git-scm.com/videos)
 
-* [git-scm - Documentation](http://git-scm.com/docs)
+* [git-scm - Documentation](https://git-scm.com/docs)
 
 * [Atlassian Git - Tutoriaux et Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet (EN)](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [git - petit guide](https://rogerdudler.github.io/git-guide/index.fr.html)
 
-* [Git - the simple guide (EN)](http://rogerdudler.github.io/git-guide/index.html)
+* [Livre Pro Git](https://git-scm.com/book/fr/v2)
 
-* [Livre Pro Git](http://www.git-scm.com/book/fr/v1)
+* [Une introduction à Git et GitHub pour les débutants (tutoriel) (EN)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
 
-* [Une introduction à Git et GitHub pour les débutants (tutoriel) (EN)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+* [Git pour les informaticiens (EN)](https://eagain.net/articles/git-for-computer-scientists/)

fr-fr/html-fr.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-fr.html
+filename: learnhtml-fr.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 lang: fr-fr

git.html.markdown

@@ -33,7 +33,7 @@ unique id.
 * Distributed systems have no defined structure. You could easily have a SVN
 style, centralized system, with git.
 
-[Additional Information](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Additional Information](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Why Use Git?
 
@@ -59,7 +59,7 @@ A git repository is comprised of the .git directory & working tree.
 
 The .git directory contains all the configurations, logs, branches, HEAD, and
 more.
-[Detailed List.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Detailed List.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Working Tree (component of repository)
 
@@ -102,11 +102,6 @@ to Git Database yet
 * Staged - Marks a modified file to go into your next commit snapshot
 * Committed - Files have been committed to the Git Database
 
-### Conceptual Resources
-
-* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
-
 ## Commands
 
 ### init
@@ -132,7 +127,7 @@ $ git config --global user.email
 $ git config --global user.name
 ```
 
-[Learn More About git config.](http://git-scm.com/docs/git-config)
+[Learn More About git config.](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -345,7 +340,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Google is your friend; for more examples
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -495,7 +490,7 @@ $ git stash pop
 
 Now you're ready to get back to work on your stuff!
 
-[Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing)
+[Additional Reading.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
 
 ### rebase (caution)
 
@@ -509,7 +504,7 @@ another branch.
 $ git rebase master experimentBranch
 ```
 
-[Additional Reading.](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Additional Reading.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (caution)
 
@@ -600,26 +595,26 @@ b88c6a1b (Google Python team  2019-12-30 13:45:23 -0800 14)
 
 ## Further Information
 
-* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)
+* [Learn Git Branching - the most visual and interactive way to learn Git on the web](https://learngitbranching.js.org/)
-
-* [Learn Git Branching - the most visual and interactive way to learn Git on the web](http://learngitbranching.js.org/)
 
 * [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [Git Immersion - A Guided tour that walks through the fundamentals of git](http://gitimmersion.com/)
+* [Git Immersion - A Guided tour that walks through the fundamentals of git](https://gitimmersion.com/)
 
-* [git-scm - Video Tutorials](http://git-scm.com/videos)
+* [git-scm - Video Tutorials](https://git-scm.com/videos)
 
-* [git-scm - Documentation](http://git-scm.com/docs)
+* [git-scm - Documentation](https://git-scm.com/docs)
 
 * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](http://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
+* [SalesForce Cheat Sheet](https://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
 
-* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html)
+* [git - the simple guide](https://rogerdudler.github.io/git-guide/index.html)
 
-* [Pro Git](http://www.git-scm.com/book/en/v2)
+* [Pro Git](https://git-scm.com/book/en/v2)
 
-* [An introduction to Git and GitHub for Beginners (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+* [An introduction to Git and GitHub for Beginners (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
 
 * [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx)
+
+* [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

hcl.html.markdown

@@ -281,9 +281,9 @@ locals {
 
   map = {for x in local.list : x => upper(x) } // "one":"ONE", "two":"TWO", "three":"THREE"
 
-  filtered_list = [for k, v in local.map : substr(v, 0, 2) if k != "two" } // "ON", "TH"
+  filtered_list = [for k, v in local.map : substr(v, 0, 2) if k != "two" ] // "ON", "TH"
 
-  prefixed_list = [for v in local.filtered_list : "pre-${k}" } // "pre-ON", "pre-TH"
+  prefixed_list = [for v in local.filtered_list : "pre-${v}" ] // "pre-ON", "pre-TH"
 
   joined_list = join(local.upper_list,local. filtered_list) // "ONE", "TWO", "THREE", "pre-ON", "pre-TH"
 

he-he/html-he.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-he.html
+filename: learnhtml-he.txt
 contributors:
     - ['Christophe THOMAS', 'https://github.com/WinChris']
 translators:

hq9+.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HQ9+
-filename: hq9+.html
+filename: hq9+.txt
 contributors:
     - ["Alexey Nazaroff", "https://github.com/rogaven"]
 ---

id-id/hq9+-id.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HQ9+
-filename: hq9+-id.html
+filename: hq9+-id.txt
 contributors:
     - ["Alexey Nazaroff", "https://github.com/rogaven"]
 translators:

id-id/rst-id.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: reStructuredText (RST)
-filename: rst-id.html
+filename: rst-id.rst
 contributors:
     - ["DamienVGN", "https://github.com/martin-damien"]
     - ["Andre Polykanine", "https://github.com/Oire"]

it-it/bf-it.html.markdown

@@ -1,4 +1,4 @@
----
+--
 language: BF
 filename: learnbf-it.bf
 contributors:
@@ -17,7 +17,7 @@ estremamente minimale, composto da solo 8 comandi.
 Puoi provarlo nel tuo browser utilizzando
 [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/).
 
-```
+```bf
 Qualsiasi carattere diverso da "><+-.,[]" (escludendo gli apici)
 viene ignorato.
 Branfuck è caratterizzato da un array di 30,000 celle inizializzate a zero

it-it/git-it.html.markdown

@@ -36,7 +36,7 @@ registra le modifiche apportate a uno o più file nel tempo.
 * I sistemi distribuiti non hanno una struttura definita. Si potrebbe creare
   ad esempio un sistema centralizzato simile a SVN utilizzando Git.
 
-[Ulteriori informazioni](http://git-scm.com/book/it/v1/Per-Iniziare-Il-Controllo-di-Versione)
+[Ulteriori informazioni](https://git-scm.com/book/it/v2/Per-Iniziare-Il-Controllo-di-Versione)
 
 ### Perchè usare Git?
 
@@ -60,7 +60,7 @@ Un repository comprende la cartella .git e il working tree.
 ### Cartella .git (componente del repository)
 
 La cartella .git contiene tutte le configurazioni, i log, i rami e altro.
-[Lista dettagliata](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Lista dettagliata](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Working Tree (componente del repository)
 
@@ -128,7 +128,7 @@ $ git config --global user.email "email@example.com"
 $ git config --global user.name "Nome utente"
 ```
 
-[Ulteriori informazioni su git config](http://git-scm.com/docs/git-config)
+[Ulteriori informazioni su git config](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -456,7 +456,7 @@ Applica le modifiche effettuate su un branch su un altro branch.
 $ git rebase master experimentBranch
 ```
 
-[Ulteriori informazioni](https://git-scm.com/book/it/v1/Diramazioni-in-Git-Rifondazione)
+[Ulteriori informazioni](https://git-scm.com/book/it/v2/Git-Branching-Rebasing)
 
 ### reset (attenzione)
 

it-it/rust-it.html.markdown

@@ -3,7 +3,7 @@ language: Rust
 contributors:
     - ["Carlo Milanesi", "http://github.com/carlomilanesi"]
 lang: it-it
-filename: rust-it.html.markdown
+filename: rust-it.rs
 ---
 
 Rust è un linguaggio di programmazione sviluppato da Mozilla Research.

java.html.markdown

@@ -225,7 +225,7 @@ public class LearnJava {
         String fooString = "My String Is Here!";
 
         // Text blocks
-        vat textBlock = """
+        var textBlock = """
                         This is a <Text Block> in Java 
                         """;
 

ko-kr/bf-kr.html.markdown

@@ -13,7 +13,7 @@ lang: ko-kr
 Brainfuck(문장을 시작하는 단어가 아닌이상 첫글자는 대문자를 사용하지 않습니다)은
 여덟가지 명령어만으로 튜링-완전한 최소주의 프로그래밍 언어입니다.
 
-```
+```bf
 "><+-.,[]" 이외의 문자들은 무시됩니다. (쌍따옴표는 제외)
 
 브레인퍽은 30,000 칸 짜리의 0으로 초기화된 배열과,

nl-nl/bf.html.markdown

@@ -13,7 +13,7 @@ Brainfuck (schrijf je niet met een hoofdletter behalve aan het begin van een
 zin) is een extreem
 minimalistische Turing-complete programmeertaal met maar acht commando's.
 
-```
+```bf
 Elk karakter behalve "><+-.,[]" (en de quotes) wordt genegeerd.
 
 Brainfuck wordt gerepresenteerd door een array met 30.000 cellen die initieel

nl-nl/html-nl.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-nl.html
+filename: learnhtml-nl.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

pl-pl/bf-pl.html.markdown

@@ -19,7 +19,7 @@ Zawiera zaledwie 8 poleceń.
 Możesz przetesotwać brainfucka w swojej przeglądarce, korzystając z narzędzia 
 [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/).
 
-```
+```bf
 Wszystkie znaki oprócz "><+-.,[]" (wyłączając znaki zapytania) są ignorowane.
 
 Pamięć w brainfucku jest reprezentowana przez tablicę 30.000 komórek

pt-br/git-pt.html.markdown

@@ -36,7 +36,7 @@ alteração é associada a um *id* único.
 * Sistemas distribuídos não têm estrutura definida. É possivel ter um sistema
 centralizado ao estilo SVN usando git.
 
-[Informação adicional (EN)](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Informação adicional (EN)](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Por que usar git?
 
@@ -64,7 +64,7 @@ Um repositório git é constituído pelo diretório .git e a *working tree*
 O repositório .git contém todas as configurações, *logs*, *branches*,
 referências e outros.
 
-[Lista detalhada (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Lista detalhada (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### *Working Tree* (componente do repositório)
 
@@ -111,11 +111,6 @@ próximo commit
 * Consolidado (Committed): As mudanças foram registradas na base de dados do
 Git
 
-### Recursos conceituais (EN)
-
-* [Git para Cientistas de Computação](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git para Designers](http://hoth.entp.com/output/git_for_designers.html)
-
 ## Comandos
 
 ### *init*
@@ -141,7 +136,7 @@ $ git config --global user.email
 $ git config --global user.name
 ```
 
-[Aprenda mais sobre git config. (EN)](http://git-scm.com/docs/git-config)
+[Aprenda mais sobre git config. (EN)](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -363,7 +358,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 O Google é seu amigo; para mais exemplos:
-[Git Grep Ninja (EN)](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja (EN)](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -520,7 +515,7 @@ $ git stash pop
 
 Agora podemos voltar a trabalhar no que havíamos deixado de lado!
 
-[Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing)
+[Additional Reading.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
 
 ### rebase (cautela!)
 
@@ -535,7 +530,7 @@ público*
 $ git rebase master experimentBranch
 ```
 
-[Leitura adicional (EN).](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Leitura adicional (EN).](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (cuidado!)
 
@@ -619,26 +614,26 @@ $ git rm /caminho/para/o/arquivo/OlaMundo.c
 
 ## Leitura complementar
 
-* [Configurar o Git (GitHub Docs)](https://docs.github.com/pt/get-started/quickstart/set-up-git)
+* [Configurar o Git (GitHub Docs)](https://docs.github.com/pt/get-started/getting-started-with-git/set-up-git)
 
-* [Learn Git Branching - the most visual and interactive way to learn Git on the web](http://learngitbranching.js.org/)
+* [Learn Git Branching - the most visual and interactive way to learn Git on the web](https://learngitbranching.js.org/)
 
 * [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [Git Immersion - A Guided tour that walks through the fundamentals of git](http://gitimmersion.com/)
+* [Git Immersion - A Guided tour that walks through the fundamentals of git](https://gitimmersion.com/)
 
-* [git-scm - Video Tutorials](http://git-scm.com/videos)
+* [git-scm - Video Tutorials](https://git-scm.com/videos)
 
-* [git-scm - Documentation](http://git-scm.com/docs)
+* [git-scm - Documentation](https://git-scm.com/docs)
 
 * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [git - guia prático](https://rogerdudler.github.io/git-guide/index.pt_BR.html)
 
-* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html)
+* [Pro Git (em Português)](https://git-scm.com/book/pt-br/v2)
 
-* [Pro Git (em Português)](https://www.git-scm.com/book/pt-br/v2)
+* [An introduction to Git and GitHub for Beginners (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
-
-* [An introduction to Git and GitHub for Beginners (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
 
 * [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx)
+
+* [Git para Cientistas de Computação](https://eagain.net/articles/git-for-computer-scientists/)

pt-pt/bf-pt.html.markdown

@@ -12,7 +12,7 @@ lang: pt-pt
 Brainfuck (não capitalizado excepto no início de uma frase) é uma linguagem de
 programação Turing-completa extremamente simples com apenas 8 comandos.
 
-```
+```bf
 Qualquer caractere excepto "><+-.,[]" (não contar com as aspas) é ignorado.
 
 Brainfuck é representado por um vector com 30 000 células inicializadas a zero

pt-pt/git-pt.html.markdown

@@ -31,7 +31,7 @@ alteração é associada a um *id* único.
 * Sistemas distribuidos não têm estrutura definida. É possivel ter um sistema
 centralizado ao estilo SVN usando git.
 
-[Informação adicional (EN)](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Informação adicional (EN)](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Porquê usar git?
 
@@ -59,7 +59,7 @@ Um repositório git é constituido pelo directório .git e a *working tree*
 O repositório .git contém todas as configurações, *logs*, *branches*,
 referências e outros.
 
-[Lista detalhada (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Lista detalhada (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### *Working Tree* (componente do repositório)
 
@@ -92,11 +92,6 @@ uma *HEAD* activa.
 *head* é uma referência que aponta para qualquer *commit*. Um repositório pode
 ter um número indefinido de *heads*
 
-### Recursos conceptuais (EN)
-
-* [Git para Cientistas de Computação](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git para Designers](http://hoth.entp.com/output/git_for_designers.html)
-
 ## Comandos
 
 ### *init*
@@ -122,7 +117,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
 $ git config --global user.name "My Name"
 ```
 
-[Aprenda mais sobre git config. (EN)](http://git-scm.com/docs/git-config)
+[Aprenda mais sobre git config. (EN)](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -274,7 +269,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Google é teu amigo; para mais exemplos:
-[Git Grep Ninja (EN)](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja (EN)](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -361,7 +356,7 @@ público*
 $ git rebase master experimentBranch
 ```
 
-[Additional Reading (EN).](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Additional Reading (EN).](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (cautela!)
 
@@ -402,12 +397,10 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## Informação complementar (EN)
 
-* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)
+* [git-scm - Video Tutorials](https://git-scm.com/videos)
 
-* [git-scm - Video Tutorials](http://git-scm.com/videos)
+* [git-scm - Documentation](https://git-scm.com/docs)
-
-* [git-scm - Documentation](http://git-scm.com/docs)
 
 * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [Git para Cientistas de Computação](https://eagain.net/articles/git-for-computer-scientists/)

qsharp.html.markdown

@@ -4,6 +4,7 @@ contributors:
     - ["Vincent van Wingerden", "https://github.com/vivanwin"]
     - ["Mariia Mykhailova", "https://github.com/tcNickolas"]
     - ["Andrew Ryan Davis", "https://github.com/AndrewDavis1191"]
+    - ["Alex Hansen", "https://github.com/sezna"]
 filename: LearnQSharp.qs
 ---
 
@@ -19,13 +20,14 @@ Q# is a high-level domain-specific language which enables developers to write qu
 // The most important part of quantum programs is qubits.
 // In Q# type Qubit represents the qubits which can be used.
 // This will allocate an array of two new qubits as the variable qs.
-using (qs = Qubit[2]) {
+operation QuantumDataTypes() : Unit {
+    use qs = Qubit[2];
 
     // The qubits have internal state that you cannot access to read or modify directly.
     // You can inspect the current state of your quantum program
     // if you're running it on a classical simulator.
     // Note that this will not work on actual quantum hardware!
-    DumpMachine();
+    Std.Diagnostics.DumpMachine();
 
     // If you want to change the state of a qubit
     // you have to do this by applying quantum gates to the qubit.
@@ -58,97 +60,102 @@ using (qs = Qubit[2]) {
 /////////////////////////////////////
 // 2. Classical data types and operators
 
-// Numbers in Q# can be stored in Int, BigInt or Double.
+function ClassicalDataTypes() : Unit {
-let i = 1;            // This defines an Int variable i equal to 1
+    // Numbers in Q# can be stored in Int, BigInt or Double.
-let bi = 1L;          // This defines a BigInt variable bi equal to 1
+    let i = 1;            // This defines an Int variable i equal to 1
-let d = 1.0;          // This defines a Double variable d equal to 1
+    let bi = 1L;          // This defines a BigInt variable bi equal to 1
+    let d = 1.0;          // This defines a Double variable d equal to 1
 
-// Arithmetic is done as expected, as long as the types are the same
+    // Arithmetic is done as expected, as long as the types are the same
-let n = 2 * 10;                // = 20
+    let n = 2 * 10;                // = 20
-// Q# does not have implicit type cast, 
+    // Q# does not have implicit type cast,
-// so to perform arithmetic on values of different types, 
+    // so to perform arithmetic on values of different types,
-// you need to cast type explicitly
+    // you need to cast type explicitly
-let nd = IntAsDouble(2) * 1.0; // = 20.0
+    let nd = Std.Convert.IntAsDouble(2) * 1.0; // = 20.0
 
-// Boolean type is called Bool
+    // Boolean type is called Bool
-let trueBool = true;
+    let trueBool = true;
-let falseBool = false;
+    let falseBool = false;
 
-// Logic operators work as expected
+    // Logic operators work as expected
-let andBool = true and false;
+    let andBool = true and false;
-let orBool = true or false;
+    let orBool = true or false;
-let notBool = not false;
+    let notBool = not false;
 
-// Strings
+    // Strings
-let str = "Hello World!";
+    let str = "Hello World!";
 
-// Equality is ==
+    // Equality is ==
-let x = 10 == 15; // is false
+    let x = 10 == 15; // is false
 
-// Range is a sequence of integers and can be defined like: start..step..stop
+    // Range is a sequence of integers and can be defined like: start..step..stop
-let xi = 1..2..7; // Gives the sequence 1,3,5,7
+    let xi = 1..2..7; // Gives the sequence 1,3,5,7
 
-// Assigning new value to a variable:
+    // Assigning new value to a variable:
-// by default all Q# variables are immutable;
+    // by default all Q# variables are immutable;
-// if the variable was defined using let, you cannot reassign its value.
+    // if the variable was defined using let, you cannot reassign its value.
 
-// When you want to make a variable mutable, you have to declare it as such, 
+    // When you want to make a variable mutable, you have to declare it as such,
-// and use the set word to update value
+    // and use the set word to update value
-mutable xii = true;
+    mutable xii = true;
-set xii = false;
+    set xii = false;
 
-// You can create an array for any data type like this
+    // You can create an array for any data type like this
-let xiii = new Double[10];
+    let xiii = [0.0, size = 10];
 
-// Getting an element from an array 
+    // Getting an element from an array
-let xiv = xiii[8];
+    let xiv = xiii[8];
 
-// Assigning a new value to an array element
+    // Assigning a new value to an array element
-mutable xv = new Double[10];
+    mutable xv = [0.0, size = 10];
-set xv w/= 5 <- 1;
+    set xv w/= 5 <- 1.0;
+}
 
 
 /////////////////////////////////////
 // 3. Control flow
 
-// If structures work a little different than most languages
+operation ControlFlow() : Unit {
-if (a == 1) {
+    let a = 1;
+    // If expressions support a true branch, elif, and else.
+    if (a == 1) {
         // ...
-} elif (a == 2) {
+    } elif (a == 2) {
         // ...
-} else {
+    } else {
         // ...
-}
+    }
+    use qubits = Qubit[2];
 
-// Foreach loops can be used to iterate over an array
+    // For loops can be used to iterate over an array
-for (qubit in qubits) {
+    for qubit in qubits {
         X(qubit);
-}
+    }
 
-// Regular for loops can be used to iterate over a range of numbers
+    // Regular for loops can be used to iterate over a range of numbers
-for (index in 0 .. Length(qubits) - 1) {
+    for index in 0..Length(qubits) - 1 {
         X(qubits[index]);
-}
+    }
 
-// While loops are restricted for use in classical context only
+    // While loops are restricted for use in classical context only
-mutable index = 0;
+    mutable index = 0;
-while (index < 10) {
+    while (index < 10) {
         set index += 1;
-}
+    }
 
-// Quantum equivalent of a while loop is a repeat-until-success loop.
+    let success_criteria = true;
-// Because of the probabilistic nature of quantum computing sometimes
+    // Quantum equivalent of a while loop is a repeat-until-success loop.
-// you want to repeat a certain sequence of operations 
+    // Because of the probabilistic nature of quantum computing sometimes
-// until a specific condition is achieved; you can use this loop to express this.
+    // you want to repeat a certain sequence of operations
-repeat {
+    // until a specific condition is achieved; you can use this loop to express this.
+    repeat {
         // Your operation here
-}
+    } until (success_criteria) // This could be a measurement to check if the state is reached
-until (success criteria) // This could be a measurement to check if the state is reached
+    fixup {
-fixup {
         // Resetting to the initial conditions, if required
+    }
 }
 
-
 /////////////////////////////////////
 // 4. Putting it all together
 
@@ -161,7 +168,7 @@ operation ApplyXGate(source : Qubit) : Unit {
 // adjoint and controlled variants of it.
 // The easiest way to do that is to add "is Adj + Ctl" after Unit.
 // This will tell the compiler to generate the variants automatically.
-operation ApplyXGateCA (source : Qubit) : Unit is Adj + Ctl {
+operation ApplyXGateCA(source : Qubit) : Unit is Adj + Ctl {
     X(source);
 }
 
@@ -169,20 +176,21 @@ operation ApplyXGateCA (source : Qubit) : Unit is Adj + Ctl {
 
 
 // To run Q# code, you can put @EntryPoint() before the operation you want to run first
-@EntryPoint()
 operation XGateDemo() : Unit {
-    using (q = Qubit()) {
+    use q = Qubit();
     ApplyXGate(q);
-    }
 }
 
 // Here is a simple example: a quantum random number generator.
 // We will generate a classical array of random bits using quantum code.
-@EntryPoint()
+// Callables (functions or operations) named `Main` are used as entry points.
-operation QRNGDemo() : Unit {
+operation Main() : Unit {
-    mutable bits = new Int[5];                // Array we'll use to store bits
+    mutable bits = [0, size = 5];                // Array we'll use to store bits
-    using (q = Qubit()) {                     // Allocate a qubit
+    use q  = Qubit();
-        for (i in 0 .. 4) {                   // Generate each bit independently
+    {
+        // Allocate a qubit
+        for i in 0..4 {
+            // Generate each bit independently
             H(q);                             // Hadamard gate sets equal superposition
             let result = M(q);                // Measure qubit gets 0|1 with 50/50 prob
             let bit = result == Zero ? 0 | 1; // Convert measurement result to integer
@@ -196,9 +204,6 @@ operation QRNGDemo() : Unit {
 
 ## Further Reading
 
-The [Quantum Katas][1] offer great self-paced tutorials and programming exercises to learn quantum computing and Q#. 
+The Quantum Katas ([repo](https://github.com/microsoft/qsharp/tree/main/katas) [hosted tutorials](https://quantum.microsoft.com/en-us/tools/quantum-katas) offer great self-paced tutorials and programming exercises to learn quantum computing and Q#. 
 
-[Q# Documentation][2] is official Q# documentation, including language reference and user guides.
+[Q# Documentation](https://docs.microsoft.com/quantum/) is official Q# documentation, including language reference and user guides.
-
-[1]: https://github.com/microsoft/QuantumKatas
-[2]: https://docs.microsoft.com/quantum/

ro-ro/bf-ro.html.markdown

@@ -5,7 +5,7 @@ contributors:
     - ["Mathias Bynens", "http://mathiasbynens.be/"]
 translators:
     - ["Petru Dimitriu", "http://petru-dimitriu.github.io"]
-filename: bf-ro.html
+filename: bf-ro.bf
 lang: ro-ro
 ---
 

ro-ro/haskell-ro.html.markdown

@@ -5,7 +5,7 @@ contributors:
 translators:
     - ["Petru Dimitriu", "http://petru-dimitriu.github.io"]
 lang: ro-ro
-filename: haskell-ro.html
+filename: haskell-ro.hs
 ---
 
 Haskell este un limbaj de programare practic, pur funcțional.

ru-ru/bf.html.markdown

@@ -14,7 +14,7 @@ Brainfuck (пишется маленькими буквами, кроме нач
 
 Вы можете испытать brainfuck в вашем браузере с помощью [brainfuck-визуализатора](http://fatiherikli.github.io/brainfuck-visualizer/).
 
-```
+```bf
 Любой символ, кроме "><+-.,[]", игнорируется, за исключением кавычек.
 
 Brainfuck представлен массивом из 30000 ячеек, инициализированных нулями,

ru-ru/forth-ru.html.markdown

@@ -8,14 +8,17 @@ filename: learnforth-ru.fs
 lang: ru-ru
 ---
 
-Форт создан Чарлзом Муром в 70-е годы. Это императивный, стековый язык программирования и среда исполнения программ. Использовался в таких проектах как Open Firmware. Продолжает применятся в проектах. Применяется в НАСА.
+Форт создан Чарлзом Муром в 70-е годы. Это императивный, стековый язык
+программирования и среда исполнения программ. Использовался в таких проектах
+как Open Firmware. Продолжает применяться в проектах. Применяется в НАСА.
 
-Внимание: этот материал использует реализацию Форта - Gforth, но большая часть написанного будет работать в других средах.
+Внимание: этот материал использует реализацию Форта - Gforth, но большая часть
+написанного будет работать в других средах.
 
 
 ```forth
 \ Это комментарий
-( Это тоже комментарий, но используется для предоределённых слов )
+( Это тоже комментарий, но используется для предопределённых слов )
 
 \ --------------------------------- Прекурсор --------------------------------
 
@@ -63,9 +66,9 @@ lang: ru-ru
 
 \ ------------------ Более продвинутые манипуляции со стеком ------------------
 
-1 2 3 4 tuck   \ дублировать верхний елемент стека во вторую позицию: 
+1 2 3 4 tuck   \ дублировать верхний элемент стека во вторую позицию:
                \ 1 2 4 3 4 ok
-1 2 3 4 over   \ диблировать второй елемент наверх стека: 
+1 2 3 4 over   \ дублировать второй элемент наверх стека:
                \ 1 2 3 4 3 ok
 1 2 3 4 2 roll \ *переместить* элемент в заданной позиции наверх стека:
                \ 1 3 4 2 ok
@@ -205,7 +208,7 @@ mynumbers 1 of-arr ?       \ 20 ok
 
 \ ---------------- Операции над числами с плавающей точкой --------------------
 
-\ Многие фортовцы стараются избегать использование слов с вещественными числами.
+\ Многие фортовцы стараются избегать использования слов с вещественными числами.
 8.3e 0.8e f+ f.    \ 9.1 ok
 
 \ Обычно мы просто используем слово 'f', когда обращаемся к вещественным числам:

ru-ru/html-ru.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-ru.html
+filename: learnhtml-ru.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

ruby.html.markdown

@@ -259,8 +259,8 @@ else
   'else, also optional'
 end
 
-# If a condition controls invocation of a single statement rather than a block of code
+# If a condition controls invocation of a single statement rather than a block
-# you can use postfix-if notation
+# of code you can use postfix-if notation
 warnings = ['Patronimic is missing', 'Address too short']
 puts("Some warnings occurred:\n" + warnings.join("\n"))  if !warnings.empty?
 
@@ -279,9 +279,10 @@ for counter in 1..5
   puts "iteration #{counter}"
 end
 
-# The `do |variable| ... end` construct above is called a 'block'. Blocks are similar
+# The `do |variable| ... end` construct above is called a 'block'. Blocks are
-# to lambdas, anonymous functions or closures in other programming languages. They can
+# similar to lambdas, anonymous functions or closures in other programming
-# be passed around as objects, called, or attached as methods.
+# languages. They can be passed around as objects, called, or attached as
+# methods.
 #
 # The 'each' method of a range runs the block once for each element of the range.
 # The block is passed a counter as a parameter.
@@ -415,19 +416,20 @@ surround { puts 'hello world' }
 #=> hello world
 #=> }
 
-# Blocks can be converted into a 'proc' object, which wraps the block 
+# Blocks can be converted into a 'proc' object, which wraps the block and allows
-# and allows it to be passed to another method, bound to a different scope,
+# it to be passed to another method, bound to a different scope, or manipulated
-# or manipulated otherwise. This is most common in method parameter lists,
+# otherwise. This is most common in method parameter lists, where you frequently
-# where you frequently see a trailing '&block' parameter that will accept 
+# see a trailing '&block' parameter that will accept the block, if one is given,
-# the block, if one is given, and convert it to a 'Proc'. The naming here is
+# and convert it to a 'Proc'. The naming here is convention; it would work just
-# convention; it would work just as well with '&pineapple'.
+# as well with '&pineapple'.
 def guests(&block)
   block.class #=> Proc
   block.call(4)
 end
 
 # The 'call' method on the Proc is similar to calling 'yield' when a block is
-# present. The arguments passed to 'call' will be forwarded to the block as arguments.
+# present. The arguments passed to 'call' will be forwarded to the block as
+# arguments.
 
 guests { |n| "You have #{n} guests." }
 # => "You have 4 guests."
@@ -480,9 +482,9 @@ best *ranked_competitors
 5.even? #=> false
 5.odd? #=> true
 
-# By convention, if a method name ends with an exclamation mark, it does something destructive
+# By convention, if a method name ends with an exclamation mark, it does
-# like mutate the receiver. Many methods have a ! version to make a change, and
+# something destructive like mutate the receiver. Many methods have a ! version
-# a non-! version to just return a new changed version.
+# to make a change, and a non-! version to just return a new changed version.
 company_name = "Dunder Mifflin"
 company_name.upcase #=> "DUNDER MIFFLIN"
 company_name #=> "Dunder Mifflin"
@@ -516,7 +518,8 @@ class Human
     @name
   end
 
-  # The above functionality can be encapsulated using the attr_accessor method as follows.
+  # The above functionality can be encapsulated using the attr_accessor method
+  # as follows.
   attr_accessor :name
 
   # Getter/setter methods can also be created individually like this.

shutit.html.markdown

@@ -3,7 +3,7 @@ category: framework
 framework: ShutIt
 contributors:
     - ["Ian Miell", "http://ian.meirionconsulting.tk"]
-filename: learnshutit.html
+filename: learnshutit.py
 ---
 
 ## ShutIt

sk-sk/git-sk.html.markdown

@@ -29,7 +29,7 @@ Riadenie revízií je systém, ktorý postupom času zaznamenáva zmeny súboru
 * Distribuované riadenie revízií sa zameriava na zdieľanie zmien. Kaťdá zmena má jedinečný identifikátor (id).
 * Distribuované systémy nemajú definovanú štruktúru. S gitom môžeš mať centralizovaný systém v subversion (SVN) štýle.
 
-[Ďalšie informácie](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Ďalšie informácie](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Prečo Používať Git? 
 
@@ -52,7 +52,7 @@ Git repozitár sa skladá z .git adresára a pracovného stromu
 ### .git Adresár (časť repozitára)
 
 .git  adresár obsahuje všetky konfigurácie, logy, vetvy, odkaz na aktuálnu vetvu (HEAD) a ostatné.
-[Detailný zoznam.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Detailný zoznam.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Pracovný Strom (Working Tree - časť repozitára)
 
@@ -84,12 +84,6 @@ head je ukazateľ, ktorý môže ukazovať na akýkoľvek commit. Repozitár mô
 * Staged - Zmenený súbor, ktorý pôjde do najbližšieho commit snímku.
 * Committed - Súbory boli commitnuté do Git Databázy.
 
-### Koncepčné zdroje
-
-* [Git Pre Informatikov](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git Pre Designerov](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## Príkazy
 
 
@@ -112,7 +106,7 @@ $ git config --global user.email "MôjEmail@Zoho.com"
 $ git config --global user.name  "Moje Meno	"
 ```
 
-[Prečítaj si viac o git configu.](http://git-scm.com/docs/git-config)
+[Prečítaj si viac o git configu.](https://git-scm.com/docs/git-config)
 
 ### pomoc
 
@@ -302,7 +296,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Google je tvoj kamarát; pre viac príkladov skoč na
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -444,7 +438,7 @@ $ git stash pop
 
 Hotovo, môžeš pokračovať v práci!
 
-[Čítaj viac.](http://git-scm.com/book/en/v1/Git-Tools-Stashing)
+[Čítaj viac.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
 
 ### rebase (pozor)
 
@@ -457,7 +451,7 @@ Zober všetky zmeny commitnuté do vetvy a aplikuj ich na inú vetvu.
 $ git rebase master experimentBranch
 ```
 
-[Čítaj viac.](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Čítaj viac.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (pozor)
 
@@ -503,22 +497,20 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## Ďalšie informácie
 
-* [tryGit - Zábavný interaktívny spôsob, ako sa naučiť Git.](http://try.github.io/levels/1/challenges/1)
-
 * [Udemy Git Tutoriál: Kompletný návod](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [Git Immersion - Návod, ktorý Ťa prevedie základmi Gitu](http://gitimmersion.com/)
+* [Git Immersion - Návod, ktorý Ťa prevedie základmi Gitu](https://gitimmersion.com/)
 
-* [git-scm - Video Tutoriály](http://git-scm.com/videos)
+* [git-scm - Video Tutoriály](https://git-scm.com/videos)
 
-* [git-scm - Dokumentácia](http://git-scm.com/docs)
+* [git-scm - Dokumentácia](https://git-scm.com/docs)
 
 * [Atlassian Git - Tutoriály & Postupy](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [Git - jednoducho](https://rogerdudler.github.io/git-guide/index.html)
 
-* [Git - jednoducho](http://rogerdudler.github.io/git-guide/index.html)
+* [Pro Git](https://git-scm.com/book/en/v2)
 
-* [Pro Git](http://www.git-scm.com/book/en/v2)
+* [Úvod do Gitu a GitHubu pre začiatočníkov (Tutoriál)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
 
-* [Úvod do Gitu a GitHubu pre začiatočníkov (Tutoriál)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+* [Git Pre Informatikov](https://eagain.net/articles/git-for-computer-scientists/)

sv-se/bf-sv.html.markdown

@@ -14,7 +14,7 @@ minimalistiskt Turing-komplett programmeringsspråk med endast 8 kommandon.
 
 Du kan testa brainfuck i din webbläsare via [brainfuck-visualizer](http://fatiherikli.github.io/brainfuck-visualizer/).
 
-```
+```bf
 Alla karaktärer förutom "><+-.,[]" (inte inkluderat citattecken) ignoreras.
 
 Brainfuck är representerat av ett fält med 30 000 celler initialiserade till

tr-tr/bf-tr.html.markdown

@@ -12,7 +12,7 @@ Brainfuck (normalde brainfuck olarak bütün harfleri küçük olarak yazılır.
 son derece minimal bir programlama dilidir. (Sadece 8 komut) ve tamamen 
 Turing'dir.
 
-```
+```bf
 "><+-.,[]" (tırnak işaretleri hariç) karakterleri dışındaki her karakter
 gözardı edilir.
 

tr-tr/fsharp-tr.html.markdown

@@ -3,7 +3,7 @@ language: F#
 contributors:
     - ["Scott Wlaschin", "http://fsharpforfunandprofit.com/"]
 translators:
-    - ["Mustafa Zengin", "http://zengin.github.com/"]
+    - ["Mustafa Zengin", "http://zengin.github.io/"]
 filename: learnfsharp-tr.fs
 lang: tr-tr
 ---

tr-tr/git-tr.html.markdown

@@ -32,7 +32,7 @@ Versiyon kontrol, zaman içerisinde dosya(lar)daki değişikliği kaydeden siste
 * Dağınık versiyon kontrolü değişimin paylaşılmasına odaklanır. Her değişiminin benzersiz bir adı vardır.
 * Dağınık sistemlerin belirlenmiş bir yapısı yoktur. Git ile kolayca SVN'deki gibi merkezi bir sistem elde edebilirsin. 
 
-[Daha fazla bilgi](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Daha fazla bilgi](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Neden Git?
 
@@ -56,7 +56,7 @@ Bir git repo'su .git dizini ve çalışma ağacından oluşur.
 ### .git Dizini (repository bileşeni)
 
 .git dizini bütün konfigrasyon, log, dallanma, HEAD ve daha fazlasını tutar.
-[detaylı liste](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[detaylı liste](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Çalışma Ağacı (repository bileşeni)
 
@@ -95,11 +95,6 @@ head, commit'e bir göstericidir. Bir repository herhangi bir sayıda head'e sah
 * Staged - Modified edilmiş bir dosyayı, sonraki commit'e gitmek üzere işaretler.
 * Committed - Dosyalar Git Veritabanına commit'lendi.  
 
-### Kavramsal Kaynaklar 
-
-* [Bilgisayar Bilimciler için Git](http://eagain.net/articles/git-for-computer-scientists/)
-* [Tasarımcılar için Git](http://hoth.entp.com/output/git_for_designers.html)
-
 ## Komutlar
 
 ### init
@@ -122,7 +117,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
 $ git config --global user.name "My Name"
 ```
 
-[git config hakkında daha fazla bilgi için.](http://git-scm.com/docs/git-config)
+[git config hakkında daha fazla bilgi için.](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -332,7 +327,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Daha fazla örnek için
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -483,7 +478,7 @@ $ git stash pop
 
 Şimdi kendi işine dönmeye hazırsın!
 
-[Ek Okuma.](http://git-scm.com/book/en/v1/Git-Tools-Stashing)
+[Ek Okuma.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
 
 ### rebase (dikkat)
 
@@ -496,7 +491,7 @@ Branch'ta commit'lenen tüm değişimleri al ve onları başka bir branch'ta tek
 $ git rebase master experimentBranch
 ```
 
-[Ek Okuma.](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Ek Okuma.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (dikkat)
 
@@ -576,24 +571,24 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## Daha Fazla Bilgi
 
-* [tryGit - Git'i öğrenmek için eğlenceli interaktif bir yol](http://try.github.io/levels/1/challenges/1)
+* [Git Dallanmayı Öğren -  Git'i web üzerinde öğrenmek için en görsel ve interaktif yol](https://learngitbranching.js.org/)
-
-* [Git Dallanmayı Öğren -  Git'i web üzerinde öğrenmek için en görsel ve interaktif yol](http://learngitbranching.js.org/)
 
 * [Udemy Git Tutorial: Kapsayıcı bir kılavuz](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
 
-* [Git Immersion - Git'in temelinden başlayan bir tur](http://gitimmersion.com/)
+* [Git Immersion - Git'in temelinden başlayan bir tur](https://gitimmersion.com/)
 
-* [git-scm - Video Tutorial](http://git-scm.com/videos)
+* [git-scm - Video Tutorial](https://git-scm.com/videos)
 
-* [git-scm - Dökümantasyon](http://git-scm.com/docs)
+* [git-scm - Dökümantasyon](https://git-scm.com/docs)
 
 * [Atlassian Git - Tutorial & Workflow](https://www.atlassian.com/git/)
 
-* [SalesForce Kopya Kağıdı](http://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
+* [SalesForce Kopya Kağıdı](https://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
 
-* [Git - Basit bir kılavuz](http://rogerdudler.github.io/git-guide/index.html)
+* [git - basit rehber](https://rogerdudler.github.io/git-guide/index.tr.html)
 
-* [Pro Git](http://www.git-scm.com/book/en/v2)
+* [Pro Git](https://git-scm.com/book/tr/v2)
 
-* [Yeni başlayanlar için Git ve GitHub](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+* [Yeni başlayanlar için Git ve GitHub](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
+
+* [Bilgisayar Bilimciler için Git](https://eagain.net/articles/git-for-computer-scientists/)

tr-tr/typescript-tr.html.markdown

@@ -3,7 +3,7 @@ language: TypeScript
 contributors:
     - ["Philippe Vlérick", "https://github.com/pvlerick"]
 translators:
-    - ["Mustafa Zengin", "http://zengin.github.com"]
+    - ["Mustafa Zengin", "http://zengin.github.io"]
 filename: learntypescript-tr.ts
 lang: tr-tr
 ---

vi-vn/git-vi.html.markdown

@@ -26,7 +26,7 @@ Version Control là một hệ thống ghi lại những thay đổi ở một t
 * Quản lý phiên bản phân tán (Distributed Versioning) tập trung vào việc chia sẻ các thay đổi. Mỗi sự thay đổi có một mã định dạng (id) duy nhất.
 * Các hệ phân tán không có cấu trúc định sẵn. Bạn có thể thay đổi một kiểu SVN, hệ phân tán, với git.
 
-[Thông tin thêm](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[Thông tin thêm](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### Tại Sao Dùng Git?
 
@@ -50,7 +50,7 @@ Một git repository bao gồm thư mục .git & tree đang làm việc.
 ### Thư mục .git (thành phần của một repository)
 
 Thư mục .git chứa tất cả các cấu hình, log, nhánh, HEAD, và hơn nữa.
-[Danh Sách Chi Tiết.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[Danh Sách Chi Tiết.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### Tree Đang Làm (thành phần của một repository)
 
@@ -79,12 +79,6 @@ con trỏ này sẽ cập nhật tự động và trỏ đến commit mới nh
 HEAD là một con trỏ đến branch hiện tại. Một repo chỉ có một HEAD *đang hoạt động*.
 head là một con trỏ đến bất kỳ commit nào. Một repo có thể có nhiều head.
 
-### Các Tài Nguyên Mang Tính Khái Niệm
-
-* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
-* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## Các Lệnh
 
 
@@ -113,7 +107,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
 $ git config --global user.name "My Name"
 ```
 
-[Tìm hiểu thêm về git config.](http://git-scm.com/docs/git-config)
+[Tìm hiểu thêm về git config.](https://git-scm.com/docs/git-config)
 
 ### help
 
@@ -258,7 +252,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 Google để xem thêm các ví dụ
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -347,7 +341,7 @@ Lấy tất cả các thay đổi mà đã được commit trên một nhánh, v
 $ git rebase master experimentBranch
 ```
 
-[Đọc Thêm.](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[Đọc Thêm.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (thận trọng)
 
@@ -386,16 +380,12 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## Thông tin thêm
 
-* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)
+* [git-scm - Video Tutorials](https://git-scm.com/videos)
 
-* [git-scm - Video Tutorials](http://git-scm.com/videos)
+* [git-scm - Documentation](https://git-scm.com/docs)
-
-* [git-scm - Documentation](http://git-scm.com/docs)
 
 * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [Git - the simple guide](https://rogerdudler.github.io/git-guide/index.html)
-
-* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html)
-
 
+* [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

vi-vn/html-vi.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-vi.html
+filename: learnhtml-vi.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

vim.html.markdown

@@ -54,6 +54,7 @@ specific points in the file, and for fast editing.
     ?word             # Highlights all occurrences of word before cursor
     n                 # Moves cursor to next occurrence of word after search
     N                 # Moves cursor to previous occurrence of word
+    :nohl             # Clear highlights of last search
 
     :%s/foo/bar/g     # Change 'foo' to 'bar' on every line in the file
     :s/foo/bar/g      # Change 'foo' to 'bar' on the current line

wikitext.html.markdown

@@ -58,6 +58,7 @@ The syntax for tables is [very complicated](https://en.wikipedia.org/wiki/Help:T
 ```
 
 which renders to
+
 | **column title A** | **column title B** |
 |---|---|
 | cell A1 | cell B1 |
@@ -120,6 +121,7 @@ If a word is interrupted by a link, it is "blended" into the link. For example,
 To suppress this behavior, use `<nowiki>`. For example, `[[micro-]]<nowiki />second` renders to [micro-](https://en.wikipedia.org/wiki/micro-)second.
 
 There are three kinds of external linking. The third kind is preferred:
+
 | wikitext | renders to |
 |----|----|
 | `https://www.wikipedia.org` | [https://www.wikipedia.org](https://www.wikipedia.org) |

zh-cn/angularjs-cn.html.markdown

@@ -3,7 +3,7 @@ category: framework
 framework: AngularJS
 contributors:
     - ["Walter Cordero", "http://waltercordero.com"]
-filename: learnangular-cn.html
+filename: learnangular-cn.txt
 translators:
    - ["Jiang Haiyun", "http://www.atjiang.com"]
 lang: zh-cn

zh-cn/bf-cn.html.markdown

@@ -12,7 +12,7 @@ lang: zh-cn
 
 Brainfuck 是一个极小的只有8个指令的图灵完全的编程语言。
 
-```
+```bf
 除"><+-.,[]"之外的的任何字符都会被忽略 (不包含双引号)。
 
 Brainfuck 包含一个有30,000个单元为0的数组，和

zh-cn/git-cn.html.markdown

@@ -24,7 +24,7 @@ Git可以为你的项目保存若干快照，以此来对整个项目进行版
 * 分布式版本控制则更注重共享更改。每一次更改都有唯一的标识
 * 分布式系统没有预定的结构。你也可以用git很轻松的实现SVN风格的集中式系统控制
 
-[更多信息](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+[更多信息](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
 
 ### 为什么要使用Git
 
@@ -47,7 +47,7 @@ Git可以为你的项目保存若干快照，以此来对整个项目进行版
 ### .git 目录(版本库的一部分)
 
 .git 目录包含所有的配置、日志、分支信息、头指针等
-[详细列表](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+[详细列表](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
 
 ### 工作目录 (版本库的一部分)
 
@@ -74,12 +74,6 @@ Git可以为你的项目保存若干快照，以此来对整个项目进行版
 头指针是一个指向当前分支的指针，一个版本库只有一个当前活动的头指针
 而头则可以指向版本库中任意一个提交，每个版本库也可以有多个头
 
-### 其他形象化解释
-
-* [给计算机科学家的解释](http://eagain.net/articles/git-for-computer-scientists/)
-* [给设计师的解释](http://hoth.entp.com/output/git_for_designers.html)
-
-
 ## 命令
 
 
@@ -105,7 +99,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
 $ git config --global user.name "My Name"
 ```
 
-[关于git的更多设置](http://git-scm.com/docs/git-config)
+[关于git的更多设置](https://git-scm.com/docs/git-config)
 
 ### 帮助
 
@@ -247,7 +241,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
 ```
 
 更多的例子可以查看：
-[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+[Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
 
 ### log
 
@@ -324,7 +318,7 @@ $ git push origin master
 $ git rebase master experimentBranch
 ```
 
-[更多阅读](http://git-scm.com/book/en/Git-Branching-Rebasing)
+[更多阅读](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 
 ### reset (谨慎使用)
 
@@ -361,12 +355,10 @@ $ git rm /pather/to/the/file/HelloWorld.c
 
 ## 更多阅读
 
-* [tryGit - 学习Git的有趣方式](http://try.github.io/levels/1/challenges/1)
+* [git-scm - 视频教程](https://git-scm.com/videos)
 
-* [git-scm - 视频教程](http://git-scm.com/videos)
+* [git-scm - 文档](https://git-scm.com/docs)
-
-* [git-scm - 文档](http://git-scm.com/docs)
 
 * [Atlassian Git - 教程与工作流程](https://www.atlassian.com/git/)
 
-* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+* [给计算机科学家的解释](https://eagain.net/articles/git-for-computer-scientists/)

zh-cn/html-cn.html.markdown

@@ -1,6 +1,6 @@
 ---
 language: HTML
-filename: learnhtml-cn.html
+filename: learnhtml-cn.txt
 contributors:
     - ["Christophe THOMAS", "https://github.com/WinChris"]
 translators:

zh-cn/standard-ml-cn.html.markdown

@@ -5,7 +5,7 @@ contributors:
     - ["David Pedersen", "http://lonelyproton.com/"]
     - ["James Baker", "http://www.jbaker.io/"]
     - ["Leo Zovic", "http://langnostic.inaimathi.ca/"]
-filename: standard-ml-cn.html
+filename: standard-ml-cn.sml
 translators:
    - ["Buqian Zheng", "https://github.com/zhengbuqian"]
 lang: zh-cn