Browse Source

resolve conflicts with readme.md

Beverley Talbott 13 years ago
parent
commit
fdf18d9546
1 changed files with 14 additions and 9 deletions
  1. 14
    9
      SIDEBAR.md

+ 14
- 9
SIDEBAR.md View File

@@ -1,22 +1,27 @@
1
-
2
-Related Resources
3
------------------
1
+### Related Resources
4 2
 
5 3
 There's more to building RESTful web services than is covered here. You may want to continue your exploration of Spring and REST with the following
6 4
 
7
-### Getting Started guides:
5
+### Getting Started Guides
8 6
 
9 7
 * Handling POST, PUT, and GET requests in REST services
10 8
 * Creating self-describing APIs with HATEOAS
11
-* Securing a REST service with HTTP Basic
12 9
 * Securing a REST service with OAuth
13
-* Consuming REST services
14
-* Testing REST services
10
+* [Consuming RESTful web services][gs-consuming-rest]
11
+* Testing RESTful web services
12
+
13
+[gs-consuming-rest]: /guides/gs/consuming-rest/content
14
+
15
+### Tutorials
16
+
17
+* [Tutorial TBD][tut-tbd]
18
+
19
+[tut-tbd]: /guides/tutorials/tbd
15 20
 
16 21
 ### Understanding
17 22
 
18
-* [Understanding REST][u-rest]
19
-* [Understanding Json][u-json]
23
+* [REST][u-rest]
24
+* [JSON][u-json]
20 25
 
21 26
 [u-rest]: /understanding/rest
22 27
 [u-json]: /understanding/json