add TODOs for after eclipse-che/che#13665 is done; tweak copy

Change-Id: I4209eecf2a6e5ef33f7901571792ab35e0611186
Signed-off-by: nickboldt <nboldt@redhat.com>

src/main/pages/che-7/hands-on-guidance/proc_creating-a-workspace-by-importing-source-code-of-your-project.adoc

@@ -4,8 +4,8 @@
 This section is about how to create a new workspace to edit an existing codebase. There are 3 ways to do that:
 
 * xref:#configure-devfile[Select a stack from the User Dashboard, then change the devfile] to include your project
-* Add a devfile to a git repository and start the workspace using chectl or a factory
-* Import a project into a running workspace from the editor
+* xref:#configuring-a-che-workspace-using-a-devfile_end-user-tasks[Add a devfile to a git repository] and start the workspace using chectl or a factory
+* Import a project into a running workspace from the editor (see below)
 
 [discrete]
 == Prerequisites
@@ -14,29 +14,31 @@ This section is about how to create a new workspace to edit an existing codebase
 * Or, you need a Kubernetes cluster such as link:https://github.com/kubernetes/minikube#installation[Minikube] to use Che on Kubernetes.
 
 [discrete]
-== Importing from the dashboard (existing workspace)
+== Importing from the dashboard into an existing workspace
 
 There are at least two ways to import a project via the User Dashboard.
 
 From the User Dashboard, select Workspaces, then select your workspace by clicking on its name, or use the gear icon. The former will link you to the workspace's *Overview* tab, while the latter will link to the *Devfile* tab where you can enter your own YAML configuration.
 
 In either case, click the *Projects* tab next.
 
+// TODO https://github.com/eclipse/che/issues/13665 remove ref to blank and zip
 From the *Projects* tab of your workspace's configuration page in the User Dashboard, click the Add Project button. You can then import a sample project, create a blank project, import from a git project, or import from a zip file.
 
 image::workspaces/workspace-config-projects.png[Add projects to workspace]
 
+[NOTE]
+====
+You can add a project to a non-running workspace, but you must start the workspace to delete it.
+====
+
+// TODO https://github.com/eclipse/che/issues/13665 remove section
 === Create a new repository
 
 To add a link:https://github.com/che-samples/blank[blank project], give it a name and a description:
 
 image::workspaces/add-blank-project.png[Add blank project]
 
-[NOTE]
-====
-While you can add a project to a non-running workspace, you cannot delete it until you start the workspace.
-====
-
 Next, open your workspace by clicking the green *Open* button.
 
 image::workspaces/open-blank-project.png[Your empty project]
@@ -49,6 +51,7 @@ image::workspaces/add-git-project.png[Add existing git project]
 
 Next, open your workspace by clicking the green *Open* button.
 
+// TODO https://github.com/eclipse/che/issues/13665 fix screenshot
 image::workspaces/open-git-project.png[Your git project]
 
 === Edit commands after importing a project