diff --git a/_android/tutorial.md b/_android/tutorial.md index 0ab19518..376c5eef 100644 --- a/_android/tutorial.md +++ b/_android/tutorial.md @@ -155,7 +155,7 @@ In this section, you build an initial React.js application called ```bash $ npm run start - > hello-blockstack@0.0.0 start /Users/moxiegirl/repos/hello-blockstack + > hello-blockstack@0.0.0 start /Users/meepers/repos/hello-blockstack > webpack-dev-server Project is running at http://localhost:8080/ @@ -368,13 +368,13 @@ Now that you have created your initial project and verified it running in an emu 4. Open the Module `build.gradle` file. 5. Set the `defaultConfig minSdkVersion` to `19`. - When you are done, you should see (within your own username not `moxiegirl`): + When you are done, you should see (within your own username not `meepers`): ```JS android { compileSdkVersion 27 defaultConfig { - applicationId "com.example.moxiegirl.hello_android" + applicationId "com.example.meepers.hello_android" minSdkVersion 19 targetSdkVersion 27 versionCode 1 diff --git a/_browser/ids-introduction.md b/_browser/ids-introduction.md index d4dc9eb6..d08aa12d 100644 --- a/_browser/ids-introduction.md +++ b/_browser/ids-introduction.md @@ -10,7 +10,7 @@ Through the Blockstack Browser you can create an identity. You use this single i point of contact as you interact with others through DApps. Others may be individual users or companies or software. Unless you allow it, none of these others have access to anything other than your identity, for example -`moxiegirl.id.blockstack`. Typically, others must ask to learn more about you, +`meepers.id.blockstack`. Typically, others must ask to learn more about you, and you can choose to share – or not. This document explains the free Blockstack ID, though there are others you can get for fee. You learn how to @@ -37,7 +37,7 @@ A Blockstack ID is a decentralized identity. You use this single identity to log Think of the ID as a form of identification, like a drivers license. Like drivers' licenses, each identity is unique, but this license identifies you on the virtual internet highway. An identity is created through a registrar of which there are many. When you create a Blockstack ID, your registrar records the identity creation on the Stacks blockchain. -The Blockstack Browser allows new users to create free IDs. These free IDs have included the word `blockstack` in the ID, like this `moxiegirl.id.blockstack`. The additional `blockstack` portion of the name is called a _namespace_. It just means all the names belong to a particular entity. You don't have to use a free `id.blockstack` identity. +The Blockstack Browser allows new users to create free IDs. These free IDs have included the word `blockstack` in the ID, like this `meepers.id.blockstack`. The additional `blockstack` portion of the name is called a _namespace_. It just means all the names belong to a particular entity. You don't have to use a free `id.blockstack` identity. This first Blockstack ID you create is a _primary ID_. Once you create a primary identity, you can add other, sub-identities to it. Sub-identities can have the `id.blockstack` or the `.id` format. You might created sub-identities for the same reason you have a work and home email. diff --git a/_browser/local_browser.md b/_browser/local_browser.md index 02cc93f1..687ac3a2 100644 --- a/_browser/local_browser.md +++ b/_browser/local_browser.md @@ -188,7 +188,7 @@ your operating system. From the command line: ```bash - $ rm -r /Users/moxiegirl/Library/Application\ Support/Blockstack + $ rm -r /Users/meepers/Library/Application\ Support/Blockstack ``` ### On Windows diff --git a/_browser/todo-list.md b/_browser/todo-list.md index b098f1a7..3440a816 100644 --- a/_browser/todo-list.md +++ b/_browser/todo-list.md @@ -96,7 +96,7 @@ The example application runs in a node server on your local host. In the this se ```bash $ pwd - /Users/moxiegirl/repos/blockstack-todos + /Users/meepers/repos/blockstack-todos ``` This path will be different for you, but double-check the last part to ensure that you're in the directory into which you cloned and in which you ran `npm install`. diff --git a/_config.yml b/_config.yml index 8893959c..1630ced7 100644 --- a/_config.yml +++ b/_config.yml @@ -17,10 +17,12 @@ baseurl: "" # Site base hostname & protocol, e.g. http://example.com url: "https://docs.blockstack.org" -repository: moxiegirl/docs.blockstack +repository: blockstack/docs.blockstack staticman: branch: "master" -# github_editme_path: moxiegirl/docs-new/blob/master + +github_editme_path: blockstack/docs.blockstack/blob/master +branch_url: master # if you're using Github, provide the basepath to the branch you've created for reviews, following the sample here. if not, leave this value blank. @@ -167,6 +169,7 @@ sass: defaults: - scope: path: "" # an empty string here means all files in the project + basepath: elephant values: comments: true image: /assets/img/touch-icon.png @@ -175,31 +178,21 @@ defaults: collections: android: output: true - basepath: "blockstack/blockstack-android/blob/master/docs" community: output: true - basepath: "moxiegirl/docs.blockstack" core: output: true - basepath: "moxiegirl/docs.blockstack" develop: output: true - basepath: "moxiegirl/docs.blockstack" storage: output: true - basepath: "moxiegirl/docs.blockstack" browser: output: true - basepath: "moxiegirl/docs.blockstack" ios: output: true - basepath: "blockstack/blockstack-ios/blob/master/docs" common: output: true - basepath: "moxiegirl/docs.blockstack" org: output: true - basepath: "moxiegirl/docs.blockstack" faqs: output: true - basepath: "moxiegirl/docs.blockstack" \ No newline at end of file diff --git a/_data/glossary.csv b/_data/glossary.csv index 3601874e..9921de62 100644 --- a/_data/glossary.csv +++ b/_data/glossary.csv @@ -27,8 +27,8 @@ ephemeral key,A cryptographic key is called ephemeral if it is generated for eac fork,"The term fork is used to refer both to any situation where there are two or more competing versions of a blockchain on a network (a situation that may arise and resolve itself in the ordinary course of network operations due to lags in communication between core nodes) and any software update that is proposed for adoption by the core nodes of a blockchain network that may result in a persistent fork on the network, with core nodes that adopt the update recognizing one version of the blockchain and those which do not recognizing another." Gaia,Decentralized storage genesis block,"The genesis block is the first block of the Stacks blockchain, which will create the initial 1.32 billion Stacks Tokens." -id.blockstack,"An identifier in the Blockstack, for example moxiegirl.id.blockstack. This is your name & identity that is registered in the .id namespace on Blockstack. Your personal data and storage are built around this ID. Apps that want to access your data use your permission and identity to find it. An id is usually a shorthand for a longer, hash ID string, for example ID-1Fj9kkw15P51Fj9kkw15P5xJmyefWhLKrQMKNPREfaqsJ" -identity,"

A way to identify a person or an organization on the Blockstack network. An identity is unique, both moxiegirl.id.blockstack or chad.id are examples of IDs.

" +id.blockstack,"An identifier in the Blockstack, for example meepers.id.blockstack. This is your name & identity that is registered in the .id namespace on Blockstack. Your personal data and storage are built around this ID. Apps that want to access your data use your permission and identity to find it. An id is usually a shorthand for a longer, hash ID string, for example ID-1Fj9kkw15P51Fj9kkw15P5xJmyefWhLKrQMKNPREfaqsJ" +identity,"

A way to identify a person or an organization on the Blockstack network. An identity is unique, both meepers.id.blockstack or chad.id are examples of IDs.

" identity management (IDM),"Identity management, also known as identity and access management is, in computer security, the security and business discipline that enables the right individuals to access the right resources at the right times and for the right reason" know your customer (KYC),"Or KYC, is a popular term used in the banking or financial field. KYC is a process where financial institutions, insurers and other companies obtain information about the identity and address of the customers as part of risk management." KYC,See know your customer diff --git a/_data/theFAQs.json b/_data/theFAQs.json index 4aaa19a6..5b4b6efd 100644 --- a/_data/theFAQs.json +++ b/_data/theFAQs.json @@ -69,7 +69,7 @@ { "category": "appusers", "question": "How do I get an identity? Is it free?", - "answer": "

Normally, registering an identity as a digital asset on the Stacks blockchain requires burning of Stacks tokens as fuel. However, Blockstack PBC is currently running a free service to pay for identities on behalf of the users. Through this service, you can get a free identity from Blockstack in the id.blockstack namespace. A namespace is similar to a domain (checklist.com, for example) on the old internet. So, a free identity has blockstack suffix in its name; for example, moxiegirl.id.blockstack is a free Blockstack identity.

" + "answer": "

Normally, registering an identity as a digital asset on the Stacks blockchain requires burning of Stacks tokens as fuel. However, Blockstack PBC is currently running a free service to pay for identities on behalf of the users. Through this service, you can get a free identity from Blockstack in the id.blockstack namespace. A namespace is similar to a domain (checklist.com, for example) on the old internet. So, a free identity has blockstack suffix in its name; for example, meepers.id.blockstack is a free Blockstack identity.

" }, { "category": "appusers", @@ -99,7 +99,7 @@ { "category": "appusers", "question": "Do identities last forever or do they expire?", - "answer": "

Identities with the like moxiegirl.id.blockstack or subdomain.name.namespace format do not expire. Names that have a single dot like name.namespace expire according to the rules set by the namespace creators. For example, name.id in the id namespace expires every two years and must be renewed. If a name.id expires, someone else can claim it.

" + "answer": "

Identities with the like meepers.id.blockstack or subdomain.name.namespace format do not expire. Names that have a single dot like name.namespace expire according to the rules set by the namespace creators. For example, name.id in the id namespace expires every two years and must be renewed. If a name.id expires, someone else can claim it.

" }, { "category": "appusers", diff --git a/_develop/zero_to_dapp_3.md b/_develop/zero_to_dapp_3.md index a93ce863..2177a601 100644 --- a/_develop/zero_to_dapp_3.md +++ b/_develop/zero_to_dapp_3.md @@ -302,7 +302,7 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). To add a kingdom, you need its URL and the ID of its owner. -3. Edit the file and add the `https://animalkingdoms.netlify.com` which is owned by `moxiegirl.id.blockstack`. +3. Edit the file and add the `https://animalkingdoms.netlify.com` which is owned by `meepers.id.blockstack`. When you are done the file will look like this. @@ -319,7 +319,7 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). }, { app: 'https://animalkingdoms.netlify.com', - ruler: 'moxiegirl.id.blockstack' + ruler: 'meepers.id.blockstack' } ] ``` @@ -327,10 +327,10 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). 4. Save and close the `constants.js` file. 5. Back in your browser, navigate to the **Other Kingdoms** page. - + -6. Go to the `moxiegirl` kingdom by clicking on her kingdom. -7. Try adding a subject from Moxiegirl's kingdom to yours. +6. Go to the `meepers` kingdom by clicking on her kingdom. +7. Try adding a subject from meepers's kingdom to yours. ## Deploy your DApp on the web diff --git a/_develop/zero_to_dapp_3_win.md b/_develop/zero_to_dapp_3_win.md index c66c0f28..b4fa3c9a 100644 --- a/_develop/zero_to_dapp_3_win.md +++ b/_develop/zero_to_dapp_3_win.md @@ -311,7 +311,7 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). To add a kingdom, you need its URL and the ID of its owner. -3. Edit the file and add the `https://animalkingdoms.netlify.com` which is owned by `moxiegirl.id.blockstack`. +3. Edit the file and add the `https://animalkingdoms.netlify.com` which is owned by `meepers.id.blockstack`. When you are done the file will look like this. @@ -328,7 +328,7 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). }, { app: 'https://animalkingdoms.netlify.com', - ruler: 'moxiegirl.id.blockstack' + ruler: 'meepers.id.blockstack' } ] ``` @@ -336,10 +336,10 @@ you add a third, the Blockstack kingdom (`https://animalkingdoms.netlify.com`). 4. Save and close the `constants.js` file. 5. Back in your browser, navigate to the **Other Kingdoms** page. - + -6. Go to the `moxiegirl` kingdom by clicking on her kingdom. -7. Try adding a subject from Moxiegirl's kingdom to yours. +6. Go to the `meepers` kingdom by clicking on her kingdom. +7. Try adding a subject from meepers's kingdom to yours. ## Deploy your DApp on the web diff --git a/_includes/editme.html b/_includes/editme.html index ff5ceb6e..dc9b92f3 100644 --- a/_includes/editme.html +++ b/_includes/editme.html @@ -1,4 +1,5 @@ -{% assign theCol = site.collections | where: "label", page.collection | first %} + + {% assign filename = page.slug | append: '.md' %} - + Edit this page on Github diff --git a/_includes/keyphrase.md b/_includes/keyphrase.md index 636799b5..c5fa722f 100644 --- a/_includes/keyphrase.md +++ b/_includes/keyphrase.md @@ -26,7 +26,7 @@ Use the following table to answer questions about keys/phrases/values you can sh

SHAREABLE

-

A way to identify a person or an organization on the Blockstack network. An identity is unique, both moxiegirl.id.blockstack or chad.id are examples of IDs.

+

A way to identify a person or an organization on the Blockstack network. An identity is unique, both meepers.id.blockstack or chad.id are examples of IDs.

diff --git a/_includes/post-meta.html b/_includes/post-meta.html index 73b803c0..9f3a9ed9 100644 --- a/_includes/post-meta.html +++ b/_includes/post-meta.html @@ -15,4 +15,5 @@ diff --git a/_ios/tutorial.md b/_ios/tutorial.md index c7ed7f34..674b8050 100644 --- a/_ios/tutorial.md +++ b/_ios/tutorial.md @@ -146,7 +146,7 @@ In this section, you build an initial React.js application called ```bash npm run start - > hello-blockstack@0.0.0 start /Users/moxiegirl/repos/hello-blockstack + > hello-blockstack@0.0.0 start /Users/meepers/repos/hello-blockstack > webpack-dev-server Project is running at http://localhost:8080/ diff --git a/_org/explore.md b/_org/explore.md index 7b93ccb5..4288fc3d 100644 --- a/_org/explore.md +++ b/_org/explore.md @@ -26,7 +26,7 @@ You use {::nomarkdown} @@ -208,7 +208,7 @@ You should have the console open as `root` on your Droplet. In this section, you 1. Copy the Gaia code into your droplet using the `git clone` command. ``` - root@moxiegirl:~# git clone https://github.com/blockstack/gaia.git + root@meepers:~# git clone https://github.com/blockstack/gaia.git ``` Successful output from this command looks like the following. @@ -221,7 +221,7 @@ You should have the console open as `root` on your Droplet. In this section, you remote: Total 4206 (delta 27), reused 35 (delta 17), pack-reused 4143 Receiving objects: 100% (4206/4206), 17.40 MiB | 9.89 MiB/s, done. Resolving deltas: 100% (2700/2700), done. - root@moxiegirl:~# + root@meepers:~# ``` This command creates a `gaia` subdirectory. @@ -251,11 +251,11 @@ You should have the console open as `root` on your Droplet. In this section, you 6. Set the `bucket` to the name of the DigitalOcean space you just created. - If your space is called `moxiegirl-hub-space`, the `bucket` value is `moxiegirl-hub-space`. + If your space is called `meepers-hub-space`, the `bucket` value is `meepers-hub-space`. 6. Set the `readURL` to the URL of the DigitalOcean space you just created. - If your space URL called `https://moxiegirl-hub-space.sfo2.digitaloceanspaces.com `, the `readURL` name is `https://moxiegirl-hub-space.sfo2.digitaloceanspaces.com`. + If your space URL called `https://meepers-hub-space.sfo2.digitaloceanspaces.com `, the `readURL` name is `https://meepers-hub-space.sfo2.digitaloceanspaces.com`. 7. Add an `endpoint` value to the `awsCredentials` section. @@ -290,8 +290,8 @@ You should have the console open as `root` on your Droplet. In this section, you "servername": "", "port": 3000, "driver": "aws", - "bucket": "moxiegirl-hub-space", - "readURL": "https://moxiegirl-hub-space.sfo2.digitaloceanspaces.com", + "bucket": "meepers-hub-space", + "readURL": "https://meepers-hub-space.sfo2.digitaloceanspaces.com", "awsCredentials": { "accessKeyId": "W7GBQGIUWDWKA6KAGL56", "secretAccessKey": "O6hBYRPCeRmE0d9lr3Frtc345QsWt3l+mrDgvrVT9oE", @@ -382,7 +382,7 @@ While your console is still in the the `gaia/hub` folder, build the `gaia.hub` i ```bash - root@moxiegirl:~/gaia/hub# docker ps + root@meepers:~/gaia/hub# docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES aeca7eea4a86 gaia.hub "npm run start" 11 seconds ago Up 10 seconds 0.0.0.0:3000->3000/tcp musing_payne ``` @@ -425,7 +425,7 @@ In this task, you set up a simple Nginx reverse proxy to serve your Docker conta 6. Run `nginx -t` to make sure you have no syntax errors. ``` - root@moxiegirl:~/gaia/hub# nginx -t + root@meepers:~/gaia/hub# nginx -t nginx: the configuration file /etc/nginx/nginx.conf syntax is ok nginx: configuration file /etc/nginx/nginx.conf test is successful ``` @@ -460,7 +460,7 @@ Now, you are ready to test your Gaia server and make sure it is up and running. The `read_url_prefix` should be combine from the bucket and endpoint create in your `config.json` file, for example, - `https://moxiegirl-hub-space.s3.amazonaws.com/`. + `https://meepers-hub-space.s3.amazonaws.com/`. ## Task 9: Configure a domain name