fixing conflicts in the TOCs

gustin · Dec 6, 2008 · df66257 · df66257
2 parents 4694691 + 5ed1c66
commit df66257
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/book-content/en/toc.markdown b/book-content/en/toc.markdown
@@ -59,4 +59,7 @@
   1. [Available Slices](/appendix/slices)
   1. [Useful Gems](/appendix/gems)
 
+1. [Appendix Hints/Tips:](/appendix/hints-tips)
+1. [Appendix Available Slices:](/appendix/slices)
+1. [Appendix Useful Gems:](/appendix/gems)
 {: #appendices}
diff --git a/book-content/pt/toc.markdown b/book-content/pt/toc.markdown
@@ -6,15 +6,15 @@
 	<p>Se você está aprendendo através desse material, ou se já usa Merb frequentemente, <strong>por favor considere a possibilidade de ajudar a melhorar o conteúdo desse livro</strong>.</p>
 </div>
 
-0. [Front Matter](/pt/front-matter)
-	1. [Foreword por Yehuda Katz](/pt/front-matter/foreword)
-	2. [Prefácio por Matt Aimonetti](/pt/front-matter/preface)
-	3. [Colaboradores](/pt/front-matter/contributors)
-1. [Introdução](/pt/introduction)
-	1. [Linguagem Ruby](/pt/introduction/ruby)
-	2. [Merb Web Framework](/pt/introduction/merb)
-	3. [DataMapper ORM](/pt/introduction/datamapper)
-	4. [RSpec testing framework](/pt/introduction/rspec)
+1. [Front Matter](/front-matter)
+	1. [Foreword por Yehuda Katz](/front-matter/foreword)
+	2. [Prefácio por Matt Aimonetti](/front-matter/preface)
+	3. [Contributors](/front-matter/contributors)
+2. [Introdução](/introduction)
+	1. [A Linguagem Ruby](/introduction/ruby)
+	2. [O Framework Web Merb](/introduction/merb)
+	3. [O ORM DataMapper](/introduction/datamapper)
+	4. [O Framework de Testes RSpec](/introduction/rspec)
 2. [Iniciando](/pt/getting-started)
   1. [Instalando](/pt/getting-started/install-instructions)
 	1. [Generate an application](/pt/getting-started/generate-an-application)