lukechilds
/
docs
mirror of https://github.com/lukechilds/docs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updating with tokens 

Signed-off-by: Mary Anthony <mary@blockstack.com>
feat/clarity-updates
Mary Anthony 6 years ago
parent
d1cf1125d9
commit
8530ad0d0f
43 changed files with 176 additions and 4801 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      _data/glossary.csv
  2. BIN
      _org/images/unlocking-address.png
  3. 139
      _site/android/tutorial.html
  4. 139
      _site/browser/blockstack_storage.html
  5. 140
      _site/browser/browser-introduction.html
  6. 26
      _site/browser/browser-nav.html
  7. 139
      _site/browser/faq_general.html
  8. 139
      _site/browser/hello-blockstack.html
  9. 26
      _site/browser/ids-creating.html
  10. 139
      _site/browser/ids-introduction.html
  11. 139
      _site/browser/multi-player-storage.html
  12. 26
      _site/browser/purchase-id.html
  13. 139
      _site/browser/todo-list.html
  14. 139
      _site/common/construction.html
  15. 139
      _site/core/atlas/howitworks.html
  16. 139
      _site/core/atlas/howtouse.html
  17. 139
      _site/core/atlas/overview.html
  18. 139
      _site/core/faq_developer.html
  19. 139
      _site/core/faq_technical.html
  20. 139
      _site/core/install-api.html
  21. 139
      _site/core/memcached.html
  22. 139
      _site/core/naming/architecture.html
  23. 139
      _site/core/naming/comparison.html
  24. 139
      _site/core/naming/creationhowto.html
  25. 139
      _site/core/naming/did.html
  26. 139
      _site/core/naming/forks.html
  27. 139
      _site/core/naming/introduction.html
  28. 139
      _site/core/naming/manage.html
  29. 139
      _site/core/naming/namespaces.html
  30. 139
      _site/core/naming/pickname.html
  31. 139
      _site/core/naming/register.html
  32. 139
      _site/core/naming/resolving.html
  33. 139
      _site/core/naming/search.html
  34. 139
      _site/core/naming/subdomains.html
  35. 139
      _site/core/naming/tutorial_subdomains.html
  36. 139
      _site/core/wire-format.html
  37. 26
      _site/develop/dapp_principles.html
  38. 26
      _site/develop/mining_enroll.html
  39. 26
      _site/develop/mining_intro.html
  40. 26
      _site/develop/mining_review.html
  41. 38
      _site/feed.xml
  42. 139
      _site/ios/tutorial.html
  43. 305
      _site/sitemap.xml

3
_data/glossary.csv
View File

@ -46,9 +46,8 @@ replicated state machines (RSMs),"This is a model for reasoning about distribute
smart contract,"A smart contract is a computer program written to a blockchain such as the Blockstack blockchain by developers. This computer program defines the various network operations that can be performed on the digital assets on the blockchain, the computations that can be performed using the smart contract, along with defining various important properties of the respective digital assets like ownership rights and the cost in fuel required to register the digital assets.",Filing
soft fork,"A soft fork is a proposed update to the software governing the network that results in a post-update network that is compatible with the network as it existed prior to the update, because it restricts the network operations that can be performed after the update.",Filing
Stacks blockchain,The Stacks blockchain is the custom blockchain being developed for use by the Blockstack network that will use the Stacks token as its native currency and which will include the genesis block and subsequent blocks created by the mining activities described in The Blockstack Network—Development of the Blockstack network.,Filing
Sybil attacks,"An attack wherein a reputation system is subverted by forging identities in peer-to-peer networks. It is named after the subject of the book Sybil, a case study of a woman diagnosed with dissociative identity disorder.",General Tech
transaction,"A transaction is a unit of work within a block.",General Tech
transaction fee,"A transaction fee is the charge users pay to initiate operations in the underlying blockchain.",Blockstack Tech
transaction fee,"Fees paid by participants in a transaction to miners.",Blockstack Tech
two-sided market problem,Economic platforms having two distinct user groups that provide each other with network benefits. The Blockstack platform is a classic two-sided market.,
username,A shorthand name for your your id.blockstack.,Blockstack Tech
virtual blockchain,A layer that sits on top of a blockchain that introduces new functionality and operations without requiring changes to the underlying blockchain,Blockstack Tech

Can't render this file because it contains an unexpected character in line 14 and column 0.

BIN
_org/images/unlocking-address.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 115 KiB

139
_site/android/tutorial.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/android/tutorial.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Android SDK Tutorial (Pre-release)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Android SDK Tutorial (Pre-release)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Android SDK Tutorial (Pre-release)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/android/tutorial.html","headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/android/tutorial.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Android SDK Tutorial (Pre-release)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/android/tutorial.html","headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/android/tutorial.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-11T20:13:49-07:00","description":"Android SDK Tutorial (Pre-release)","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-12T16:13:18-07:00","description":"Android SDK Tutorial (Pre-release)","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-16T08:30:56-07:00","description":"Android SDK Tutorial (Pre-release)","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/android/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Android SDK Tutorial (Pre-release)","dateModified":"2018-10-22T07:59:39-07:00","description":"Android SDK Tutorial (Pre-release)","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/android/tutorial.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/android/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Android SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"Android SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/android/tutorial.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/android/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Android SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"Android SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/android/tutorial.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/android/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Android SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"Android SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-android/blob/master/docs/tutorial.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/browser/blockstack_storage.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/blockstack_storage.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","headline":"Blockstack Storage Tutorial","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Storage Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","headline":"Blockstack Storage Tutorial","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Storage Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Storage Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/blockstack_storage.html","headline":"Blockstack Storage Tutorial","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/blockstack_storage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Storage Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/blockstack_storage.html","headline":"Blockstack Storage Tutorial","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/blockstack_storage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Storage Tutorial","dateModified":"2018-10-11T20:13:49-07:00","description":"Blockstack Storage Tutorial","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Storage Tutorial","dateModified":"2018-10-12T16:13:18-07:00","description":"Blockstack Storage Tutorial","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Storage Tutorial","dateModified":"2018-10-16T08:30:56-07:00","description":"Blockstack Storage Tutorial","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/blockstack_storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Storage Tutorial","dateModified":"2018-10-22T07:59:39-07:00","description":"Blockstack Storage Tutorial","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/blockstack_storage.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/blockstack_storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Storage Tutorial","@type":"BlogPosting","headline":"Blockstack Storage Tutorial","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/blockstack_storage.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/blockstack_storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Storage Tutorial","@type":"BlogPosting","headline":"Blockstack Storage Tutorial","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/blockstack_storage.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/blockstack_storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Storage Tutorial","@type":"BlogPosting","headline":"Blockstack Storage Tutorial","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/blockstack_storage.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

140
_site/browser/browser-introduction.html
View File

@ -17,64 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/browser-introduction.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
<<<<<<< HEAD
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","headline":"Get the Blockstack Browser","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Get the Blockstack Browser","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","headline":"Get the Blockstack Browser","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Get the Blockstack Browser","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<title>Use the Blockstack Browser | Blockstack</title>
=======
<title>Get the Blockstack Browser | Blockstack</title>
>>>>>>> 726089e... Updating with review comments
<meta name="generator" content="Jekyll v3.8.4" />
<meta property="og:title" content="Get the Blockstack Browser" />
<meta name="author" content="Blockstack" />
<meta property="og:locale" content="en_US" />
<meta name="description" content="Get the Blockstack Browser" />
<meta property="og:description" content="Get the Blockstack Browser" />
<link rel="canonical" href="https://docs.blockstack.org/browser/browser-introduction.html" />
<meta property="og:url" content="https://docs.blockstack.org/browser/browser-introduction.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
{"description":"Use the Blockstack Browser","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/browser-introduction.html","headline":"Use the Blockstack Browser","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
{"description":"Use the Blockstack Browser","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/browser-introduction.html","headline":"Use the Blockstack Browser","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Use the Blockstack Browser","dateModified":"2018-10-11T20:13:49-07:00","description":"Use the Blockstack Browser","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Use the Blockstack Browser","dateModified":"2018-10-12T16:13:18-07:00","description":"Use the Blockstack Browser","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Use the Blockstack Browser","dateModified":"2018-10-16T08:30:56-07:00","description":"Use the Blockstack Browser","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
{"url":"https://docs.blockstack.org/browser/browser-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Get the Blockstack Browser","dateModified":"2018-10-22T07:59:39-07:00","description":"Get the Blockstack Browser","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/browser-introduction.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get the Blockstack Browser","@type":"BlogPosting","headline":"Get the Blockstack Browser","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/browser-introduction.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get the Blockstack Browser","@type":"BlogPosting","headline":"Get the Blockstack Browser","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/browser-introduction.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get the Blockstack Browser","@type":"BlogPosting","headline":"Get the Blockstack Browser","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -210,88 +155,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/browser-introduction.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

26
_site/browser/browser-nav.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/browser-nav.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/browser-nav.html","headline":"Browser Nav","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"On this page, you learn more about working with IDs, the Wallet, and Settings.","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-nav.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/browser-nav.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/browser-nav.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"On this page, you learn more about working with IDs, the Wallet, and Settings.","@type":"BlogPosting","headline":"Browser Nav","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/browser-nav.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-nav.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"On this page, you learn more about working with IDs, the Wallet, and Settings.","@type":"BlogPosting","headline":"Browser Nav","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/browser-nav.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/browser-nav.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"On this page, you learn more about working with IDs, the Wallet, and Settings.","@type":"BlogPosting","headline":"Browser Nav","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -167,15 +155,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

139
_site/browser/faq_general.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/faq_general.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Users Frequently Asked Questions (FAQ)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Users Frequently Asked Questions (FAQ)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Users Frequently Asked Questions (FAQ)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/faq_general.html","headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/faq_general.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Users Frequently Asked Questions (FAQ)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/faq_general.html","headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/faq_general.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-11T20:13:49-07:00","description":"Users Frequently Asked Questions (FAQ)","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-12T16:13:18-07:00","description":"Users Frequently Asked Questions (FAQ)","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-16T08:30:56-07:00","description":"Users Frequently Asked Questions (FAQ)","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/faq_general.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Users Frequently Asked Questions (FAQ)","dateModified":"2018-10-22T07:59:39-07:00","description":"Users Frequently Asked Questions (FAQ)","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/faq_general.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/faq_general.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Users Frequently Asked Questions (FAQ)","@type":"BlogPosting","headline":"Users Frequently Asked Questions (FAQ)","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/faq_general.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/faq_general.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Users Frequently Asked Questions (FAQ)","@type":"BlogPosting","headline":"Users Frequently Asked Questions (FAQ)","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/faq_general.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/faq_general.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Users Frequently Asked Questions (FAQ)","@type":"BlogPosting","headline":"Users Frequently Asked Questions (FAQ)","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -209,88 +155,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/faq_general.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/browser/hello-blockstack.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/hello-blockstack.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Hello, Blockstack Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Hello, Blockstack Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Hello, Blockstack Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/hello-blockstack.html","headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/hello-blockstack.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Hello, Blockstack Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/hello-blockstack.html","headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/hello-blockstack.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-11T20:13:49-07:00","description":"Hello, Blockstack Tutorial","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-12T16:13:18-07:00","description":"Hello, Blockstack Tutorial","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-16T08:30:56-07:00","description":"Hello, Blockstack Tutorial","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/hello-blockstack.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Hello, Blockstack Tutorial","dateModified":"2018-10-22T07:59:39-07:00","description":"Hello, Blockstack Tutorial","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/hello-blockstack.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/hello-blockstack.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Hello, Blockstack Tutorial","@type":"BlogPosting","headline":"Hello, Blockstack Tutorial","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/hello-blockstack.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/hello-blockstack.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Hello, Blockstack Tutorial","@type":"BlogPosting","headline":"Hello, Blockstack Tutorial","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/hello-blockstack.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/hello-blockstack.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Hello, Blockstack Tutorial","@type":"BlogPosting","headline":"Hello, Blockstack Tutorial","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/hello-blockstack.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

26
_site/browser/ids-creating.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/ids-creating.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-creating.html","headline":"Working with IDS","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Working with IDS","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-creating.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/ids-creating.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-creating.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Working with IDS","@type":"BlogPosting","headline":"Working with IDS","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/ids-creating.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-creating.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Working with IDS","@type":"BlogPosting","headline":"Working with IDS","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/ids-creating.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-creating.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Working with IDS","@type":"BlogPosting","headline":"Working with IDS","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -167,15 +155,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

139
_site/browser/ids-introduction.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/ids-introduction.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","headline":"Get and use a Blockstack ID","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Get and use a Blockstack ID","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","headline":"Get and use a Blockstack ID","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Get and use a Blockstack ID","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Get and use a Blockstack ID","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/ids-introduction.html","headline":"Get and use a Blockstack ID","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Get and use a Blockstack ID","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/ids-introduction.html","headline":"Get and use a Blockstack ID","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Get and use a Blockstack ID","dateModified":"2018-10-11T20:13:49-07:00","description":"Get and use a Blockstack ID","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Get and use a Blockstack ID","dateModified":"2018-10-12T16:13:18-07:00","description":"Get and use a Blockstack ID","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Get and use a Blockstack ID","dateModified":"2018-10-16T08:30:56-07:00","description":"Get and use a Blockstack ID","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/ids-introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Get and use a Blockstack ID","dateModified":"2018-10-22T07:59:39-07:00","description":"Get and use a Blockstack ID","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/ids-introduction.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/ids-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get and use a Blockstack ID","@type":"BlogPosting","headline":"Get and use a Blockstack ID","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/ids-introduction.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get and use a Blockstack ID","@type":"BlogPosting","headline":"Get and use a Blockstack ID","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/ids-introduction.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/ids-introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Get and use a Blockstack ID","@type":"BlogPosting","headline":"Get and use a Blockstack ID","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -209,88 +155,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/ids-introduction.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/browser/multi-player-storage.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/multi-player-storage.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","headline":"Manage Data with Gaia","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Manage Data with Gaia","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","headline":"Manage Data with Gaia","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Manage Data with Gaia","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Manage Data with Gaia","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/multi-player-storage.html","headline":"Manage Data with Gaia","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/multi-player-storage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Manage Data with Gaia","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/multi-player-storage.html","headline":"Manage Data with Gaia","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/multi-player-storage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage Data with Gaia","dateModified":"2018-10-11T20:13:49-07:00","description":"Manage Data with Gaia","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage Data with Gaia","dateModified":"2018-10-12T16:13:18-07:00","description":"Manage Data with Gaia","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage Data with Gaia","dateModified":"2018-10-16T08:30:56-07:00","description":"Manage Data with Gaia","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/multi-player-storage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage Data with Gaia","dateModified":"2018-10-22T07:59:39-07:00","description":"Manage Data with Gaia","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/multi-player-storage.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/multi-player-storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage Data with Gaia","@type":"BlogPosting","headline":"Manage Data with Gaia","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/multi-player-storage.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/multi-player-storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage Data with Gaia","@type":"BlogPosting","headline":"Manage Data with Gaia","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/multi-player-storage.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/multi-player-storage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage Data with Gaia","@type":"BlogPosting","headline":"Manage Data with Gaia","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/multi-player-storage.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

26
_site/browser/purchase-id.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/purchase-id.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/purchase-id.html","headline":"Purchase your own domain ID","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Purchase your own domain ID","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/purchase-id.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/purchase-id.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/purchase-id.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Purchase your own domain ID","@type":"BlogPosting","headline":"Purchase your own domain ID","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/purchase-id.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/purchase-id.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Purchase your own domain ID","@type":"BlogPosting","headline":"Purchase your own domain ID","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/purchase-id.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/purchase-id.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Purchase your own domain ID","@type":"BlogPosting","headline":"Purchase your own domain ID","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -167,15 +155,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

139
_site/browser/todo-list.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/browser/todo-list.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","headline":"Todo List Application Tutorial","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Todo List Application Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","headline":"Todo List Application Tutorial","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Todo List Application Tutorial","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Todo List Application Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/todo-list.html","headline":"Todo List Application Tutorial","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/todo-list.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Todo List Application Tutorial","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/browser/todo-list.html","headline":"Todo List Application Tutorial","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/todo-list.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Todo List Application Tutorial","dateModified":"2018-10-11T20:13:49-07:00","description":"Todo List Application Tutorial","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Todo List Application Tutorial","dateModified":"2018-10-12T16:13:18-07:00","description":"Todo List Application Tutorial","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Todo List Application Tutorial","dateModified":"2018-10-16T08:30:56-07:00","description":"Todo List Application Tutorial","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/browser/todo-list.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Todo List Application Tutorial","dateModified":"2018-10-22T07:59:39-07:00","description":"Todo List Application Tutorial","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/browser/todo-list.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/browser/todo-list.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Todo List Application Tutorial","@type":"BlogPosting","headline":"Todo List Application Tutorial","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/browser/todo-list.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/todo-list.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Todo List Application Tutorial","@type":"BlogPosting","headline":"Todo List Application Tutorial","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/browser/todo-list.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/browser/todo-list.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Todo List Application Tutorial","@type":"BlogPosting","headline":"Todo List Application Tutorial","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-browser/blob/master/docs/todo-list.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/common/construction.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/common/construction.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","headline":"Excuse our dust!","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Excuse our dust!","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","headline":"Excuse our dust!","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Excuse our dust!","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Excuse our dust!","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/common/construction.html","headline":"Excuse our dust!","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/common/construction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Excuse our dust!","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/common/construction.html","headline":"Excuse our dust!","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/common/construction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Excuse our dust!","dateModified":"2018-10-11T20:13:49-07:00","description":"Excuse our dust!","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Excuse our dust!","dateModified":"2018-10-12T16:13:18-07:00","description":"Excuse our dust!","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Excuse our dust!","dateModified":"2018-10-16T08:30:56-07:00","description":"Excuse our dust!","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/common/construction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Excuse our dust!","dateModified":"2018-10-22T07:59:39-07:00","description":"Excuse our dust!","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/common/construction.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/common/construction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Excuse our dust!","@type":"BlogPosting","headline":"Excuse our dust!","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/common/construction.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/common/construction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Excuse our dust!","@type":"BlogPosting","headline":"Excuse our dust!","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/common/construction.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/common/construction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Excuse our dust!","@type":"BlogPosting","headline":"Excuse our dust!","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -196,88 +142,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/moxiegirl/docs.blockstack/construction.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/atlas/howitworks.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/atlas/howitworks.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","headline":"How Atlas Works","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How Atlas Works","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","headline":"How Atlas Works","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How Atlas Works","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"How Atlas Works","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/howitworks.html","headline":"How Atlas Works","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howitworks.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"How Atlas Works","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/howitworks.html","headline":"How Atlas Works","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howitworks.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How Atlas Works","dateModified":"2018-10-11T20:13:49-07:00","description":"How Atlas Works","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How Atlas Works","dateModified":"2018-10-12T16:13:18-07:00","description":"How Atlas Works","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How Atlas Works","dateModified":"2018-10-16T08:30:56-07:00","description":"How Atlas Works","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howitworks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How Atlas Works","dateModified":"2018-10-22T07:59:39-07:00","description":"How Atlas Works","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/atlas/howitworks.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howitworks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How Atlas Works","@type":"BlogPosting","headline":"How Atlas Works","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/atlas/howitworks.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howitworks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How Atlas Works","@type":"BlogPosting","headline":"How Atlas Works","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/atlas/howitworks.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howitworks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How Atlas Works","@type":"BlogPosting","headline":"How Atlas Works","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/howitworks.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/atlas/howtouse.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/atlas/howtouse.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","headline":"How to Use the Atlas Network","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How to Use the Atlas Network","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","headline":"How to Use the Atlas Network","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How to Use the Atlas Network","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"How to Use the Atlas Network","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/howtouse.html","headline":"How to Use the Atlas Network","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howtouse.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"How to Use the Atlas Network","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/howtouse.html","headline":"How to Use the Atlas Network","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howtouse.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to Use the Atlas Network","dateModified":"2018-10-11T20:13:49-07:00","description":"How to Use the Atlas Network","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to Use the Atlas Network","dateModified":"2018-10-12T16:13:18-07:00","description":"How to Use the Atlas Network","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to Use the Atlas Network","dateModified":"2018-10-16T08:30:56-07:00","description":"How to Use the Atlas Network","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/howtouse.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to Use the Atlas Network","dateModified":"2018-10-22T07:59:39-07:00","description":"How to Use the Atlas Network","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/atlas/howtouse.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/howtouse.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to Use the Atlas Network","@type":"BlogPosting","headline":"How to Use the Atlas Network","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/atlas/howtouse.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howtouse.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to Use the Atlas Network","@type":"BlogPosting","headline":"How to Use the Atlas Network","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/atlas/howtouse.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/howtouse.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to Use the Atlas Network","@type":"BlogPosting","headline":"How to Use the Atlas Network","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/howtouse.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/atlas/overview.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/atlas/overview.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","headline":"Overview of the Atlas network","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Overview of the Atlas network","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","headline":"Overview of the Atlas network","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Overview of the Atlas network","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Overview of the Atlas network","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/overview.html","headline":"Overview of the Atlas network","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/overview.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Overview of the Atlas network","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/atlas/overview.html","headline":"Overview of the Atlas network","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/overview.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Overview of the Atlas network","dateModified":"2018-10-11T20:13:49-07:00","description":"Overview of the Atlas network","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Overview of the Atlas network","dateModified":"2018-10-12T16:13:18-07:00","description":"Overview of the Atlas network","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Overview of the Atlas network","dateModified":"2018-10-16T08:30:56-07:00","description":"Overview of the Atlas network","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/atlas/overview.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Overview of the Atlas network","dateModified":"2018-10-22T07:59:39-07:00","description":"Overview of the Atlas network","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/atlas/overview.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/atlas/overview.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Overview of the Atlas network","@type":"BlogPosting","headline":"Overview of the Atlas network","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/atlas/overview.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/overview.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Overview of the Atlas network","@type":"BlogPosting","headline":"Overview of the Atlas network","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/atlas/overview.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/atlas/overview.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Overview of the Atlas network","@type":"BlogPosting","headline":"Overview of the Atlas network","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/overview.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/faq_developer.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/faq_developer.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","headline":"Developer FAQs","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Developer FAQs","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","headline":"Developer FAQs","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Developer FAQs","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Developer FAQs","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/faq_developer.html","headline":"Developer FAQs","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_developer.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Developer FAQs","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/faq_developer.html","headline":"Developer FAQs","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_developer.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Developer FAQs","dateModified":"2018-10-11T20:13:49-07:00","description":"Developer FAQs","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Developer FAQs","dateModified":"2018-10-12T16:13:18-07:00","description":"Developer FAQs","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Developer FAQs","dateModified":"2018-10-16T08:30:56-07:00","description":"Developer FAQs","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_developer.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Developer FAQs","dateModified":"2018-10-22T07:59:39-07:00","description":"Developer FAQs","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/faq_developer.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_developer.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Developer FAQs","@type":"BlogPosting","headline":"Developer FAQs","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/faq_developer.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_developer.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Developer FAQs","@type":"BlogPosting","headline":"Developer FAQs","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/faq_developer.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_developer.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Developer FAQs","@type":"BlogPosting","headline":"Developer FAQs","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/faq_developer.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/faq_technical.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/faq_technical.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","headline":"Blockstack Technical FAQ","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Technical FAQ","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","headline":"Blockstack Technical FAQ","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Technical FAQ","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Technical FAQ","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/faq_technical.html","headline":"Blockstack Technical FAQ","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_technical.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Technical FAQ","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/faq_technical.html","headline":"Blockstack Technical FAQ","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_technical.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Technical FAQ","dateModified":"2018-10-11T20:13:49-07:00","description":"Blockstack Technical FAQ","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Technical FAQ","dateModified":"2018-10-12T16:13:18-07:00","description":"Blockstack Technical FAQ","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Technical FAQ","dateModified":"2018-10-16T08:30:56-07:00","description":"Blockstack Technical FAQ","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/faq_technical.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Technical FAQ","dateModified":"2018-10-22T07:59:39-07:00","description":"Blockstack Technical FAQ","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/faq_technical.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/faq_technical.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Technical FAQ","@type":"BlogPosting","headline":"Blockstack Technical FAQ","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/faq_technical.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_technical.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Technical FAQ","@type":"BlogPosting","headline":"Blockstack Technical FAQ","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/faq_technical.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/faq_technical.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Technical FAQ","@type":"BlogPosting","headline":"Blockstack Technical FAQ","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/faq_technical.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/install-api.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/install-api.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","headline":"Blockstack API","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack API","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","headline":"Blockstack API","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack API","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Blockstack API","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/install-api.html","headline":"Blockstack API","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/install-api.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Blockstack API","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/install-api.html","headline":"Blockstack API","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/install-api.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack API","dateModified":"2018-10-11T20:13:49-07:00","description":"Blockstack API","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack API","dateModified":"2018-10-12T16:13:18-07:00","description":"Blockstack API","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack API","dateModified":"2018-10-16T08:30:56-07:00","description":"Blockstack API","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/install-api.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack API","dateModified":"2018-10-22T07:59:39-07:00","description":"Blockstack API","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/install-api.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/install-api.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack API","@type":"BlogPosting","headline":"Blockstack API","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/install-api.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/install-api.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack API","@type":"BlogPosting","headline":"Blockstack API","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/install-api.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/install-api.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack API","@type":"BlogPosting","headline":"Blockstack API","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/install-api.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/memcached.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/memcached.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","headline":"Installing Memcached","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Installing Memcached","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","headline":"Installing Memcached","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Installing Memcached","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Installing Memcached","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/memcached.html","headline":"Installing Memcached","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/memcached.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Installing Memcached","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/memcached.html","headline":"Installing Memcached","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/memcached.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Installing Memcached","dateModified":"2018-10-11T20:13:49-07:00","description":"Installing Memcached","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Installing Memcached","dateModified":"2018-10-12T16:13:18-07:00","description":"Installing Memcached","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Installing Memcached","dateModified":"2018-10-16T08:30:56-07:00","description":"Installing Memcached","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/memcached.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Installing Memcached","dateModified":"2018-10-22T07:59:39-07:00","description":"Installing Memcached","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/memcached.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/memcached.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Installing Memcached","@type":"BlogPosting","headline":"Installing Memcached","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/memcached.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/memcached.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Installing Memcached","@type":"BlogPosting","headline":"Installing Memcached","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/memcached.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/memcached.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Installing Memcached","@type":"BlogPosting","headline":"Installing Memcached","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/memcached.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/architecture.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/architecture.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","headline":"Understand the Architecture","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Understand the Architecture","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","headline":"Understand the Architecture","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Understand the Architecture","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Understand the Architecture","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/architecture.html","headline":"Understand the Architecture","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/architecture.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Understand the Architecture","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/architecture.html","headline":"Understand the Architecture","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/architecture.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand the Architecture","dateModified":"2018-10-11T20:13:49-07:00","description":"Understand the Architecture","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand the Architecture","dateModified":"2018-10-12T16:13:18-07:00","description":"Understand the Architecture","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand the Architecture","dateModified":"2018-10-16T08:30:56-07:00","description":"Understand the Architecture","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/architecture.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand the Architecture","dateModified":"2018-10-22T07:59:39-07:00","description":"Understand the Architecture","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/architecture.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/architecture.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand the Architecture","@type":"BlogPosting","headline":"Understand the Architecture","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/architecture.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/architecture.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand the Architecture","@type":"BlogPosting","headline":"Understand the Architecture","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/architecture.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/architecture.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand the Architecture","@type":"BlogPosting","headline":"Understand the Architecture","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/architecture.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/comparison.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/comparison.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","headline":"Naming system feature comparison","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Naming system feature comparison","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","headline":"Naming system feature comparison","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Naming system feature comparison","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Naming system feature comparison","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/comparison.html","headline":"Naming system feature comparison","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/comparison.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Naming system feature comparison","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/comparison.html","headline":"Naming system feature comparison","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/comparison.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Naming system feature comparison","dateModified":"2018-10-11T20:13:49-07:00","description":"Naming system feature comparison","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Naming system feature comparison","dateModified":"2018-10-12T16:13:18-07:00","description":"Naming system feature comparison","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Naming system feature comparison","dateModified":"2018-10-16T08:30:56-07:00","description":"Naming system feature comparison","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/comparison.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Naming system feature comparison","dateModified":"2018-10-22T07:59:39-07:00","description":"Naming system feature comparison","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/comparison.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/comparison.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Naming system feature comparison","@type":"BlogPosting","headline":"Naming system feature comparison","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/comparison.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/comparison.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Naming system feature comparison","@type":"BlogPosting","headline":"Naming system feature comparison","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/comparison.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/comparison.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Naming system feature comparison","@type":"BlogPosting","headline":"Naming system feature comparison","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/comparison.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/creationhowto.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/creationhowto.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","headline":"Creating a Namespace","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Creating a Namespace","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","headline":"Creating a Namespace","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Creating a Namespace","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Creating a Namespace","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/creationhowto.html","headline":"Creating a Namespace","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/creationhowto.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Creating a Namespace","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/creationhowto.html","headline":"Creating a Namespace","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/creationhowto.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Creating a Namespace","dateModified":"2018-10-11T20:13:49-07:00","description":"Creating a Namespace","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Creating a Namespace","dateModified":"2018-10-12T16:13:18-07:00","description":"Creating a Namespace","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Creating a Namespace","dateModified":"2018-10-16T08:30:56-07:00","description":"Creating a Namespace","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/creationhowto.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Creating a Namespace","dateModified":"2018-10-22T07:59:39-07:00","description":"Creating a Namespace","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/creationhowto.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/creationhowto.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Creating a Namespace","@type":"BlogPosting","headline":"Creating a Namespace","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/creationhowto.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/creationhowto.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Creating a Namespace","@type":"BlogPosting","headline":"Creating a Namespace","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/creationhowto.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/creationhowto.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Creating a Namespace","@type":"BlogPosting","headline":"Creating a Namespace","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/creationhowto.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/did.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/did.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Decentralized Identifiers (DIDs)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Decentralized Identifiers (DIDs)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Decentralized Identifiers (DIDs)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/did.html","headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/did.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Decentralized Identifiers (DIDs)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/did.html","headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/did.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-11T20:13:49-07:00","description":"Decentralized Identifiers (DIDs)","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-12T16:13:18-07:00","description":"Decentralized Identifiers (DIDs)","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-16T08:30:56-07:00","description":"Decentralized Identifiers (DIDs)","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/did.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Decentralized Identifiers (DIDs)","dateModified":"2018-10-22T07:59:39-07:00","description":"Decentralized Identifiers (DIDs)","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/did.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/did.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Decentralized Identifiers (DIDs)","@type":"BlogPosting","headline":"Decentralized Identifiers (DIDs)","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/did.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/did.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Decentralized Identifiers (DIDs)","@type":"BlogPosting","headline":"Decentralized Identifiers (DIDs)","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/did.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/did.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Decentralized Identifiers (DIDs)","@type":"BlogPosting","headline":"Decentralized Identifiers (DIDs)","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/did.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/forks.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/forks.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","headline":"BNS Forks","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"BNS Forks","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","headline":"BNS Forks","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"BNS Forks","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"BNS Forks","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/forks.html","headline":"BNS Forks","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/forks.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"BNS Forks","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/forks.html","headline":"BNS Forks","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/forks.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Forks","dateModified":"2018-10-11T20:13:49-07:00","description":"BNS Forks","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Forks","dateModified":"2018-10-12T16:13:18-07:00","description":"BNS Forks","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Forks","dateModified":"2018-10-16T08:30:56-07:00","description":"BNS Forks","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/forks.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Forks","dateModified":"2018-10-22T07:59:39-07:00","description":"BNS Forks","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/forks.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/forks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Forks","@type":"BlogPosting","headline":"BNS Forks","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/forks.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/forks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Forks","@type":"BlogPosting","headline":"BNS Forks","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/forks.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/forks.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Forks","@type":"BlogPosting","headline":"BNS Forks","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/forks.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/introduction.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/introduction.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Naming Service (BNS)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Naming Service (BNS)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Naming Service (BNS)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/introduction.html","headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Blockstack Naming Service (BNS)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/introduction.html","headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/introduction.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-11T20:13:49-07:00","description":"Blockstack Naming Service (BNS)","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-12T16:13:18-07:00","description":"Blockstack Naming Service (BNS)","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-16T08:30:56-07:00","description":"Blockstack Naming Service (BNS)","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/introduction.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Blockstack Naming Service (BNS)","dateModified":"2018-10-22T07:59:39-07:00","description":"Blockstack Naming Service (BNS)","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/introduction.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Naming Service (BNS)","@type":"BlogPosting","headline":"Blockstack Naming Service (BNS)","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/introduction.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Naming Service (BNS)","@type":"BlogPosting","headline":"Blockstack Naming Service (BNS)","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/introduction.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/introduction.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Blockstack Naming Service (BNS)","@type":"BlogPosting","headline":"Blockstack Naming Service (BNS)","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/introduction.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/manage.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/manage.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","headline":"Manage BNS Names","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Manage BNS Names","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","headline":"Manage BNS Names","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Manage BNS Names","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Manage BNS Names","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/manage.html","headline":"Manage BNS Names","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/manage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Manage BNS Names","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/manage.html","headline":"Manage BNS Names","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/manage.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage BNS Names","dateModified":"2018-10-11T20:13:49-07:00","description":"Manage BNS Names","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage BNS Names","dateModified":"2018-10-12T16:13:18-07:00","description":"Manage BNS Names","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage BNS Names","dateModified":"2018-10-16T08:30:56-07:00","description":"Manage BNS Names","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/manage.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Manage BNS Names","dateModified":"2018-10-22T07:59:39-07:00","description":"Manage BNS Names","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/manage.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/manage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage BNS Names","@type":"BlogPosting","headline":"Manage BNS Names","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/manage.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/manage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage BNS Names","@type":"BlogPosting","headline":"Manage BNS Names","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/manage.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/manage.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Manage BNS Names","@type":"BlogPosting","headline":"Manage BNS Names","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/manage.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/namespaces.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/namespaces.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","headline":"Understand Namespaces","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Understand Namespaces","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","headline":"Understand Namespaces","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Understand Namespaces","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Understand Namespaces","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/namespaces.html","headline":"Understand Namespaces","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/namespaces.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Understand Namespaces","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/namespaces.html","headline":"Understand Namespaces","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/namespaces.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand Namespaces","dateModified":"2018-10-11T20:13:49-07:00","description":"Understand Namespaces","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand Namespaces","dateModified":"2018-10-12T16:13:18-07:00","description":"Understand Namespaces","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand Namespaces","dateModified":"2018-10-16T08:30:56-07:00","description":"Understand Namespaces","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/namespaces.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Understand Namespaces","dateModified":"2018-10-22T07:59:39-07:00","description":"Understand Namespaces","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/namespaces.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/namespaces.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand Namespaces","@type":"BlogPosting","headline":"Understand Namespaces","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/namespaces.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/namespaces.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand Namespaces","@type":"BlogPosting","headline":"Understand Namespaces","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/namespaces.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/namespaces.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand Namespaces","@type":"BlogPosting","headline":"Understand Namespaces","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/namespaces.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/pickname.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/pickname.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","headline":"Choose a name","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Choose a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","headline":"Choose a name","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Choose a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Choose a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/pickname.html","headline":"Choose a name","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/pickname.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Choose a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/pickname.html","headline":"Choose a name","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/pickname.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Choose a name","dateModified":"2018-10-11T20:13:49-07:00","description":"Choose a name","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Choose a name","dateModified":"2018-10-12T16:13:18-07:00","description":"Choose a name","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Choose a name","dateModified":"2018-10-16T08:30:56-07:00","description":"Choose a name","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/pickname.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Choose a name","dateModified":"2018-10-22T07:59:39-07:00","description":"Choose a name","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/pickname.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/pickname.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Choose a name","@type":"BlogPosting","headline":"Choose a name","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/pickname.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/pickname.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Choose a name","@type":"BlogPosting","headline":"Choose a name","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/pickname.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/pickname.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Choose a name","@type":"BlogPosting","headline":"Choose a name","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/pickname.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/register.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/register.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","headline":"Register a name","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Register a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","headline":"Register a name","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Register a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Register a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/register.html","headline":"Register a name","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/register.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Register a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/register.html","headline":"Register a name","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/register.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Register a name","dateModified":"2018-10-11T20:13:49-07:00","description":"Register a name","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Register a name","dateModified":"2018-10-12T16:13:18-07:00","description":"Register a name","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Register a name","dateModified":"2018-10-16T08:30:56-07:00","description":"Register a name","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/register.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Register a name","dateModified":"2018-10-22T07:59:39-07:00","description":"Register a name","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/register.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/register.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Register a name","@type":"BlogPosting","headline":"Register a name","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/register.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/register.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Register a name","@type":"BlogPosting","headline":"Register a name","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/register.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/register.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Register a name","@type":"BlogPosting","headline":"Register a name","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/register.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/resolving.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/resolving.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","headline":"Resolve a name","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Resolve a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","headline":"Resolve a name","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Resolve a name","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Resolve a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/resolving.html","headline":"Resolve a name","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/resolving.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Resolve a name","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/resolving.html","headline":"Resolve a name","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/resolving.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Resolve a name","dateModified":"2018-10-11T20:13:49-07:00","description":"Resolve a name","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Resolve a name","dateModified":"2018-10-12T16:13:18-07:00","description":"Resolve a name","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Resolve a name","dateModified":"2018-10-16T08:30:56-07:00","description":"Resolve a name","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/resolving.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Resolve a name","dateModified":"2018-10-22T07:59:39-07:00","description":"Resolve a name","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/resolving.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/resolving.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Resolve a name","@type":"BlogPosting","headline":"Resolve a name","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/resolving.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/resolving.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Resolve a name","@type":"BlogPosting","headline":"Resolve a name","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/resolving.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/resolving.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Resolve a name","@type":"BlogPosting","headline":"Resolve a name","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/resolving.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/search.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/search.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","headline":"How to build a Profile Search Index","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How to build a Profile Search Index","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","headline":"How to build a Profile Search Index","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How to build a Profile Search Index","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"How to build a Profile Search Index","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/search.html","headline":"How to build a Profile Search Index","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/search.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"How to build a Profile Search Index","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/search.html","headline":"How to build a Profile Search Index","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/search.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to build a Profile Search Index","dateModified":"2018-10-11T20:13:49-07:00","description":"How to build a Profile Search Index","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to build a Profile Search Index","dateModified":"2018-10-12T16:13:18-07:00","description":"How to build a Profile Search Index","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to build a Profile Search Index","dateModified":"2018-10-16T08:30:56-07:00","description":"How to build a Profile Search Index","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/search.html","author":{"@type":"Person","name":"Blockstack"},"headline":"How to build a Profile Search Index","dateModified":"2018-10-22T07:59:39-07:00","description":"How to build a Profile Search Index","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/search.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/search.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to build a Profile Search Index","@type":"BlogPosting","headline":"How to build a Profile Search Index","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/search.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/search.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to build a Profile Search Index","@type":"BlogPosting","headline":"How to build a Profile Search Index","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/search.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/search.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to build a Profile Search Index","@type":"BlogPosting","headline":"How to build a Profile Search Index","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/search.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/subdomains.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/subdomains.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","headline":"BNS Subdomains","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"BNS Subdomains","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","headline":"BNS Subdomains","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"BNS Subdomains","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"BNS Subdomains","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/subdomains.html","headline":"BNS Subdomains","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/subdomains.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"BNS Subdomains","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/subdomains.html","headline":"BNS Subdomains","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/subdomains.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Subdomains","dateModified":"2018-10-11T20:13:49-07:00","description":"BNS Subdomains","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Subdomains","dateModified":"2018-10-12T16:13:18-07:00","description":"BNS Subdomains","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Subdomains","dateModified":"2018-10-16T08:30:56-07:00","description":"BNS Subdomains","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"BNS Subdomains","dateModified":"2018-10-22T07:59:39-07:00","description":"BNS Subdomains","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/subdomains.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Subdomains","@type":"BlogPosting","headline":"BNS Subdomains","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/subdomains.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Subdomains","@type":"BlogPosting","headline":"BNS Subdomains","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/subdomains.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"BNS Subdomains","@type":"BlogPosting","headline":"BNS Subdomains","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/subdomains.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/naming/tutorial_subdomains.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/naming/tutorial_subdomains.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","headline":"Subdomain Design and Implementation","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Subdomain Design and Implementation","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","headline":"Subdomain Design and Implementation","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Subdomain Design and Implementation","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Subdomain Design and Implementation","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/tutorial_subdomains.html","headline":"Subdomain Design and Implementation","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/tutorial_subdomains.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Subdomain Design and Implementation","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/naming/tutorial_subdomains.html","headline":"Subdomain Design and Implementation","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/tutorial_subdomains.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Subdomain Design and Implementation","dateModified":"2018-10-11T20:13:49-07:00","description":"Subdomain Design and Implementation","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Subdomain Design and Implementation","dateModified":"2018-10-12T16:13:18-07:00","description":"Subdomain Design and Implementation","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Subdomain Design and Implementation","dateModified":"2018-10-16T08:30:56-07:00","description":"Subdomain Design and Implementation","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Subdomain Design and Implementation","dateModified":"2018-10-22T07:59:39-07:00","description":"Subdomain Design and Implementation","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/naming/tutorial_subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Subdomain Design and Implementation","@type":"BlogPosting","headline":"Subdomain Design and Implementation","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/naming/tutorial_subdomains.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/tutorial_subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Subdomain Design and Implementation","@type":"BlogPosting","headline":"Subdomain Design and Implementation","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/naming/tutorial_subdomains.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/naming/tutorial_subdomains.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Subdomain Design and Implementation","@type":"BlogPosting","headline":"Subdomain Design and Implementation","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/tutorial_subdomains.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

139
_site/core/wire-format.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/core/wire-format.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","headline":"Bitcoin wire format","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Bitcoin wire format","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","headline":"Bitcoin wire format","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Bitcoin wire format","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"Bitcoin wire format","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/wire-format.html","headline":"Bitcoin wire format","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/wire-format.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"Bitcoin wire format","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/core/wire-format.html","headline":"Bitcoin wire format","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/wire-format.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Bitcoin wire format","dateModified":"2018-10-11T20:13:49-07:00","description":"Bitcoin wire format","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Bitcoin wire format","dateModified":"2018-10-12T16:13:18-07:00","description":"Bitcoin wire format","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Bitcoin wire format","dateModified":"2018-10-16T08:30:56-07:00","description":"Bitcoin wire format","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/core/wire-format.html","author":{"@type":"Person","name":"Blockstack"},"headline":"Bitcoin wire format","dateModified":"2018-10-22T07:59:39-07:00","description":"Bitcoin wire format","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/core/wire-format.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/core/wire-format.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Bitcoin wire format","@type":"BlogPosting","headline":"Bitcoin wire format","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/core/wire-format.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/wire-format.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Bitcoin wire format","@type":"BlogPosting","headline":"Bitcoin wire format","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/core/wire-format.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/core/wire-format.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Bitcoin wire format","@type":"BlogPosting","headline":"Bitcoin wire format","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -319,88 +265,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-core/blob/master/docs/wire-format.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

26
_site/develop/dapp_principles.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/develop/dapp_principles.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/develop/dapp_principles.html","headline":"Principles of Blockstack applications","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Principles of Blockstack applications","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/dapp_principles.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/develop/dapp_principles.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/dapp_principles.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Principles of Blockstack applications","@type":"BlogPosting","headline":"Principles of Blockstack applications","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/develop/dapp_principles.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/dapp_principles.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Principles of Blockstack applications","@type":"BlogPosting","headline":"Principles of Blockstack applications","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/develop/dapp_principles.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/dapp_principles.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Principles of Blockstack applications","@type":"BlogPosting","headline":"Principles of Blockstack applications","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -242,15 +230,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

26
_site/develop/mining_enroll.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/develop/mining_enroll.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/develop/mining_enroll.html","headline":"How to enroll","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"How to enroll","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_enroll.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/develop/mining_enroll.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_enroll.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to enroll","@type":"BlogPosting","headline":"How to enroll","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/develop/mining_enroll.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_enroll.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to enroll","@type":"BlogPosting","headline":"How to enroll","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/develop/mining_enroll.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_enroll.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"How to enroll","@type":"BlogPosting","headline":"How to enroll","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -242,15 +230,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

26
_site/develop/mining_intro.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/develop/mining_intro.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/develop/mining_intro.html","headline":"Understand app mining","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"Understand app mining","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_intro.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/develop/mining_intro.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_intro.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand app mining","@type":"BlogPosting","headline":"Understand app mining","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/develop/mining_intro.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_intro.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand app mining","@type":"BlogPosting","headline":"Understand app mining","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/develop/mining_intro.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_intro.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"Understand app mining","@type":"BlogPosting","headline":"Understand app mining","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -242,15 +230,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

26
_site/develop/mining_review.html
View File

@ -17,21 +17,9 @@
<meta property="og:url" content="http://localhost:4000/develop/mining_review.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/develop/mining_review.html","headline":"App reviewer instructions","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"App reviewer instructions","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_review.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/develop/mining_review.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/develop/mining_review.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"App reviewer instructions","@type":"BlogPosting","headline":"App reviewer instructions","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/develop/mining_review.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_review.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"App reviewer instructions","@type":"BlogPosting","headline":"App reviewer instructions","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/develop/mining_review.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/develop/mining_review.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"App reviewer instructions","@type":"BlogPosting","headline":"App reviewer instructions","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -242,15 +230,7 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
>>>>>>> d56e4d3... Token work
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
</time>

38
_site/feed.xml
View File

@ -1,40 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.3">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-29T13:33:04-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.3">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-26T14:29:29-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-10-10T19:31:19-07:00</updated><id>http://localhost:4000/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="http://localhost:4000/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>http://localhost:4000/2017/05/25/post63</id><content type="html" xml:base="http://localhost:4000/2017/05/25/post63.html">&lt;p&gt;http://localhost:4000/assets/posts/&lt;/p&gt;
>>>>>>> 361c104... updating core information
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-10-10T20:21:27-07:00</updated><id>http://localhost:4000/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="http://localhost:4000/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>http://localhost:4000/2017/05/25/post63</id><content type="html" xml:base="http://localhost:4000/2017/05/25/post63.html">&lt;p&gt;http://localhost:4000/assets/posts/&lt;/p&gt;
>>>>>>> 9af222f... a few more things
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-11T20:13:49-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
>>>>>>> c31fd2d... copy edits and changes
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-12T16:13:18-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
>>>>>>> 5cad86b... Entering from my read
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-16T08:30:56-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
>>>>>>> 89f7f21... Tweaks from review
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.4">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-22T07:59:39-07:00</updated><id>https://docs.blockstack.org/</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.3">Jekyll</generator><link href="https://docs.blockstack.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://docs.blockstack.org/" rel="alternate" type="text/html" /><updated>2018-10-29T08:41:40-07:00</updated><id>https://docs.blockstack.org/feed.xml</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="https://docs.blockstack.org/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>https://docs.blockstack.org/2017/05/25/post63</id><content type="html" xml:base="https://docs.blockstack.org/2017/05/25/post63.html">&lt;p&gt;https://docs.blockstack.org/assets/posts/&lt;/p&gt;
>>>>>>> d56e4d3... Token work
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.3">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-10-29T11:09:45-07:00</updated><id>http://localhost:4000/feed.xml</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="http://localhost:4000/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>http://localhost:4000/2017/05/25/post63</id><content type="html" xml:base="http://localhost:4000/2017/05/25/post63.html">&lt;p&gt;http://localhost:4000/assets/posts/&lt;/p&gt;
>>>>>>> dbeb559... Updating
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.3">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-10-29T14:08:07-07:00</updated><id>http://localhost:4000/feed.xml</id><title type="html">Blockstack</title><subtitle>Docs</subtitle><author><name>Blockstack</name></author><entry><title type="html">Site tags</title><link href="http://localhost:4000/2017/05/25/post63.html" rel="alternate" type="text/html" title="Site tags" /><published>2017-05-25T00:00:00-07:00</published><updated>2017-05-25T00:00:00-07:00</updated><id>http://localhost:4000/2017/05/25/post63</id><content type="html" xml:base="http://localhost:4000/2017/05/25/post63.html">&lt;p&gt;http://localhost:4000/assets/posts/&lt;/p&gt;
&lt;p&gt;/2017/05/25/post63.html&lt;/p&gt;

139
_site/ios/tutorial.html
View File

@ -17,63 +17,9 @@
<meta property="og:url" content="http://localhost:4000/ios/tutorial.html" />
<meta property="og:site_name" content="Blockstack" />
<meta property="og:type" content="article" />
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-29T13:33:04-07:00" />
<meta property="article:published_time" content="2018-10-29T14:08:07-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-29T13:33:04-07:00","datePublished":"2018-10-29T13:33:04-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"iOS SDK Tutorial (Pre-release)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<meta property="article:published_time" content="2018-10-26T14:29:29-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-26T14:29:29-07:00","datePublished":"2018-10-26T14:29:29-07:00","author":{"@type":"Person","name":"Blockstack"},"description":"iOS SDK Tutorial (Pre-release)","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
=======
<meta property="article:published_time" content="2018-10-10T19:31:19-07:00" />
<script type="application/ld+json">
{"description":"iOS SDK Tutorial (Pre-release)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/ios/tutorial.html","headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-10T19:31:19-07:00","datePublished":"2018-10-10T19:31:19-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/ios/tutorial.html"},"@context":"http://schema.org"}</script>
>>>>>>> 361c104... updating core information
=======
<meta property="article:published_time" content="2018-10-10T20:21:27-07:00" />
<script type="application/ld+json">
{"description":"iOS SDK Tutorial (Pre-release)","author":{"@type":"Person","name":"Blockstack"},"@type":"BlogPosting","url":"http://localhost:4000/ios/tutorial.html","headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-10T20:21:27-07:00","datePublished":"2018-10-10T20:21:27-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/ios/tutorial.html"},"@context":"http://schema.org"}</script>
>>>>>>> 9af222f... a few more things
=======
<meta property="article:published_time" content="2018-10-11T20:13:49-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-11T20:13:49-07:00","description":"iOS SDK Tutorial (Pre-release)","datePublished":"2018-10-11T20:13:49-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> c31fd2d... copy edits and changes
=======
<meta property="article:published_time" content="2018-10-12T16:13:18-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-12T16:13:18-07:00","description":"iOS SDK Tutorial (Pre-release)","datePublished":"2018-10-12T16:13:18-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 5cad86b... Entering from my read
=======
<meta property="article:published_time" content="2018-10-16T08:30:56-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-16T08:30:56-07:00","description":"iOS SDK Tutorial (Pre-release)","datePublished":"2018-10-16T08:30:56-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 89f7f21... Tweaks from review
=======
<meta property="article:published_time" content="2018-10-22T07:59:39-07:00" />
<script type="application/ld+json">
{"url":"https://docs.blockstack.org/ios/tutorial.html","author":{"@type":"Person","name":"Blockstack"},"headline":"iOS SDK Tutorial (Pre-release)","dateModified":"2018-10-22T07:59:39-07:00","description":"iOS SDK Tutorial (Pre-release)","datePublished":"2018-10-22T07:59:39-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"@type":"BlogPosting","@context":"http://schema.org"}</script>
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<meta property="article:published_time" content="2018-10-29T08:41:40-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T08:41:40-07:00","url":"https://docs.blockstack.org/ios/tutorial.html","dateModified":"2018-10-29T08:41:40-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"https://docs.blockstack.org/ios/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"iOS SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"iOS SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
>>>>>>> d56e4d3... Token work
=======
<meta property="article:published_time" content="2018-10-29T11:09:45-07:00" />
<script type="application/ld+json">
{"datePublished":"2018-10-29T11:09:45-07:00","url":"http://localhost:4000/ios/tutorial.html","dateModified":"2018-10-29T11:09:45-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/ios/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"iOS SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"iOS SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
>>>>>>> dbeb559... Updating
{"datePublished":"2018-10-29T14:08:07-07:00","url":"http://localhost:4000/ios/tutorial.html","dateModified":"2018-10-29T14:08:07-07:00","mainEntityOfPage":{"@type":"WebPage","@id":"http://localhost:4000/ios/tutorial.html"},"author":{"@type":"Person","name":"Blockstack"},"description":"iOS SDK Tutorial (Pre-release)","@type":"BlogPosting","headline":"iOS SDK Tutorial (Pre-release)","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->
<!-- <meta property="og:image" content="http://localhost:4000/assets/posts/logo.png"/> -->
@ -284,88 +230,9 @@
<!-- Written by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Blockstack</span></span><br> -->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-29T13:33:04-07:00" itemprop="datePublished">
Oct 29, 2018
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<time datetime="2018-10-26T14:29:29-07:00" itemprop="datePublished">
Oct 26, 2018
=======
<time datetime="2018-10-10T19:31:19-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-10T20:21:27-07:00" itemprop="datePublished">
>>>>>>> 9af222f... a few more things
=======
<!-- <time datetime="2018-10-11T20:13:49-07:00" itemprop="datePublished">
>>>>>>> c31fd2d... copy edits and changes
=======
<!-- <time datetime="2018-10-12T16:13:18-07:00" itemprop="datePublished">
>>>>>>> 5cad86b... Entering from my read
=======
<!-- <time datetime="2018-10-16T08:30:56-07:00" itemprop="datePublished">
>>>>>>> 89f7f21... Tweaks from review
=======
<!-- <time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
>>>>>>> 726089e... Updating with review comments
<a "target="_blank" href="https://github.com/blockstack/blockstack-ios/blob/master/docs/tutorial.md" class="btn btn-default githubEditButton" role="button">
<span data-uk-icon="icon: pencil; ratio: 1.2"></span> Edit this page on Github</a>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<span style="font-family:Wingdings">&#119;</span> Oct 10, 2018
>>>>>>> 361c104... updating core information
=======
<span style="font-family:Wingdings">&#119;</span> Oct 11, 2018
=======
<span style="font-family:Wingdings">&#119;</span> Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
<span style="font-family:Wingdings">&#119;</span> Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
<span style="font-family:Wingdings">&#119;</span> Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
</time> -->
<time datetime="2018-10-22T07:59:39-07:00" itemprop="datePublished">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Last update Oct 11, 2018
>>>>>>> c31fd2d... copy edits and changes
=======
Last update Oct 12, 2018
>>>>>>> 5cad86b... Entering from my read
=======
Last update Oct 16, 2018
>>>>>>> 89f7f21... Tweaks from review
=======
Last update Oct 22, 2018
>>>>>>> 726089e... Updating with review comments
>>>>>>> 2c752d6... Adding in changes for token site
=======
<time datetime="2018-10-29T08:41:40-07:00" itemprop="datePublished">
=======
<time datetime="2018-10-29T11:09:45-07:00" itemprop="datePublished">
>>>>>>> dbeb559... Updating
<time datetime="2018-10-29T14:08:07-07:00" itemprop="datePublished">
Oct 29, 2018
>>>>>>> d56e4d3... Token work
</time>
</div>

305
_site/sitemap.xml
View File

@ -1,427 +1,236 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<<<<<<< HEAD
<loc>https://docs.blockstack.org/android/tutorial.html</loc>
<<<<<<< HEAD
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/blockstack_storage.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/browser-introduction.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/browser-nav.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/faq_general.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/hello-blockstack.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/ids-creating.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/ids-introduction.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/multi-player-storage.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/purchase-id.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/browser/todo-list.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/common/community_ref.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/common/construction.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/common/core_ref.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/common/javascript_ref.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/common/mining_faq.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/atlas/howitworks.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/atlas/howtouse.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/atlas/overview.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/faq_developer.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/faq_technical.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/install-api.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/memcached.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/architecture.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/comparison.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/creationhowto.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/did.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/forks.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/introduction.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/manage.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/namespaces.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/pickname.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/register.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/resolving.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/search.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/subdomains.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/naming/tutorial_subdomains.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/core/wire-format.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/develop/dapp_principles.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/develop/mining_enroll.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/develop/mining_intro.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/develop/mining_review.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
</url>
<url>
<loc>https://docs.blockstack.org/ios/tutorial.html</loc>
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
=======
<lastmod>2018-10-29T08:41:40-07:00</lastmod>
=======
<loc>http://localhost:4000/android/tutorial.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
>>>>>>> dbeb559... Updating
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/blockstack_storage.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/browser-introduction.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/browser-nav.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/faq_general.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/hello-blockstack.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/ids-creating.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/ids-introduction.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/multi-player-storage.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/purchase-id.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/browser/todo-list.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/common/community_ref.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/common/construction.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/common/core_ref.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/common/javascript_ref.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/common/mining_faq.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/atlas/howitworks.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/atlas/howtouse.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/atlas/overview.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/faq_developer.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/faq_technical.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/install-api.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/memcached.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/architecture.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/comparison.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/creationhowto.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/did.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/forks.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/introduction.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/manage.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/namespaces.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/pickname.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/register.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/resolving.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/search.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/subdomains.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/naming/tutorial_subdomains.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/core/wire-format.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/develop/dapp_principles.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/develop/mining_enroll.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/develop/mining_intro.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/develop/mining_review.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/ios/tutorial.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/address_check.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/explore.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/faq.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/install.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/overview.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/terms.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/token.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/tokenholders.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/wallet-hardware.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/wallet-intro.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/wallet-use.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/org/whitepaper-token.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<<<<<<< HEAD
<loc>https://docs.blockstack.org/org/whitepaper-tokensale.html</loc>
<lastmod>2018-10-29T08:41:40-07:00</lastmod>
>>>>>>> d56e4d3... Token work
=======
<loc>http://localhost:4000/org/whitepaper-tokensale.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
>>>>>>> dbeb559... Updating
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/2017/05/25/post63.html</loc>
<lastmod>2017-05-25T00:00:00-07:00</lastmod>
</url>
<url>
<<<<<<< HEAD
<loc>https://docs.blockstack.org/storage/gaia_redirect.html</loc>
<<<<<<< HEAD
<lastmod>2018-10-29T13:33:04-07:00</lastmod>
=======
<lastmod>2018-10-29T08:41:40-07:00</lastmod>
>>>>>>> d56e4d3... Token work
=======
<loc>http://localhost:4000/storage/gaia_redirect.html</loc>
<lastmod>2018-10-29T11:09:45-07:00</lastmod>
>>>>>>> dbeb559... Updating
<lastmod>2018-10-29T14:08:07-07:00</lastmod>
</url>
<url>
<loc>http://localhost:4000/changelog/</loc>

Write Preview
Loading…
Cancel
Save