summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-06-30 22:21:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 22:21:18 +0000
commit761b4a7deb2438e039fdb11a05e2de41593ffd8f (patch)
tree872b89d5a384a2bb020b164105447bc8eff6c6ad /docs
parented053477d0f76edad4853f0a5aac275acfe2d6ce (diff)
parenta351bca51a2bb2cf8abb7c1c3b92c56eb6de3fbf (diff)
downloadframeworks_base-761b4a7deb2438e039fdb11a05e2de41593ffd8f.zip
frameworks_base-761b4a7deb2438e039fdb11a05e2de41593ffd8f.tar.gz
frameworks_base-761b4a7deb2438e039fdb11a05e2de41593ffd8f.tar.bz2
Merge "docs: migration guide link update" into mnc-preview-docs
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/installing/migrate.jd8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index d9829395..6dedad6 100644
--- a/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@ -50,7 +50,7 @@ the key changes you should be aware of as you prepare to migrate to Android Stud
<p>Android Studio uses a different project structure. Each Eclipse ADT
project is called a module in Android Studio. Each instance of Android
Studio contains a project with one or more app modules. For more information see,
- <a href="{@docRoot}tools/studio/eclipse-migration-guide.html#project-structure">Project
+ <a href="{@docRoot}tools/studio/eclipse-transition-guide.html#project-structure">Project
Structure</a>.</p></li>
<li><strong>Manifest settings</strong>
@@ -59,14 +59,14 @@ the key changes you should be aware of as you prepare to migrate to Android Stud
<code>build.gradle</code> file. These elements are still valid manifest entries and may
appear in manifests from older projects, imported projects, dependencies, and libraries. For
more information see,
- <a href="{@docRoot}tools/studio/eclipse-migration-guide.html#manifest-settings">Manifest
+ <a href="{@docRoot}tools/studio/eclipse-transition-guide.html#manifest-settings">Manifest
Settings</a>.</p></li>
<li><strong>Dependencies</strong>
<p>Library dependencies are handled differently in Android Studio, using Gradle dependency
declarations and Maven dependencies for well-known local source and binary libraries with
Maven coordinates. For more information see,
- <a href="{@docRoot}tools/studio/eclipse-migration-guide.html#dependencies">Dependencies</a></p>
+ <a href="{@docRoot}tools/studio/eclipse-transition-guide.html#dependencies">Dependencies</a></p>
</li>
<li><strong>Test code</strong>
@@ -261,7 +261,7 @@ Android Studio project and does not impact the existing Eclipse ADT project. </p
<a href="http://www.gradle.org">Gradle</a>-based build system to become familiar with the new
project and module structure, flexible build settings, and other advanced Android development
capabilities. For a comparison of Eclipse ADT and Android Studio features and usage, see
-<a href="{@docRoot}tools/studio/eclipse-migration-guide.html">Transitioning to Android Studio from
+<a href="{@docRoot}tools/studio/eclipse-transition-guide.html">Transitioning to Android Studio from
Eclipse</a>. For specific Android Studio how-to documentation, see the pages in the
<a href="{@docRoot}tools/workflow/index.html">Workflow</a> section.
</p>