Merge branch 'master' of github.com:urbit/urbit

This commit is contained in:
C. Guy Yarvin 2013-12-26 12:12:44 -05:00
commit 8c90b1dbc5
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
You've selected a personal identity. For a %lord or a %lady, You've selected a personal identity. For a %lord or a %lady,
please use your real name only. If you'd prefer a fictitious please use your real name only. If you'd prefer a fictitious
handle, you can hit ^V and start over as a %punk. Or you can handle, you can hit ^D and start over as a %punk. Or you can
use %anon and go by your ship name alone. use %anon and go by your ship name alone.
As a real person, we're going to ask you for a little bit of As a real person, we're going to ask you for a little bit of

View File

@ -1,5 +1,5 @@
Let's configure your identity. Warning - it's nontrivial to Let's configure your identity. Warning - it's nontrivial to
change this data once you've sent it to the server. If you enter change this data once you've sent it to the server. If you enter
something wrong, hit ^V to cancel, then run the program again. something wrong, hit ^D to cancel, then run the program again.