Merge branch 'master' into 'master'

add 1 article, update urls.ml + remove typos here and there

See merge request OCamlPro/www!64

src/content/blog/2014_04_01_the_generic_syntax_extension.md

@@ -23,7 +23,7 @@ is rewriten to
 How is that generic ? We will present you a few examples.
 
 #### Base 3 Numbers
-For instance, if you want to declare base 3 arbitrary big numbers, let’s define a syntax for it. We first start by declaring some types.
+For instance, if you want to declare base 3 arbitrary big numbers, let's define a syntax for it. We first start by declaring some types.
 
 ```ocaml
 type start = Start of p
@@ -155,7 +155,7 @@ and format : type t. t f -> t = function
 let (!!) cons = print cons
 ```
 
-And voila! `<span class="keyword2">`
+And voila!
 
 ```ocaml
 let s = !! "%i %c" 1 'c';;

src/content/blog/2018_07_20_new_updates_on_tzscan_2.md

+title=OCamlPro’s Tezos block explorer TzScan’s last updates 
+authors=Çagdas Bozman
+date=2018-07-20
+category=Blockchains
+tags=tzscan,block,explorer
+
+OCamlPro is pleased to announce the latest update of TZScan ([https://tzscan.io](http://tzscan.io)), its Tezos block explorer to ease the use of the Tezos network. TzScan is now ready for the protocol update scheduled for tomorrow. In addition to some minor bugfixes, the main novelties are: 
+
+- Displaying of obtained and [expected rewards](https://tzscan.io/tz3UoffC7FG7zfpmvmjUmUeAaHvzdcUvAj6r?default=rewards)
+- Adding of [internal transactions](https://tzscan.io/tz3UoffC7FG7zfpmvmjUmUeAaHvzdcUvAj6r) of smart contracts
+- Adding of [delegation services](https://tzscan.io/delegation-services)
+- Aliasing of known account and sponsors
+- Improvements of UX, and faster navigation
+- Improvements on desktop, tablets and mobiles
+
+We continue to maintain the alphanet and zeronet branches in parallel of the betanet.
+
+We keep on working hard to improve and add new features to TzScan. Further enhancements and optimizations are to come. Enjoy and play with our explorer!
+If you have any suggestions or bugs to report, please notify us at [contact@tzscan.io ](mailto:contact@tzscan.io)
+

src/content/blog/2020_02_04_2019_at_ocamlpro.md

@@ -99,7 +99,7 @@ After the release of [Alt-Ergo 2.2.0](https://ocamlpro.com/2018/04/23/release-of
 
 * More information on the [Alt-Ergo SMT Solver](https://alt-ergo.ocamlpro.com/)
 * Albin Coquereau defended his PhD thesis in Decembre 2019 "Improving performance of the SMT solver Alt-Ergo with a better integration of efficient SAT solver"
-* We participated in the SMT-COMP 2019 during the 22nd SAT conference. The results of the competition are detailed [here.](https://ocamlpro.com/2019/07/09/alt-ergo-participation-to-the-smt-comp-2019/)  
+* We participated in the SMT-COMP 2019 during the 22nd SAT conference. The results of the competition are detailed [here.](https://ocamlpro.com/2019/07/09/alt-ergo-participation-to-the-smt-comp-2019/)
 
 ### The launch of the Alt-Ergo Users' Club
 
@@ -153,6 +153,6 @@ For the [record](https://ocamlpro.com/2019/04/29/blockchains-at-ocamlpro-an-over
 * (April 2019) We had started Techelson: a testing framework for Michelson and Liquidity
 * (Nov 2018) [An Introduction to Tezos RPCs: Signing Operations](https://ocamlpro.com/2018/11/21/an-introduction-to-tezos-rpcs-signing-operations/) / [An Introduction to Tezos RPCs: a Basic Wallet](https://ocamlpro.com/2018/11/15/an-introduction-to-tezos-rpcs-a-basic-wallet/) / [Liquidity Tutorial: A Game with an Oracle for Random Numbers](https://ocamlpro.com/2018/11/06/liquidity-tutorial-a-game-with-an-oracle-for-random-numbers/) / [First Open-Source Release of TzScan](https://ocamlpro.com/2018/11/08/first-open-source-release-of-tzscan/)
 * (Oct 2018) [OCamlPro’s TZScan grant proposal accepted by the Tezos Foundation – joint press release ](https://ocamlpro.com/2018/10/17/ocamlpros-tzscan-grant-proposal-accepted-by-the-tezos-foundation-joint-press-release/)
-* (Jul 2018) [OCamlPro’s Tezos block explorer TzScan’s last updates](https://ocamlpro.com/2018/07/20/new-updates-on-tzscan-2/)
+* (Jul 2018) [OCamlPro’s Tezos block explorer TzScan’s last updates](/blog/2018_07_20_new_updates_on_tzscan_2)
 * (Feb 2018) [Release of a first version of TzScan.io, a Tezos block explorer](https://ocamlpro.com/2018/02/14/release-of-a-first-version-of-tzscan-io-a-tezos-block-explorer/) / [OCamlPro’s Liquidity-lang demo at JFLA2018 – a smart-contract design language](https://ocamlpro.com/2018/11/06/liquidity-tutorial-a-game-with-an-oracle-for-random-numbers/) . We were developing [Liquidity](https://www.liquidity-lang.org/), a high level smart contract language, human-readable, purely functional, statically-typed, which syntax was very close to the OCaml syntax.
 * To garner interest and adoption, we also developed the online editor [Try Liquidity](https://www.liquidity-lang.org/edit). Smart-contract developers could design contracts interactively, directly in the browser, compile them to Michelson, run them and deploy them on the alphanet network of Tezos. Future plans included a full-fledged web-based IDE for Liquidity. Worth mentioning was a neat feature: decompiling a Michelson program back to its Liquidity version, whether it was generated from Liquidity code or not.

src/urls.ml

@@ -8,7 +8,6 @@ let old_to_new =
   ; ("/fr/recrutement-ocamlpro/", "/jobs")
   ; ( "https://www.ocamlpro.com/pre-inscription-a-une-session-de-formation-inter-entreprises/"
     , "/" )
-  ; ("https://www.ocamlpro.com/2018/07/20/new-updates-on-tzscan-2/", "/")
   ; ( "https://www.ocamlpro.com/2018/07/20/ocamlpros-tezos-block-explorer-tzscans-last-updates/"
     , "/" )
   ; ( "https://www.ocamlpro.com/2018/10/17/ocamlpros-tzscan-grant-proposal-accepted-by-the-tezos-foundation-joint-press-release/"
@@ -193,6 +192,8 @@ let old_to_new =
       , "/blog/2018_04_23_release_of_alt_ergo_2_2_0" )
     ; ( "/2018/05/22/opam-2-0-0-release-candidate-2-is-out/"
       , "/blog/2018_05_22_opam_2.0.0_release_candidate_2_is_out" )
+    ; ( "/2018/07/20/new-updates-on-tzscan-2/"
+      , "/blog/2018_07_20_new_updates_on_tzscan_2" )
     ; ( "/2018/07/26/opam-2-0-0-rc4-final-is-out/"
       , "/blog/2018_07_26_opam_2.0.0_rc4_final_is_out" )
     ; ( "/2018/09/19/opam-2-0-0-release-and-repository-upgrade/"