Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6be2bff authored by Joe Fernandez's avatar Joe Fernandez Committed by Android Git Automerger
Browse files

am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 

* commit '40c4ccf4':
  doc: SDK install page fix and link fixes
parents 160e7607 40c4ccf4

docs/html/sdk/installing/index.jd

+1 −2
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ for your favorite IDE (if available).</p> 


<p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other"

><b>download the SDK now</b></a>,

or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=adt">Eclipse ADT

install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio

or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio

install</a> instructions.</p>

docs/html/sdk/installing/migrate.jd

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ page.title=Migrating to Android Studio 
</div>



<p>If you're currently using Eclipse with ADT, we recommend you migrate to

<a href="{@docRoot}tools/basics/index.html">Android Studio</a>, a new Android

<a href="{@docRoot}tools/studio/index.html">Android Studio</a>, a new Android

development environment powered by IntelliJ IDEA. On top of the capabilities you expect from

IntelliJ, Android Studio offers:</p>

docs/html/tools/debugging/debugging-studio.jd

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ page.title=Debugging with Android Studio 
</ol>

<h2>See also</h2>

<ul>

<li><a href="{@docRoot}tools/basics/index.html">

<li><a href="{@docRoot}sdk/installing/studio-tips.html">

Android Studio Tips and Tricks</a></li>

<li><a href="{@docRoot}tools/debugging/index.html">Debugging</a></li>

<li><a href="{@docRoot}tools/help/monitor.html">Device Monitor</a></li>

docs/html/tools/eclipse/index.jd

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ page.title=Eclipse ADT 
  <h2>See also</h2>

  <ol>

    <li><a href="{@docRoot}tools/sdk/index.html">Downloading Android Studio</a></li>

    <li><a href="{@docRoot}tools/basics/index.html">Android Studio Basics</a></li>

    <li><a href="{@docRoot}tools/studio/index.html">Android Studio</a></li>

    <li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating to Android Studio</a></li>

  </ol>

</div>
@@ -26,8 +26,8 @@ to Android Studio</a> as the Eclipse ADT is no longer in active development. 
with an Android plugin for <em>Gradle</em>. <a href="http://www.gradle.org/">Gradle</a> is an

advanced build toolkit that manages dependencies and allows you to define custom build logic. Android

Studio also adds support for Maven-based build dependencies, build variants, advanced code

completion and refactoring. For more details about Android Studio, see

<a href="{@docRoot}tools/studio/basics.html">Android Studio basics.</a>

completion and refactoring. For more details about Android Studio, see the

<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.



<p>If you still wish to get started with the ADT plugin,

<a href="{@docRoot}tools/eclipse/installing-adt.html">download and install the Eclipse ADT plugin.</a>

docs/html/tools/publishing/app-signing.jd

+2 −1
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ more than one), and enter the required information.</p> 
</ol>



<p>You can also specify your signing settings in Gradle configuration files. For more information,

see <a href="{@docRoot}tools/gradle/studio-build.html#configureSigning">Signing settings</a>.</p>

see <a href="{@docRoot}tools/building/configuring-gradle.html#configureSigning">Configuring Gradle

Builds</a>.</p>