summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2011-02-08 10:32:08 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-08 10:32:08 -0800
commit2d258298e2fec670908c69e38c5a3a05b1f3d0f0 (patch)
treed510c33c2dedf6d28f26a2aeb1965c07be2608d7
parente056d2ad427f36a78dec1461295a90c20d534863 (diff)
parent967648121d3857b808941848203dfa44229781d7 (diff)
am 96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
* commit '967648121d3857b808941848203dfa44229781d7': cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
-rw-r--r--docs/html/guide/guide_toc.cs2
-rw-r--r--docs/html/guide/topics/network/sip.jd (renamed from docs/html/guide/topics/sip/SIP.jd)0
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 012c3e305391..441bdf53b042 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -276,7 +276,7 @@
<li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html">
<span class="en">Bluetooth</span>
</a></li>
- <li><a href="<?cs var:toroot?>guide/topics/sip/SIP.html">
+ <li><a href="<?cs var:toroot?>guide/topics/network/sip.html">
<span class="en">Session Initiation Protocol</span></a>
<span class="new">new!</span>
</li>
diff --git a/docs/html/guide/topics/sip/SIP.jd b/docs/html/guide/topics/network/sip.jd
index 8cd23141cf9e..8cd23141cf9e 100644
--- a/docs/html/guide/topics/sip/SIP.jd
+++ b/docs/html/guide/topics/network/sip.jd