Merge pull request #19 from andymckay/move-fxa

move over fxa
mozilla · Jan 18, 2016 · eba0cc9 · eba0cc9
2 parents b577ef2 + e7e2873
commit eba0cc9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/docs/images/fxa-migration.png b/docs/images/fxa-migration.png
diff --git a/features/fxa-migration/README.md → docs/ux/fxa-migration.rst b/features/fxa-migration/README.md → docs/ux/fxa-migration.rst
@@ -1,14 +1,18 @@
-
 AMO to Firefox Account Migration UX Specs
 =========================================
 
 So that I can reduce the numbers of logins I have, as a Mozilla Add-ons user, I want to switch from using my AMO login and start using a Firefox Account.
 
-## User Flow Diagram
+User Flow Diagram
+-----------------
+
 Red line denotes common post-migration login experience.
-![User Flow Diagram](https://www.lucidchart.com/publicSegments/view/c45f10ff-5084-407d-8322-cbc8b6cd25be/image.png)
 
-## Migrating from AMO
+  .. image:: ../images/fxa-migration.png
+
+Migrating from AMO
+------------------
+
 * When a currently authenticated AMO user returns to AMO, they will see a notice prompting them to upgrade their account.
 * When a currently authenticated AMO user chooses the call to action in the notice, they are taken to the AMO login to confirm their identity.
 * When an existing AMO user enters their email address, they are taken to the AMO login.
@@ -20,18 +24,24 @@ Red line denotes common post-migration login experience.
 * When they change their email to one that already exists in FxA or AMO, they see the message **This account already exists on Mozilla Add-ons**.
 * When they are successful at migrating, they see the notice **Great job! You can now log in to AMO using your FxA**.
 
-## Registering
+Registering
+-----------
+
 * When an unauthenticated user chooses to register, they will see a **Join Mozilla Add-ons** form that asks for their email, with secondary option to switch to **Sign in**.
 * When a new user enters their email address, they are taken to the FxA registration.
 * When an FxA user enters their email address, they are taken to the FxA login.
 * When they change their email to one that already exists in FxA or AMO, they see the message **This account already exists on Mozilla Add-ons**.
 * When a registering user successfully verifies their Firefox Account, they are taken to an incomplete AMO settings view that requires profile completion.
 * When a registering user completes their AMO profile, the old AMO account can be retired from service.
 
-## Logging In
+Logging In
+----------
+
 * When any unauthenticated user chooses to log in, they will see a **Sign in to Mozilla Add-ons** form that asks for their email, with secondary option to switch to **Create an account**.
 
-## Post-Migration
+Post-Migration
+--------------
+
 * When an already-migrated user returns to AMO, they will no longer see a notice prompting them to upgrade their account.
 * When an already-migrated user chooses to log in, they will see a **Sign in to Mozilla Add-ons** form that asks for their email, with secondary option to switch to **Create an account**.
 * When an already-migrated users clicks **Continue**, they taken to FxA login that is pre-populated with their email.

diff --git a/docs/ux/index.rst b/docs/ux/index.rst
@@ -2,3 +2,10 @@ UX
 ==
 
 UX for the `server <https://addons.mozilla.org/en-US/firefox/>`_ and client.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   fxa-migration.rst