Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename DAE to DAO #681

Merged
merged 2 commits into from
Jun 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/data/roadmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
image: "roadmap/dectrlOfFundsActive.svg"
title: "Decentralized Control of Dev Funds"
date: "Added Q1 2018"
description: "Stakeholder voting will allow funds to be allocated implement successful proposals. Decentralised Autonomous Entities (DAEs) will be able to take ownership of funds by way of a simple on-chain smart contract that delegates control over funds in a contract to a group of individuals."
description: "Stakeholder voting will allow funds to be allocated implement successful proposals. Decentralised Autonomous Organizations (DAOs) will be able to take ownership of funds by way of a simple on-chain smart contract that delegates control over funds in a contract to a group of individuals."
link: "https://blog.decred.org/2018/02/28/2018-Decred-Roadmap/"
- tags: ongoing
image: "roadmap/androidWalletsActive.svg"
Expand All @@ -102,9 +102,9 @@
link: "https://github.com/decred/decrediton/issues/1491"
- tags: ongoing
image: "roadmap/DAEActive.svg"
title: "Decentralized Autonomous Entities"
title: "Decentralized Autonomous Organizations"
date: "Added Q1 2018"
description: "Add support for user-created decentralized autonomous entities (DAEs), with decentralized control of funds as their basis. Instead of focusing on speculative tokenization seen in \"ICOs\", a DAE will be built around an on-chain smart contract delegating control over funds to a group of individuals."
description: "Add support for user-created decentralized autonomous organizations (DAOs), with decentralized control of funds as their basis. Instead of focusing on speculative tokenization seen in \"ICOs\", a DAO will be built around an on-chain smart contract delegating control over funds to a group of individuals."
link: "https://blog.decred.org/2018/02/28/2018-Decred-Roadmap/"
- tags: completed
image: "roadmap/DEXCompleted.svg"
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/brief/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
class="subpage-description ulink"
href="https://docs.decred.org/governance/politeia/">Politeia</a>, its platform
for managing policy and budget. Politeia was launched in October of 2018, and marks
a major milestone in the road to a fully decentralized, autonomous entity.</p>
a major milestone in the road to a fully decentralized, autonomous organization.</p>

<p>The project Treasury has been preserved by the custodians to this point, with a
belief that major expenditures should wait until they can be formally approved by
Expand Down Expand Up @@ -258,7 +258,7 @@
Politeia is built around the concept of transparent censorship, giving users who are
censored the power to prove what was censored and hold administrators accountable.
This robust public record of governance proceedings provides a solid foundation upon
which to build up the Decred Decentralized Autonomous Entity which will ultimately
which to build up the Decred Decentralized Autonomous Organization which will ultimately
govern the treasury and the project’s direction.</p>

<p><a class="subpage-description ulink" href="#">Lightning Network</a> — Lightning
Expand Down
2 changes: 1 addition & 1 deletion transifex_catalogs/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"home_guide_36": "Continue",
"home_guide_37": "Back",
"home_guide_38": "Planned Features",
"home_guide_39": "<p>Part of the reward from new blocks goes towards the development of Decred to ensure that it will continually evolve to meet the needs and wants of the community now and in the years to come. These are just some of the features planned for 2018 and early 2019:</p><ul><li>Lightning network</li><li>Initial privacy release</li><li>Decentralized control of funds</li><li>Decentralized autonomous entities</li><li>Scalability optimizations</li><li>Decrediton integrations</li><li>Marketing growth</li><li>Proposal for a Decentralized Exchange</li></ul><p>Read about these and more on our blog. <a href=\"https://blog.decred.org\" target=\"_blank\" rel=\"noopener noreferrer\">Welcome to Decred: the future of autonomous digital currency</a></p>",
"home_guide_39": "<p>Part of the reward from new blocks goes towards the development of Decred to ensure that it will continually evolve to meet the needs and wants of the community now and in the years to come. These are just some of the features planned for 2018 and early 2019:</p><ul><li>Lightning network</li><li>Initial privacy release</li><li>Decentralized control of funds</li><li>Decentralized autonomous organizations</li><li>Scalability optimizations</li><li>Decrediton integrations</li><li>Marketing growth</li><li>Proposal for a Decentralized Exchange</li></ul><p>Read about these and more on our blog. <a href=\"https://blog.decred.org\" target=\"_blank\" rel=\"noopener noreferrer\">Welcome to Decred: the future of autonomous digital currency</a></p>",
"home_guide_40": "Continue",
"home_guide_41": "Back",
"downloads_description": "If you are new to Decred, be sure to read the <a href=\"../#guide\">Getting Started Tour</a> or the <a href=\"../#platform\">Technical Overview</a> if you want to dig deeper. If you are downloading the Decred binaries, please follow these <a href=\"https://github.com/decred/decred-binaries/blob/v1.1.3/README.md#verifying-binaries\">Binary Verification</a> steps to verify the checksums.",
Expand Down