Fix conflicts

.gitignore

@@ -1,3 +1,4 @@
 _site/
 .vagrant
+.jekyll-metadata
 .conflicts

.travis.yml

@@ -6,13 +6,13 @@ sudo: false
 install:
  - bundle config build.nokogiri --use-system-libraries
  - travis_retry bundle install
- - gem install mdl -v 0.2.1
- - gem install html-proofer -v 2.6.1
+ - gem install mdl -v 0.3.1
+ - gem install html-proofer -v 3.0.6
 
 script:
  - jekyll build
  - mdl -s markdownlint-config.rb . || true  # markdownlint errors shouldn't fail the build for now
- - htmlproof ./_site --disable-external --allow-hash-href --check-html
+ - htmlproofer ./_site --disable-external --allow-hash-href --check-html
 
 branches:
   only:

Gemfile.lock

@@ -1,137 +1,130 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.5)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
-      fast-stemmer (~> 1.0)
+    addressable (2.4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorator (0.1)
-    ethon (0.8.0)
+    colorator (1.1.0)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fast-stemmer (1.0.2)
-    ffi (1.9.10)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
     gemoji (2.1.0)
-    github-pages (40)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (= 0.5.3)
-      jekyll (= 2.4.0)
+    github-pages (93)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.2.0)
+      jekyll (= 3.2.1)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.3.1)
+      jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-mentions (= 0.2.1)
+      jekyll-github-metadata (= 2.0.2)
+      jekyll-mentions (= 1.1.3)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.8.0)
+      jekyll-redirect-from (= 0.11.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-sitemap (= 0.9.0)
-      jemoji (= 0.5.0)
-      kramdown (= 1.9.0)
-      liquid (= 2.6.2)
-      maruku (= 0.7.0)
+      jekyll-seo-tag (= 2.0.0)
+      jekyll-sitemap (= 0.10.0)
+      jemoji (= 0.7.0)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
+      minima (= 1.0.1)
+      rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.5.3)
+    github-pages-health-check (1.2.0)
       addressable (~> 2.3)
       net-dns (~> 0.8)
+      octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (1.9.0)
+    html-pipeline (2.4.2)
       activesupport (>= 2)
-      nokogiri (~> 1.4)
+      nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (2.4.0)
-      classifier-reborn (~> 2.0)
-      colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
+    jekyll (3.2.1)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.3.1)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-mentions (0.2.1)
-      html-pipeline (~> 1.9.0)
-      jekyll (~> 2.0)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-mentions (1.1.3)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.8.0)
+    jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.9.0)
-    jekyll-watch (1.3.0)
-      listen (~> 3.0)
-    jemoji (0.5.0)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
+    jekyll-sitemap (0.10.0)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
       gemoji (~> 2.0)
-      html-pipeline (~> 1.9)
-      jekyll (>= 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
     json (1.8.3)
-    kramdown (1.9.0)
-    liquid (2.6.2)
-    listen (3.0.5)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    maruku (0.7.0)
-    mercenary (0.3.5)
-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minima (1.0.1)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    octokit (4.2.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    public_suffix (1.5.2)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    pkg-config (1.1.7)
+    public_suffix (1.5.3)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.20)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
+    terminal-table (1.6.0)
     thread_safe (0.3.5)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby

README.md

@@ -60,7 +60,7 @@ Para mudanças maiores, usar o editor web do GitHub não é muito conveniente. U
 
 Depois que você clonou o seu fork do repositório, rode os seguintes comandos:
  1. `bundle install` - baixa as bibliotecas necessárias ao Jekyll
- 2. `jekyll serve` - constroi o site e roda um servidor local na porta 4000
+ 2. `bundle exec jekyll serve` - constroi o site e roda um servidor local na porta 4000
 
 **Nota:** você pode adicionar a opção `--watch` ao executar `jekyll serve` para que o Jekyll monitore as mudanças de arquivo, o que significa que o site será reconstruido quand um arquivo é modificado.</br>
 **Nota 2:** em sistemas de arquivos sem diferenciação de maiúsculas/minúsculas como no Windows e Mac OS X você pode cair em laços infinitos de redirecionamento com algumas URLs. 

_config.yml

@@ -1,5 +1,5 @@
 # Blog specific settings
-paginate_path: "news/page/:num"
+paginate_path: "news/page/:num/"
 paginate: 5
 
 # General settings
@@ -9,6 +9,8 @@ markdown: kramdown
 kramdown:
   input: GFM
   hard_wrap: false
+  syntax_highlighter_opts:
+    disable : true
 feed:
   path: atom.xml
 defaults:
@@ -38,6 +40,7 @@ defaults:
 gems:
   - jekyll-redirect-from
   - jekyll-feed
+  - jekyll-paginate
 exclude:
   - CNAME
   - README.md

_data/alpharelease.yml

@@ -1,5 +1,5 @@
-version: 4.2 SR1 alpha 2 (4.2.2.10)
-mono_mac_url: http://download.mono-project.com/archive/4.2.2/macos-10-x86/MonoFramework-MDK-4.2.2.10.macos10.xamarin.x86.pkg
-mono_mac64_url: http://download.mono-project.com/archive/4.2.1/macos-10-universal/MonoFramework-MDK-4.2.1.102.macos10.xamarin.universal.pkg
-mono_windows_url: http://download.mono-project.com/archive/4.2.2/windows-installer/mono-4.2.2.10-gtksharp-2.12.30-win32-0.msi
-gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.30.msi
+version: 4.6 Beta Preview 3 (4.6.0.182)
+mono_mac_url: http://download.mono-project.com/archive/4.6.0/macos-10-universal/MonoFramework-MDK-4.6.0.182.macos10.xamarin.universal.pkg
+mono_windows_url: http://download.mono-project.com/archive/4.6.0/windows-installer/mono-4.6.0.182-gtksharp-2.12.38-win32-0.msi
+mono_windows64_url: http://download.mono-project.com/archive/4.6.0/windows-installer/mono-4.6.0.182-x64-0.msi
+gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.38.msi

_data/betarelease.yml

@@ -1,5 +1,5 @@
-version: 4.2 Stable (4.2.1.102)
-mono_mac_url: http://download.mono-project.com/archive/4.2.1/macos-10-x86/MonoFramework-MDK-4.2.1.102.macos10.xamarin.x86.pkg
-mono_mac64_url: http://download.mono-project.com/archive/4.2.1/macos-10-universal/MonoFramework-MDK-4.2.1.102.macos10.xamarin.universal.pkg
-mono_windows_url: http://download.mono-project.com/archive/4.2.1/windows-installer/mono-4.2.1.102-gtksharp-2.12.30-win32-0.msi
-gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.30.msi
+version: 4.6 Beta Preview 3 (4.6.0.182)
+mono_mac_url: http://download.mono-project.com/archive/4.6.0/macos-10-universal/MonoFramework-MDK-4.6.0.182.macos10.xamarin.universal.pkg
+mono_windows_url: http://download.mono-project.com/archive/4.6.0/windows-installer/mono-4.6.0.182-gtksharp-2.12.38-win32-0.msi
+mono_windows64_url: http://download.mono-project.com/archive/4.6.0/windows-installer/mono-4.6.0.182-x64-0.msi
+gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.38.msi

_data/latestrelease.yml

@@ -1,5 +1,5 @@
-version: 4.2 Stable (4.2.1.102)
-mono_mac_url: http://download.mono-project.com/archive/4.2.1/macos-10-x86/MonoFramework-MDK-4.2.1.102.macos10.xamarin.x86.pkg
-mono_mac64_url: http://download.mono-project.com/archive/4.2.1/macos-10-universal/MonoFramework-MDK-4.2.1.102.macos10.xamarin.universal.pkg
-mono_windows_url: http://download.mono-project.com/archive/4.2.1/windows-installer/mono-4.2.1.102-gtksharp-2.12.30-win32-0.msi
-gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.30.msi
+version: 4.4 SR1 (4.4.2.11)
+mono_mac_url: http://download.mono-project.com/archive/4.4.2/macos-10-universal/MonoFramework-MDK-4.4.2.11.macos10.xamarin.universal.pkg
+mono_windows_url: http://download.mono-project.com/archive/4.4.2/windows-installer/mono-4.4.2.11-gtksharp-2.12.38-win32-0.msi
+mono_windows64_url: http://download.mono-project.com/archive/4.4.2/windows-installer/mono-4.4.2.11-x64-0.msi
+gtksharp_windows_url: http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.38.msi

_layouts/base.html

@@ -9,22 +9,22 @@
     <title>{{ page.title }} | MonoBrasil</title>
     <link rel="shortcut icon" href="/favicon.ico" />
     {% feed_meta %}
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/css/normalize.min.css" />
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/css/foundation.min.css" />
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css" />
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/styles/github.min.css" />
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/0.9.9/magnific-popup.css" />
-    <link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans' />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/css/normalize.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/css/foundation.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/styles/github.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/0.9.9/magnific-popup.css" />
+    <link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Open+Sans' />
     <link rel="stylesheet" href="/css/main.css?version={{site.time | date_to_xmlschema | cgi_escape}}" />
-    <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.2/modernizr.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.2/modernizr.min.js"></script>
     <script>
       // redirect to the real domain in case someone visits the GitHub Pages domain
       if (window.location.hostname === 'mono.github.io') {
         window.location.replace(window.location.href.replace("mono.github.io/website", "www.mono-project.com"));
       }
     </script>
     <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
       ga('create', 'UA-76510-1', 'auto');
       ga('send', 'pageview');
@@ -154,12 +154,20 @@ <h1><a href="/"><img alt="Mono Logo" src="/images/mono-gorilla.svg" onerror="thi
           <section class="top-bar-section">
             <!-- Right Nav Section -->
             <ul class="right">
+<<<<<<< HEAD
               <li {% if page.navgroup == "home" %}class="active"{% endif %}><a href="/"><i class="fa fa-home"></i> Início</a></li>
               <li {% if page.navgroup == "Brasil" %}class="active"{% endif %}><a href="/Brasil"><i class="fa fa-globe"></i> <span style="color:chartreuse">B</span><span style="color:yellow">r</span><span style="color:chartreuse">a</span><span style="color:yellow">s</span><span style="color:chartreuse">i</span><span style="color:yellow">l</span></a></li>
               <li {% if page.navgroup == "download" %}class="active"{% endif %}><a href="/download/"><i class="fa fa-download"></i> Download</a></li>
               <li {% if page.navgroup == "docs" %}class="active"{% endif %}><a href="/docs/"><i class="fa fa-book"></i> Documentação</a></li>
               <li {% if page.navgroup == "news" %}class="active"{% endif %}><a href="/news/"><i class="fa fa-bullhorn"></i> Novidades</a></li>
               <li {% if page.navgroup == "community" %}class="active"{% endif %}><a href="/community/"><i class="fa fa-github"></i> Communidade</a></li>
+=======
+              <li {% if page.navgroup == "home" or layout.navgroup == "home" %}class="active"{% endif %}><a href="/"><i class="fa fa-home"></i> Home</a></li>
+              <li {% if page.navgroup == "download" or layout.navgroup == "download" %}class="active"{% endif %}><a href="/download/"><i class="fa fa-download"></i> Download</a></li>
+              <li {% if page.navgroup == "docs" or layout.navgroup == "docs" %}class="active"{% endif %}><a href="/docs/"><i class="fa fa-book"></i> Documentation</a></li>
+              <li {% if page.navgroup == "news" or layout.navgroup == "news" %}class="active"{% endif %}><a href="/news/"><i class="fa fa-bullhorn"></i> News</a></li>
+              <li {% if page.navgroup == "community" or layout.navgroup == "community" %}class="active"{% endif %}><a href="/community/"><i class="fa fa-github"></i> Community</a></li>
+>>>>>>> b3061d82ccb7ad3bc4b30a4aa727bf34fa8a3e9d
               <li class="has-form">
                 <form id="header-searchform" action="https://www.google.com/search" method="get">
 				<div class="row collapse">
@@ -206,10 +214,10 @@ <h1><a href="/"><img alt="Mono Logo" src="/images/mono-gorilla.svg" onerror="thi
       </div>
     </footer>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/js/foundation.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/highlight.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/0.9.9/jquery.magnific-popup.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/5.3.0/js/foundation.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/0.9.9/jquery.magnific-popup.min.js"></script>
 
     <script>
       // allow sub pages to run custom code

_layouts/releasenotes.html

@@ -8,7 +8,7 @@
 {% else %}
 <div class="row">
   <div class="small-12 columns">
-     <div data-alert class="alert-box warning"><h6><i class="fa fa-warning"></i> This page is a <strong>DRAFT</strong> and might not reflect the final release. The specified Mono version has not been released yet, we only use this document to track the major themes.</div>
+     <div data-alert class="alert-box warning"><h6><i class="fa fa-warning"></i> These notes are for a current or upcoming <strong>PREVIEW RELEASE</strong> and might not reflect the final release.</div>
   </div>
 </div>
 {% endif %}