zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin-website] branch master updated: Cleans up most references to OpenZipkin for Apache (#16)
Date Wed, 05 Jun 2019 09:25:01 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 762a943  Cleans up most references to OpenZipkin for Apache (#16)
762a943 is described below

commit 762a9433b27c3f9a7e10366029f36baf4aca042c
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Wed Jun 5 17:24:56 2019 +0800

    Cleans up most references to OpenZipkin for Apache (#16)
    
    This removes some outdated content and updates others towards official
    repository locations and such.
---
 .circleci/update-asf-site.sh                 |  2 +-
 CNAME                                        |  1 -
 Gemfile.lock                                 | 50 ++++++++++++++--------------
 README.md                                    | 29 ++++++----------
 _config.yml                                  |  4 +--
 _data/openzipkin_extensions.yml              | 15 ---------
 _data/openzipkin_tracers_instrumentation.yml |  2 +-
 _data/sidebar_links.yml                      |  4 +--
 _includes/sidebar.html                       |  2 +-
 generate_thrift_v1_docs/generate.sh          | 13 +++++---
 index.md                                     |  4 +--
 pages/community.md                           | 17 ++++------
 pages/extensions_choices.md                  | 10 +++---
 pages/instrumenting.md                       | 10 +++---
 pages/quickstart.md                          |  4 +--
 pages/tracers_instrumentation.md             |  8 ++---
 public/thrift/v1/index.html                  | 36 +++++++-------------
 17 files changed, 86 insertions(+), 125 deletions(-)

diff --git a/.circleci/update-asf-site.sh b/.circleci/update-asf-site.sh
index 2d6e0cf..6bcbb71 100755
--- a/.circleci/update-asf-site.sh
+++ b/.circleci/update-asf-site.sh
@@ -18,7 +18,7 @@ readonly builddir="$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')"
 readonly master_sha="$(git rev-parse --short HEAD)"
 
 # Grab the target branch, delete the existing files so we can do a clean build
-git clone --branch asf-site -- git@github.com:openzipkin/openzipkin.github.io "$builddir"
+git clone --branch asf-site -- git@github.com:apache/incubator-zipkin-website "$builddir"
 rm -rf "${builddir:?}/*"
 
 # Generate the site
diff --git a/CNAME b/CNAME
deleted file mode 100644
index 0629d70..0000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-zipkin.io
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b73a18..59d0c52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     coffee-script (2.4.1)
       coffee-script-source
@@ -15,7 +15,7 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     dnsruby (1.61.2)
       addressable (~> 2.5)
     em-websocket (0.5.1)
@@ -27,13 +27,13 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (197)
-      activesupport (= 4.2.10)
+    gemoji (3.0.1)
+    github-pages (198)
+      activesupport (= 4.2.11.1)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.7.4)
+      jekyll (= 3.8.5)
       jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
@@ -81,13 +81,13 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.10.0)
+    html-pipeline (2.11.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -105,9 +105,9 @@ GEM
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.2.0)
+    jekyll-commonmark (1.3.1)
       commonmarker (~> 0.14)
-      jekyll (>= 3.0, < 4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-commonmark-ghpages (0.1.5)
       commonmarker (~> 0.17.6)
       jekyll-commonmark (~> 1)
@@ -185,7 +185,7 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-watch (2.1.2)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
     jemoji (0.10.2)
       gemoji (~> 3.0)
@@ -204,14 +204,14 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
-    multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -219,16 +219,16 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     safe_yaml (1.0.5)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
@@ -236,16 +236,16 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
     yaml-lint (0.0.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (= 197)
+  github-pages (= 198)
   terminal-table (~> 1.4)
   yaml-lint (~> 0.0.9)
 
 BUNDLED WITH
-   1.17.3
\ No newline at end of file
+   1.17.2
diff --git a/README.md b/README.md
index 8c8870b..932ad6a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
-# openzipkin.github.io
+# zipkin-website
 
-This repository contains the source code for the Zipkin documentation site
-https://zipkin.apache.org/. It's the
+This repository contains the source code for the Zipkin web site https://zipkin.apache.org/.
It's the
 [organization page](https://help.github.com/articles/user-organization-and-project-pages/)
-for [`openzipkin`](https://github.com/openzipkin/), hosted using
+for [Apache Zipkin (incubating) projects](https://github.com/apache?utf8=%E2%9C%93&q=incubator-zipkin&type=&language=),
hosted using
 [GitHub pages and Jekyll](https://help.github.com/articles/using-jekyll-as-a-static-site-generator-with-github-pages/).
 This means that everything on the `master` branch is immediately and
 automatically published.
@@ -47,7 +46,7 @@ Windows.
    
 1. **Clone the repository**
 
-        git clone https://github.com/openzipkin/openzipkin.github.io.git
+        git clone https://github.com/apache/incubator-zipkin-website.git
         
 1. **Install Jekyll and friends**
 
@@ -59,7 +58,7 @@ Windows.
    [`Gemfile.lock`](Gemfile.lock) makes sure we all have the same versions
    locally). To install these packages:
    
-        cd openzipkin.github.io
+        cd incubator-zipkin-website
         bundle
         
 1. **Run the site**
@@ -102,12 +101,6 @@ basic idea of what's what:
    [EditorConfig](http://editorconfig.org/) configuration that makes sure
    editors supporting EditorConfig format files in this repository in the same
    way (think spaces vs tabs)
- * [`CNAME`](CNAME) tells GitHub pages that this site should be served at
-   [http://zipkin.io](http://zipkin.io) instead of
-   [http://openzipkin.zipkin.io](http://openzipkin.zipkin.io). For details on
-   how, see
-   [https://help.github.com/articles/using-a-custom-domain-with-github-pages/](Using
-   a custom domain with GitHub Pages)
  * [`Gemfile`](Gemfile) and [`Gemfile.lock`](Gemfile.lock) describe the Ruby
    packages used for building and serving this site; see the documentation of
    [Bundler](http://bundler.io/) for more details.
@@ -140,25 +133,25 @@ There are a few things to keep an eye out for while making changes to
the site.
 
 Once you've made your changes, you'll want to create a pull-request, so that the
 changes can be merged into the `master` branch of
-`openzipkin/openzipkin.github.io`, and so published for the betterment of all.
+`apache/incubator-zipkin-website`, and so published for the betterment of all.
 This section describes the steps for getting there, assuming you've followed the
 instructions so far.
 
 1. **Fork this repository**
 
     Go to
-    [openzipkin/openzipkin.github.io](https://github.com/openzipkin/openzipkin.github.io),
+    [apache/incubator-zipkin-website](https://github.com/apache/incubator-zipkin-website),
     and click the "Fork" button. Or just
-    [click here](https://github.com/openzipkin/openzipkin.github.io/fork).
+    [click here](https://github.com/apache/incubator-zipkin-website/fork).
     
 1. **Tell git about your fork**
 
-   We're going to call your fork `origin`, and the original `openzipkin`
+   We're going to call your fork `origin`, and the original `apache`
    repository `upstream`. The following commands tell `git` to make the
    appropriate changes:
    
         git remote rename origin upstream
-        git remote add origin git@github.com:$USER/openzipkin.github.io
+        git remote add origin git@github.com:$USER/incubator-zipkin-website
         git fetch upstream
         
 1. **Create a branch, commit and push your changes**
@@ -169,7 +162,7 @@ instructions so far.
         
 1. **Open a pull-request**
 
-   Open https://github.com/openzipkin/openzipkin.github.io. You should see a bar
+   Open https://github.com/apache/incubator-zipkin-website. You should see a bar
    above the list of files that says you've recently pushed to your branch, with
    a green button on the right to open a pull request. Click it; add text to
    text fields and click buttons as appropriate. See
diff --git a/_config.yml b/_config.yml
index 755674d..5bed062 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,4 @@
-title: OpenZipkin
+title: Apache Zipkin (incubating)
 
 tagline: A distributed tracing system
 
@@ -7,7 +7,7 @@ description: >
   troubleshoot latency problems in microservice architectures.
 
 twitter_username: zipkinproject
-github_username:  openzipkin
+github_username:  apache
 
 defaults:
   -
diff --git a/_data/openzipkin_extensions.yml b/_data/openzipkin_extensions.yml
index b181a92..7f1da73 100644
--- a/_data/openzipkin_extensions.yml
+++ b/_data/openzipkin_extensions.yml
@@ -33,18 +33,3 @@
     [GCP Stackdriver](https://cloud.google.com/stackdriver/)
   notes: only supports sending to an Stackdriver
 
-- type: Collector
-  module: >-
-    [zipkin-collector kafka08](https://github.com/openzipkin/zipkin/tree/master/zipkin-autoconfigure/collector-kafka08)
-  product: >-
-    [Apache kafka](https://kafka.apache.org/)
-  notes: Only use this for Legacy Kafka 0.8-0.9 The default server includes support for Kafka
0.10+
-
-- type: Collector
-  module: >-
-    [zipkin-collector scribe](https://github.com/openzipkin/zipkin/tree/master/zipkin-autoconfigure/collector-scribe)
-  product: >-
-    [Scribe](https://github.com/facebookarchive/scribe)
-  notes:
-
-
diff --git a/_data/openzipkin_tracers_instrumentation.yml b/_data/openzipkin_tracers_instrumentation.yml
index 95ea534..a416fe0 100644
--- a/_data/openzipkin_tracers_instrumentation.yml
+++ b/_data/openzipkin_tracers_instrumentation.yml
@@ -20,7 +20,7 @@
 
 - language: Java
   library: >-
-    [brave](https://github.com/openzipkin/brave)
+    [brave](https://github.com/apache/incubator-zipkin-brave)
   framework: Jersey, RestEASY, JAXRS2, Apache HttpClient, Mysql
   propagation: Http (B3), gRPC (B3)
   transports: Http, Kafka, Scribe
diff --git a/_data/sidebar_links.yml b/_data/sidebar_links.yml
index 4a44b04..216ecc7 100644
--- a/_data/sidebar_links.yml
+++ b/_data/sidebar_links.yml
@@ -1,5 +1,5 @@
-- url: https://github.com/openzipkin/zipkin
-  text: "openzipkin/zipkin"
+- url: https://github.com/apache/incubator-zipkin
+  text: "apache/incubator-zipkin"
   img: GitHub-Mark-Light-32px.png
 
 - url: https://twitter.com/zipkinproject
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 8a04b50..4dd2b8a 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -2,7 +2,7 @@
   <div class="container sidebar-sticky">
     <div class="sidebar-about">
       <a href="{{ site.github.url }}">
-        <img alt="OpenZipkin logo" src="{{ site.github.url }}/public/img/zipkin-logo-200x119.jpg"
+        <img alt="Zipkin logo" src="{{ site.github.url }}/public/img/zipkin-logo-200x119.jpg"
              class="sidebar-logo">
       </a>
       {% for link in site.data.sidebar_links %}
diff --git a/generate_thrift_v1_docs/generate.sh b/generate_thrift_v1_docs/generate.sh
index b44463f..7e3af01 100755
--- a/generate_thrift_v1_docs/generate.sh
+++ b/generate_thrift_v1_docs/generate.sh
@@ -6,7 +6,7 @@ set -x
 # Where's Waldo?
 [ ! -d ./generate_thrift_v1_docs ] && cd ..
 if [ ! -d ./generate_thrift_v1_docs ]; then
-    echo "Please run this script either from the root of the openzipkin.github.io repository"
+    echo "Please run this script either from the root of the incubator-zipkin-website repository"
     echo "or from the generate_thrift_v1_docs folder in that repository."
     exit 1
 fi
@@ -19,9 +19,10 @@ target_dir="${target_root}/thrift/v1"
 rm -rfv "$target_dir"
 
 # Prepare clean workspace
-cd "$(mktemp -d)"
-git clone https://github.com/openzipkin/zipkin-api.git
-cd zipkin-api/thrift
+#   base temp dir to /tmp to avoid having to custom configure OS/x Docker
+cd "$(mktemp -d /tmp/XXXXXXXXXX)"
+git clone https://github.com/apache/incubator-zipkin-api.git
+cd incubator-zipkin-api/thrift
 
 # Generate HTML docs with Thrift
 rm -fv wrapper.thrift
@@ -43,7 +44,9 @@ set -e
 
 # Apply some transforms to the generated HTML
 cp "$rootdir/generate_thrift_v1_docs/transform.xslt" ./
-docker run --rm -v "$PWD:/workspace" -u "$(id -u)" klakegg/saxon \
+# Currently, this image doesn't work with a user override https://github.com/klakegg/docker-saxon/issues/2
+# docker run --rm -v "$PWD:/workspace" -u "$(id -u)" klakegg/saxon xslt \
+docker run --rm -v "$PWD:/workspace" klakegg/saxon xslt \
        -s:/workspace/html/index.tidy.html \
        -xsl:/workspace/transform.xslt \
        -o:/workspace/html/index.baked.html
diff --git a/index.md b/index.md
index 7237a43..167cc5d 100644
--- a/index.md
+++ b/index.md
@@ -19,5 +19,5 @@ Applications are instrumented to report timing data to Zipkin. The Zipkin
UI als
  * See if your platform has a [tracer or instrumentation library]({{ site.github.url }}/pages/tracers_instrumentation)
  * See if a [server extension or alternative]({{ site.github.url }}/pages/extensions_choices)
is relevant to your site.
  * Join the [Zipkin Gitter chat channel](https://gitter.im/openzipkin/zipkin)
- * The source code is on GitHub as [openzipkin/zipkin](https://github.com/openzipkin/zipkin/)
- * Issues are also tracked on [GitHub](https://github.com/openzipkin/zipkin/issues)
+ * The source code is on GitHub as [openzipkin/zipkin](https://github.com/apache/incubator-zipkin/)
+ * Issues are also tracked on [GitHub](https://github.com/apache/incubator-zipkin/issues)
diff --git a/pages/community.md b/pages/community.md
index 2ec6ac6..d1519fb 100644
--- a/pages/community.md
+++ b/pages/community.md
@@ -2,22 +2,19 @@
 title: Zipkin Community
 ---
 
-Zipkin is a tracing system originally created by Twitter and is currently run by
-the OpenZipkin volunteer organization.
+Zipkin is a tracing system originally created by Twitter in 2012. In 2015, the community
took over under the name OpenZipkin. Since late 2018, the Zipkin project entered the Apache
Software Foundation (ASF) Incubator.
 
-### What is OpenZipkin?
-[OpenZipkin](https://github.com/openzipkin/) is the OSS organization that stewards
-Zipkin code, docs, specs and support. It includes github projects, this web site,
-[google groups - mailing list](https://groups.google.com/forum/#!forum/zipkin-user),
+### Who are we?
+The Apache Zipkin (incubating) project team stewards code, docs, specs and support. It includes
github projects, this web site, the [dev list](https://lists.apache.org/list.html?dev@zipkin.apache.org),
 [Twitter](https://twitter.com/zipkinproject) and [gitter](https://gitter.im/openzipkin/zipkin).
 
 ### Keeping up to date
 Follow [@zipkinproject](https://twitter.com/zipkinproject) on Twitter for news
 including release announcements and community events. You can also ask on [gitter](https://gitter.im/openzipkin/zipkin)
about something specific. If you are working on code, you can also
-follow projects like the [server](https://github.com/openzipkin/zipkin) or an [instrumentation](https://zipkin.io/pages/tracers_instrumentation.html)
you use.
+follow projects like the [server](https://github.com/apache/incubator-zipkin) or an [instrumentation](https://zipkin.apache.org/pages/tracers_instrumentation.html)
you use.
 
 ### Being an active part of the community
-OpenZipkin is primarily volunteers, and there are a lot of ways to help. Once you
+Zipkin is primarily a volunteer community, and there are a lot of ways to help. Once you
 are on [gitter](https://gitter.im/openzipkin/zipkin), you might notice others asking
 questions you once asked. A great way to give-back is to help others who are just
 starting. We are at a number of events, and these are a great way to meet others
@@ -27,13 +24,13 @@ interesting on Twitter, tag it with #zipkin so that others can see it.
Last, but
 least, you can get involved with the code, docs and project maintenance.
 
 ### How change works in Zipkin
-Most OpenZipkin efforts start as localized experiments, then progressively build
+Most Zipkin efforts start as localized experiments, then progressively build
 traction before becoming a feature. Before you start a large effort, be it docs or
 a test framework or a feature, check with one of the above channels. Someone may
 already have worked on this in the past and might join your effort. Sometimes,
 features are intentionally absent, usually with rationale documented in an issue.
 Regardless, the best advice is to join the community before proposing change, and
-read one of our [HACKING](https://github.com/openzipkin/brave/blob/master/HACKING.md) files
+read one of our [HACKING](https://github.com/apache/incubator-zipkin-brave/blob/master/HACKING.md)
files
 which explains important aspects of change culture.
 
 ### Logos
diff --git a/pages/extensions_choices.md b/pages/extensions_choices.md
index 412d00e..d89eeff 100644
--- a/pages/extensions_choices.md
+++ b/pages/extensions_choices.md
@@ -9,11 +9,9 @@ Zipkin server bundles extension for span collection and storage. By default
span
 The following modules add storage or transport extensions to the default server build.
 Please refer to their individual documentation for setup and configuration guides.
 
-### OpenZipkin supported
+### Supported
 
-The following extensions are supported by the OpenZipkin team and are hosted at
-the [OpenZipkin GitHub](https://github.com/openzipkin/) group. You can reach out to
-the team on [Zipkin Gitter](https://gitter.im/openzipkin/zipkin/) chat.
+The following extensions are supported by the Zipkin team. You can reach out to the team
on [Gitter](https://gitter.im/openzipkin/zipkin/) chat.
 
 | Type | Module | Related product | Other notes |
 |:-----|:--------|:----------------|:------------|{% for extension in site.data.openzipkin_extensions
%}
@@ -45,11 +43,11 @@ Listed below are alternative backends that accept Zipkin format. Some
use the sa
    - When `COLLECTOR_ZIPKIN_HTTP_PORT=9411` is set, Jaeger exposes a partial implementation
of Zipkin's HTTP POST endpoints
      - http port 9411 accepts `/api/v1/spans` (thrift, json) and `/api/v2/spans` (json, but
not proto) POST requests.
    - When `SPAN_STORAGE_TYPE=kafka` and `zipkin-thrift`, Jaeger reads Zipkin v1 thrift encoded
span messages from a Kafka topic.
-     - Note: The above is a [deprecated practice](https://github.com/openzipkin/zipkin/tree/master/zipkin-collector/kafka#legacy-encoding)
in Zipkin. Most instrumentation bundle multiple spans per message in v2 format.
+     - Note: The above is a [deprecated practice](https://github.com/apache/incubator-zipkin/tree/master/zipkin-collector/kafka#legacy-encoding)
in Zipkin. Most instrumentation bundle multiple spans per message in v2 format.
  - [Pitchfork](https://github.com/HotelsDotCom/pitchfork)
    - Pitchfork exposes the same HTTP POST endpoints Zipkin does. It can also consume spans
from a Kafka topic or a RabbitMQ queue.
      - http port 9411 accepts `/api/v1/spans` (thrift, json) and `/api/v2/spans` (json, proto)
POST requests.
 
 Did we miss a server extension or alternative? Please open a pull-request to
-[openzipkin.github.io](https://github.com/openzipkin/openzipkin.github.io).
+[zipkin-website](https://github.com/apache/incubator-zipkin-website).
 
diff --git a/pages/instrumenting.md b/pages/instrumenting.md
index 4ea6d6b..7dba0df 100644
--- a/pages/instrumenting.md
+++ b/pages/instrumenting.md
@@ -26,7 +26,7 @@ Alright, ready? Here we go.
 Core data structures
 =====
 
-Core data structures are documented in detail in [Thrift](https://github.com/openzipkin/zipkin-api/blob/master/thrift/zipkinCore.thrift)
comments. Here's a high-level description to get you started:
+Core data structures are documented in detail in [Thrift](https://github.com/apache/incubator-zipkin-api/blob/master/thrift/zipkinCore.thrift)
comments. Here's a high-level description to get you started:
 
 **Annotation**
 
@@ -154,7 +154,7 @@ information for the request.
 * Flags - Provides the ability to create and communicate feature flags. This is how
 we can tell downstream services that this is a "debug" request.
 
-Check [here](https://github.com/openzipkin/b3-propagation) for the format.
+Check [here](https://github.com/apache/incubator-zipkin-b3-propagation) for the format.
 
 [Finagle](https://twitter.github.io/finagle/) provides mechanisms for passing this information
with HTTP and Thrift
 requests. Other protocols will need to be augmented with the information for
@@ -189,7 +189,7 @@ Ids are encoded as [hex strings](https://github.com/twitter/finagle/blob/master/
 * X-B3-Sampled: Boolean (either "1" or "0", can be absent)
 * X-B3-Flags: "1" means debug (can be absent)
 
-For more information on B3, please see its [specification](https://github.com/openzipkin/b3-propagation).
+For more information on B3, please see its [specification](https://github.com/apache/incubator-zipkin-b3-propagation).
 
 **Thrift Tracing**
 
@@ -312,7 +312,7 @@ span(context).annotate("cs")                                \/
                                              span(context).annotate("sr")
 ```
 
-Here's an example of this process using the [Brave Tracer](https://github.com/openzipkin/brave/blob/master/brave/src/test/java/brave/features/async/OneWaySpanTest.java):
+Here's an example of this process using the [Brave Tracer](https://github.com/apache/incubator-zipkin-brave/blob/master/brave/src/test/java/brave/features/async/OneWaySpanTest.java):
 
 Client side:
 ```java
@@ -384,7 +384,7 @@ span(context).annotate("ms")                                \/
                                                           .address("ma", broker)
 ```
 
-Here's an example of this process using the [Brave Tracer](https://github.com/openzipkin/brave):
+Here's an example of this process using the [Brave Tracer](https://github.com/apache/incubator-zipkin-brave):
 
 Producer side:
 ```java
diff --git a/pages/quickstart.md b/pages/quickstart.md
index 05986f9..a36298a 100644
--- a/pages/quickstart.md
+++ b/pages/quickstart.md
@@ -4,8 +4,8 @@ weight: 1
 ---
 
 
-In this section we’ll walk through building and starting an instance of Zipkin
-for checking out Zipkin locally. There are three options: using Java, Docker or running from
source.
+In this section we’ll walk through building and starting an instance of Zipkin for local
testing.
+There are three options: using Java, Docker or running from source.
 
 If you are familiar with Docker, this is the preferred method to start. If you are unfamiliar
with Docker, try running via Java or from source.
 
diff --git a/pages/tracers_instrumentation.md b/pages/tracers_instrumentation.md
index a073a56..ccc2377 100644
--- a/pages/tracers_instrumentation.md
+++ b/pages/tracers_instrumentation.md
@@ -12,11 +12,9 @@ The following libraries exist to provide instrumentation on various platforms.
 Please refer to their individual documentation for setup and configuration
 guides.
 
-### OpenZipkin supported
+### Supported
 
-The following libraries are supported by the OpenZipkin team and are hosted at
-the [OpenZipkin GitHub](https://github.com/openzipkin/) group. You can reach out to
-the team on [Zipkin Gitter](https://gitter.im/openzipkin/zipkin/) chat.
+The following libraries are supported by the Zipkin team. You can reach out to the team on
[Gitter](https://gitter.im/openzipkin/zipkin/) chat.
 
 | Language | Library | Framework | Propagation Supported | Transports Supported | Sampling
Supported? | Other notes |
 |:---------|:--------|:----------|:----------------------|:---------------------|:--------------------|:------------|{%
for lib in site.data.openzipkin_tracers_instrumentation %}
@@ -32,6 +30,6 @@ the team on [Zipkin Gitter](https://gitter.im/openzipkin/zipkin/) chat.
 {: .wide-table}
 
 Did we miss a library? Please open a pull-request to
-[openzipkin.github.io](https://github.com/openzipkin/openzipkin.github.io).
+[zipkin.apache.org](https://github.com/apache/incubator-zipkin-website).
 
 Want to create instrumentation for another framework or platform? We have documentation on
[instrumenting a library]({{ site.github.url }}/pages/instrumenting).
diff --git a/public/thrift/v1/index.html b/public/thrift/v1/index.html
index ac87c20..21a497e 100644
--- a/public/thrift/v1/index.html
+++ b/public/thrift/v1/index.html
@@ -8,8 +8,7 @@
       <link href="style.css" rel="stylesheet" type="text/css" />
       
       <title xmlns="">Zipkin V1 Thrift models</title>
-      
-   </head>
+      </head>
    
    <body>
       
@@ -30,10 +29,8 @@
                   <th>Data types</th>
                   
                   <th>Constants</th>
-                  
-               </tr>
-               
-            </thead>
+                  </tr>
+               </thead>
             
             
             <tr>
@@ -50,8 +47,7 @@
                   
                   <a href="zipkinCore.html#Struct_Endpoint">Endpoint</a><br
/>
                   <a href="zipkinCore.html#Struct_Span">Span</a><br />
-                  
-               </td>
+                  </td>
                
                <td><code><a href="zipkinCore.html#Const_CLIENT_ADDR">CLIENT_ADDR</a></code><br
/>
                   
@@ -100,10 +96,8 @@
                   <code><a href="zipkinCore.html#Const_WIRE_RECV">WIRE_RECV</a></code><br
/>
                   
                   <code><a href="zipkinCore.html#Const_WIRE_SEND">WIRE_SEND</a></code><br
/>
-                  
-               </td>
-               
-            </tr>
+                  </td>
+               </tr>
             
             <tr>
                
@@ -115,17 +109,11 @@
                   <a href="zipkinDependencies.html#Struct_Dependencies">Dependencies</a><br
/>
                   
                   <a href="zipkinDependencies.html#Struct_DependencyLink">DependencyLink</a><br
/>
-                  
-               </td>
+                  </td>
                
                <td></td>
-               
-            </tr>
-            
-         </table>
-         
-      </div>
-      
-   </body>
-   
-</html>
\ No newline at end of file
+               </tr>
+            </table>
+         </div>
+      </body>
+   </html>
\ No newline at end of file


Mime
View raw message