Revert "Revert "3.0 better toc""

sdevore · Oct 20, 2014 · 66cc98a · 66cc98a
1 parent 6752541
commit 66cc98a
Show file tree

Hide file tree

Showing 54 changed files with 1,216 additions and 870 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,6 +35,7 @@ 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.
@@ -53,6 +54,9 @@ 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,34 +12,48 @@ Contents
 
     intro
     quickstart
+    appendices/3-0-migration-guide
+    tutorials-and-examples
+    contributing
+
     installation
     development/configuration
     development/routing
     controllers/request-response
     controllers
     views
     orm
-    plugins
-
     development/errors
+
     core-libraries/caching
-    core-libraries/logging
+    console-and-shells
+    development/debugging
+    deployment
+    core-libraries/email
     core-libraries/events
-
-    development/sessions
-    development/rest
+    core-libraries/internationalization-and-localization
+    core-libraries/logging
     controllers/components/pagination
+    plugins
+    development/rest
     security
-    core-libraries/email
-    core-libraries/validation
-    core-libraries/internationalization-and-localization
+    development/sessions
     development/testing
-    deployment
-    console-and-shells
-    core-libraries
+    core-libraries/validation
 
-    contributing
-    tutorials-and-examples
+    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
 
 .. todolist::

diff --git a/en/core-libraries.rst b/en/core-libraries.rst
diff --git a/en/core-libraries/global-constants-and-functions.rst b/en/core-libraries/global-constants-and-functions.rst
@@ -1,5 +1,5 @@
-Global Constants and Functions
-##############################
+Constants & 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
diff --git a/en/development.rst b/en/development.rst
diff --git a/en/epub-contents.rst b/en/epub-contents.rst
@@ -6,30 +6,48 @@ 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
+
     core-libraries/caching
-    core-libraries/logging
+    console-and-shells
+    development/debugging
+    deployment
+    core-libraries/email
     core-libraries/events
-
-    development/sessions
-    development/rest
+    core-libraries/internationalization-and-localization
+    core-libraries/logging
     controllers/components/pagination
+    plugins
+    development/rest
     security
-    core-libraries/email
-    core-libraries/validation
-    core-libraries/internationalization-and-localization
+    development/sessions
     development/testing
-    deployment
-    console-and-shells
-    core-libraries
+    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
 
 .. todolist::

diff --git a/en/pdf-contents.rst b/en/pdf-contents.rst
@@ -6,30 +6,48 @@ 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
+
     core-libraries/caching
-    core-libraries/logging
+    console-and-shells
+    development/debugging
+    deployment
+    core-libraries/email
     core-libraries/events
-
-    development/sessions
-    development/rest
+    core-libraries/internationalization-and-localization
+    core-libraries/logging
     controllers/components/pagination
+    plugins
+    development/rest
     security
-    core-libraries/email
-    core-libraries/validation
-    core-libraries/internationalization-and-localization
+    development/sessions
     development/testing
-    deployment
-    console-and-shells
-    core-libraries
+    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
 
 

diff --git a/en/security.rst b/en/security.rst
@@ -7,6 +7,7 @@ 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,6 +14,7 @@ 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,21 +4,51 @@ Contenidos
 .. toctree::
    :maxdepth: 3
 
-   index
-   installation
-   getting-started
-   cakephp-overview
-   controllers
-   views
-   orm
-   core-libraries
-   plugins
-   console-and-shells
-   development
-   deployment
-   contributing
-   appendices
-   tutorials-and-examples
+    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
 
 .. todolist::