Revert "3.0 better toc"

sdevore · Oct 20, 2014 · 8146456 · 8146456
1 parent 54687bc
commit 8146456
Show file tree

Hide file tree

Showing 54 changed files with 870 additions and 1,216 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # MakeFile for building all the docs at once.
-# Inspired by the Makefile used by bazaar.
+# Inspired by the Makefile used by bazaar. 
 # http://bazaar.launchpad.net/~bzr-pqm/bzr/2.3/
 
 PYTHON = python
@@ -25,7 +25,7 @@ SPHINX_DEPENDENCIES = $(foreach lang, $(LANGS), $(lang)/Makefile)
 
 #
 # The various formats the documentation can be created in.
-#
+# 
 # Loop over the possible languages and call other build targets.
 #
 html: $(foreach lang, $(LANGS), html-$(lang))
@@ -35,7 +35,6 @@ latex: $(foreach lang, $(PDF_LANGS), latex-$(lang))
 pdf: $(foreach lang, $(PDF_LANGS), pdf-$(lang))
 htmlhelp: $(foreach lang, $(LANGS), htmlhelp-$(lang))
 populate-index: $(foreach lang, $(LANGS), populate-index-$(lang))
-server: $(foreach lang, $(LANGS), server-$(lang))
 
 
 # Make the HTML version of the documentation with correctly nested language folders.
@@ -54,9 +53,6 @@ latex-%: $(SPHINX_DEPENDENCIES)
 pdf-%: $(SPHINX_DEPENDENCIES)
 	cd $* && make latexpdf LANG=$*
 
-server-%: $(SPHINX_DEPENDENCIES)
-	cd build/html/$* && python -m SimpleHTTPServer
-
 populate-index-%: $(SPHINX_DEPENDENCIES)
 	php scripts/populate_search_index.php $* $(ES_HOST)
 

diff --git a/en/contents.rst b/en/contents.rst
@@ -12,48 +12,34 @@ Contents
 
     intro
     quickstart
-    appendices/3-0-migration-guide
-    tutorials-and-examples
-    contributing
-
     installation
     development/configuration
     development/routing
     controllers/request-response
     controllers
     views
     orm
-    development/errors
+    plugins
 
+    development/errors
     core-libraries/caching
-    console-and-shells
-    development/debugging
-    deployment
-    core-libraries/email
-    core-libraries/events
-    core-libraries/internationalization-and-localization
     core-libraries/logging
-    controllers/components/pagination
-    plugins
+    core-libraries/events
+
+    development/sessions
     development/rest
+    controllers/components/pagination
     security
-    development/sessions
-    development/testing
+    core-libraries/email
     core-libraries/validation
+    core-libraries/internationalization-and-localization
+    development/testing
+    deployment
+    console-and-shells
+    core-libraries
 
-    core-libraries/app
-    core-libraries/collections
-    core-libraries/file-folder
-    core-libraries/hash
-    core-libraries/httpclient
-    core-libraries/inflector
-    core-libraries/number
-    core-libraries/registry-objects
-    core-libraries/string
-    core-libraries/time
-    core-libraries/xml
-
-    core-libraries/global-constants-and-functions
+    contributing
+    tutorials-and-examples
     appendices
 
 .. todolist::

diff --git a/en/core-libraries.rst b/en/core-libraries.rst
@@ -0,0 +1,28 @@
+Core Utility Libraries
+#######################
+
+Beyond the core MVC components, CakePHP includes a great selection of utility
+classes that help you do everything from webservice requests, to manipulating
+arrays, to formatting numbers and strings and more.
+
+.. toctree::
+    :maxdepth: 2
+
+    core-libraries/app
+    core-libraries/collections
+    core-libraries/file-folder
+    core-libraries/global-constants-and-functions
+    core-libraries/hash
+    core-libraries/httpclient
+    core-libraries/inflector
+    core-libraries/number
+    core-libraries/registry-objects
+    core-libraries/router
+    core-libraries/security
+    core-libraries/string
+    core-libraries/time
+    core-libraries/xml
+
+.. meta::
+    :title lang=en: Core Libraries
+    :keywords lang=en: core libraries,global constants,cookie,access control lists,number,text,time,security component,core components,general purpose,web applications,markup,authentication,api,cakephp,functionality,sessions,collections,events
diff --git a/en/core-libraries/global-constants-and-functions.rst b/en/core-libraries/global-constants-and-functions.rst
@@ -1,5 +1,5 @@
-Constants & Functions
-#####################
+Global Constants and Functions
+##############################
 
 While most of your day-to-day work in CakePHP will be utilizing
 core classes and methods, CakePHP features a number of global

diff --git a/en/core-libraries/router.rst b/en/core-libraries/router.rst
@@ -0,0 +1,14 @@
+Router
+######
+
+Router can be used to parse URLs into arrays containing indexes for
+the controller, action, and any parameters, and the opposite: to
+convert URL arrays (eg. ``['controller' => 'Posts', 'action' => 'index']``)
+to string URLs.
+
+Read more about ways to :ref:`configure the Router <routes-configuration>` and
+the :php:class:`Router` class.
+
+.. meta::
+    :title lang=en: Router
+    :keywords lang=en: array controller,php class,indexes,urls,configure router,parameters
diff --git a/en/development.rst b/en/development.rst
@@ -0,0 +1,21 @@
+Development
+###########
+
+In this section we'll cover the various aspects of developing a CakePHP
+application. Topics like handling errors & exceptions,
+debugging, and testing will be covered.
+
+.. toctree::
+    :maxdepth: 1
+
+    development/sessions
+    development/errors
+    development/debugging
+    development/testing
+    development/rest
+    development/dispatch-filters
+
+
+.. meta::
+    :title lang=en: Development
+    :keywords lang=en: development sessions,debugging,exceptions
diff --git a/en/epub-contents.rst b/en/epub-contents.rst
@@ -6,48 +6,30 @@ Contents
 
     intro
     quickstart
-    appendices/3-0-migration-guide
-    tutorials-and-examples
-    contributing
-
     installation
     development/configuration
     development/routing
     controllers/request-response
     controllers
     views
     orm
-    development/errors
 
+    development/errors
     core-libraries/caching
-    console-and-shells
-    development/debugging
-    deployment
-    core-libraries/email
-    core-libraries/events
-    core-libraries/internationalization-and-localization
     core-libraries/logging
-    controllers/components/pagination
-    plugins
+    core-libraries/events
+
+    development/sessions
     development/rest
+    controllers/components/pagination
     security
-    development/sessions
-    development/testing
+    core-libraries/email
     core-libraries/validation
-
-    core-libraries/app
-    core-libraries/collections
-    core-libraries/file-folder
-    core-libraries/hash
-    core-libraries/httpclient
-    core-libraries/inflector
-    core-libraries/number
-    core-libraries/registry-objects
-    core-libraries/string
-    core-libraries/time
-    core-libraries/xml
-
-    core-libraries/global-constants-and-functions
+    core-libraries/internationalization-and-localization
+    development/testing
+    deployment
+    console-and-shells
+    core-libraries
     appendices
 
 .. todolist::

diff --git a/en/pdf-contents.rst b/en/pdf-contents.rst
@@ -6,48 +6,30 @@ Contents
 
     intro
     quickstart
-    appendices/3-0-migration-guide
-    tutorials-and-examples
-    contributing
-
     installation
     development/configuration
     development/routing
     controllers/request-response
     controllers
     views
     orm
-    development/errors
 
+    development/errors
     core-libraries/caching
-    console-and-shells
-    development/debugging
-    deployment
-    core-libraries/email
-    core-libraries/events
-    core-libraries/internationalization-and-localization
     core-libraries/logging
-    controllers/components/pagination
-    plugins
+    core-libraries/events
+
+    development/sessions
     development/rest
+    controllers/components/pagination
     security
-    development/sessions
-    development/testing
+    core-libraries/email
     core-libraries/validation
-
-    core-libraries/app
-    core-libraries/collections
-    core-libraries/file-folder
-    core-libraries/hash
-    core-libraries/httpclient
-    core-libraries/inflector
-    core-libraries/number
-    core-libraries/registry-objects
-    core-libraries/string
-    core-libraries/time
-    core-libraries/xml
-
-    core-libraries/global-constants-and-functions
+    core-libraries/internationalization-and-localization
+    development/testing
+    deployment
+    console-and-shells
+    core-libraries
     appendices
 
 

diff --git a/en/security.rst b/en/security.rst
@@ -7,7 +7,6 @@ The following sections cover those tools:
 .. toctree::
     :maxdepth: 1
 
-    core-libraries/security
     controllers/components/csrf
     controllers/components/security
 

diff --git a/en/tutorials-and-examples.rst b/en/tutorials-and-examples.rst
@@ -14,7 +14,6 @@ and components.
     :maxdepth: 1
 
     tutorials-and-examples/bookmarks/intro
-    tutorials-and-examples/bookmarks/part-two
     tutorials-and-examples/blog/blog
     tutorials-and-examples/blog/part-two
     tutorials-and-examples/blog-auth-example/auth

diff --git a/es/contents.rst b/es/contents.rst
@@ -4,51 +4,21 @@ Contenidos
 .. toctree::
    :maxdepth: 3
 
-    intro
-    quickstart
-    appendices/3-0-migration-guide
-    tutorials-and-examples
-    contributing
-
-    installation
-    development/configuration
-    development/routing
-    controllers/request-response
-    controllers
-    views
-    orm
-    development/errors
-
-    core-libraries/caching
-    console-and-shells
-    development/debugging
-    deployment
-    core-libraries/email
-    core-libraries/events
-    core-libraries/internationalization-and-localization
-    core-libraries/logging
-    controllers/components/pagination
-    plugins
-    development/rest
-    security
-    development/sessions
-    development/testing
-    core-libraries/validation
-
-    core-libraries/app
-    core-libraries/collections
-    core-libraries/file-folder
-    core-libraries/hash
-    core-libraries/httpclient
-    core-libraries/inflector
-    core-libraries/number
-    core-libraries/registry-objects
-    core-libraries/string
-    core-libraries/time
-    core-libraries/xml
-
-    core-libraries/global-constants-and-functions
-    appendices
+   index
+   installation
+   getting-started
+   cakephp-overview
+   controllers
+   views
+   orm
+   core-libraries
+   plugins
+   console-and-shells
+   development
+   deployment
+   contributing
+   appendices
+   tutorials-and-examples
 
 .. todolist::