move api docs to 3x folder

/api.html route remains for backwards compat and will point to latest stable release docs
expressjs · Mar 1, 2014 · 683fbc4 · 683fbc4
1 parent b3c31df
commit 683fbc4
Show file tree

Hide file tree

Showing 88 changed files with 60 additions and 58 deletions.
diff --git a/3x/api.jade b/3x/api.jade
@@ -0,0 +1,37 @@
+!!! 5
+html
+  head
+    title Express - api reference
+    include ../includes/head
+  body.inner
+    .bar
+    section#content
+      header
+        include ../includes/logo
+        active = '/3x/api.html'
+        include ../includes/menu
+
+      include ../includes/mixins
+
+      include ./en/api/menu
+
+      #right
+        include ./en/api/express
+
+        h2 Application
+        a(name='application')
+        include ./en/api/app
+
+        h2 Request
+        a(name='request')
+        include ./en/api/req
+
+        h2 Response
+        a(name='response')
+        include ./en/api/res
+
+        h2 Middleware
+        a(name='middleware')
+        include ./en/api/middleware
+
+    include ../includes/footer
diff --git a/en/api/app-VERB.jade → 3x/en/api/app-VERB.jade b/en/api/app-VERB.jade → 3x/en/api/app-VERB.jade
diff --git a/en/api/app-all.jade → 3x/en/api/app-all.jade b/en/api/app-all.jade → 3x/en/api/app-all.jade
diff --git a/en/api/app-configure.jade → 3x/en/api/app-configure.jade b/en/api/app-configure.jade → 3x/en/api/app-configure.jade
diff --git a/en/api/app-disable.jade → 3x/en/api/app-disable.jade b/en/api/app-disable.jade → 3x/en/api/app-disable.jade
diff --git a/en/api/app-disabled.jade → 3x/en/api/app-disabled.jade b/en/api/app-disabled.jade → 3x/en/api/app-disabled.jade
diff --git a/en/api/app-enable.jade → 3x/en/api/app-enable.jade b/en/api/app-enable.jade → 3x/en/api/app-enable.jade
diff --git a/en/api/app-enabled.jade → 3x/en/api/app-enabled.jade b/en/api/app-enabled.jade → 3x/en/api/app-enabled.jade
diff --git a/en/api/app-engine.jade → 3x/en/api/app-engine.jade b/en/api/app-engine.jade → 3x/en/api/app-engine.jade
diff --git a/en/api/app-get.jade → 3x/en/api/app-get.jade b/en/api/app-get.jade → 3x/en/api/app-get.jade
diff --git a/en/api/app-listen.jade → 3x/en/api/app-listen.jade b/en/api/app-listen.jade → 3x/en/api/app-listen.jade
diff --git a/en/api/app-locals.jade → 3x/en/api/app-locals.jade b/en/api/app-locals.jade → 3x/en/api/app-locals.jade
diff --git a/en/api/app-param.jade → 3x/en/api/app-param.jade b/en/api/app-param.jade → 3x/en/api/app-param.jade
diff --git a/en/api/app-render.jade → 3x/en/api/app-render.jade b/en/api/app-render.jade → 3x/en/api/app-render.jade
diff --git a/en/api/app-routes.jade → 3x/en/api/app-routes.jade b/en/api/app-routes.jade → 3x/en/api/app-routes.jade
diff --git a/en/api/app-set.jade → 3x/en/api/app-set.jade b/en/api/app-set.jade → 3x/en/api/app-set.jade
diff --git a/en/api/app-settings.jade → 3x/en/api/app-settings.jade b/en/api/app-settings.jade → 3x/en/api/app-settings.jade
diff --git a/en/api/app-use.jade → 3x/en/api/app-use.jade b/en/api/app-use.jade → 3x/en/api/app-use.jade
diff --git a/en/api/app.jade → 3x/en/api/app.jade b/en/api/app.jade → 3x/en/api/app.jade
diff --git a/en/api/express.jade → 3x/en/api/express.jade b/en/api/express.jade → 3x/en/api/express.jade
diff --git a/en/api/menu.jade → 3x/en/api/menu.jade b/en/api/menu.jade → 3x/en/api/menu.jade
diff --git a/en/api/middleware.jade → 3x/en/api/middleware.jade b/en/api/middleware.jade → 3x/en/api/middleware.jade
diff --git a/en/api/mw-basicAuth.jade → 3x/en/api/mw-basicAuth.jade b/en/api/mw-basicAuth.jade → 3x/en/api/mw-basicAuth.jade
diff --git a/en/api/mw-bodyParser.jade → 3x/en/api/mw-bodyParser.jade b/en/api/mw-bodyParser.jade → 3x/en/api/mw-bodyParser.jade
diff --git a/en/api/mw-compress.jade → 3x/en/api/mw-compress.jade b/en/api/mw-compress.jade → 3x/en/api/mw-compress.jade
diff --git a/en/api/mw-cookieParser.jade → 3x/en/api/mw-cookieParser.jade b/en/api/mw-cookieParser.jade → 3x/en/api/mw-cookieParser.jade
diff --git a/en/api/mw-cookieSession.jade → 3x/en/api/mw-cookieSession.jade b/en/api/mw-cookieSession.jade → 3x/en/api/mw-cookieSession.jade
diff --git a/en/api/mw-csrf.jade → 3x/en/api/mw-csrf.jade b/en/api/mw-csrf.jade → 3x/en/api/mw-csrf.jade
diff --git a/en/api/mw-directory.jade → 3x/en/api/mw-directory.jade b/en/api/mw-directory.jade → 3x/en/api/mw-directory.jade
diff --git a/en/api/req-accepted.jade → 3x/en/api/req-accepted.jade b/en/api/req-accepted.jade → 3x/en/api/req-accepted.jade
diff --git a/en/api/req-acceptedCharsets.jade → 3x/en/api/req-acceptedCharsets.jade b/en/api/req-acceptedCharsets.jade → 3x/en/api/req-acceptedCharsets.jade
diff --git a/en/api/req-acceptedLanguages.jade → 3x/en/api/req-acceptedLanguages.jade b/en/api/req-acceptedLanguages.jade → 3x/en/api/req-acceptedLanguages.jade
diff --git a/en/api/req-accepts.jade → 3x/en/api/req-accepts.jade b/en/api/req-accepts.jade → 3x/en/api/req-accepts.jade
diff --git a/en/api/req-acceptsCharset.jade → 3x/en/api/req-acceptsCharset.jade b/en/api/req-acceptsCharset.jade → 3x/en/api/req-acceptsCharset.jade
diff --git a/en/api/req-acceptsLanguage.jade → 3x/en/api/req-acceptsLanguage.jade b/en/api/req-acceptsLanguage.jade → 3x/en/api/req-acceptsLanguage.jade
diff --git a/en/api/req-body.jade → 3x/en/api/req-body.jade b/en/api/req-body.jade → 3x/en/api/req-body.jade
diff --git a/en/api/req-cookies.jade → 3x/en/api/req-cookies.jade b/en/api/req-cookies.jade → 3x/en/api/req-cookies.jade
diff --git a/en/api/req-files.jade → 3x/en/api/req-files.jade b/en/api/req-files.jade → 3x/en/api/req-files.jade
diff --git a/en/api/req-fresh.jade → 3x/en/api/req-fresh.jade b/en/api/req-fresh.jade → 3x/en/api/req-fresh.jade
diff --git a/en/api/req-header.jade → 3x/en/api/req-header.jade b/en/api/req-header.jade → 3x/en/api/req-header.jade
diff --git a/en/api/req-host.jade → 3x/en/api/req-host.jade b/en/api/req-host.jade → 3x/en/api/req-host.jade
diff --git a/en/api/req-ip.jade → 3x/en/api/req-ip.jade b/en/api/req-ip.jade → 3x/en/api/req-ip.jade
diff --git a/en/api/req-ips.jade → 3x/en/api/req-ips.jade b/en/api/req-ips.jade → 3x/en/api/req-ips.jade
diff --git a/en/api/req-is.jade → 3x/en/api/req-is.jade b/en/api/req-is.jade → 3x/en/api/req-is.jade
diff --git a/en/api/req-originalUrl.jade → 3x/en/api/req-originalUrl.jade b/en/api/req-originalUrl.jade → 3x/en/api/req-originalUrl.jade
diff --git a/en/api/req-param.jade → 3x/en/api/req-param.jade b/en/api/req-param.jade → 3x/en/api/req-param.jade
diff --git a/en/api/req-params.jade → 3x/en/api/req-params.jade b/en/api/req-params.jade → 3x/en/api/req-params.jade
diff --git a/en/api/req-path.jade → 3x/en/api/req-path.jade b/en/api/req-path.jade → 3x/en/api/req-path.jade
diff --git a/en/api/req-protocol.jade → 3x/en/api/req-protocol.jade b/en/api/req-protocol.jade → 3x/en/api/req-protocol.jade
diff --git a/en/api/req-query.jade → 3x/en/api/req-query.jade b/en/api/req-query.jade → 3x/en/api/req-query.jade
diff --git a/en/api/req-route.jade → 3x/en/api/req-route.jade b/en/api/req-route.jade → 3x/en/api/req-route.jade
diff --git a/en/api/req-secure.jade → 3x/en/api/req-secure.jade b/en/api/req-secure.jade → 3x/en/api/req-secure.jade
diff --git a/en/api/req-signedCookies.jade → 3x/en/api/req-signedCookies.jade b/en/api/req-signedCookies.jade → 3x/en/api/req-signedCookies.jade
diff --git a/en/api/req-stale.jade → 3x/en/api/req-stale.jade b/en/api/req-stale.jade → 3x/en/api/req-stale.jade
diff --git a/en/api/req-subdomains.jade → 3x/en/api/req-subdomains.jade b/en/api/req-subdomains.jade → 3x/en/api/req-subdomains.jade
diff --git a/en/api/req-xhr.jade → 3x/en/api/req-xhr.jade b/en/api/req-xhr.jade → 3x/en/api/req-xhr.jade
diff --git a/en/api/req.jade → 3x/en/api/req.jade b/en/api/req.jade → 3x/en/api/req.jade
diff --git a/en/api/res-attachment.jade → 3x/en/api/res-attachment.jade b/en/api/res-attachment.jade → 3x/en/api/res-attachment.jade
diff --git a/en/api/res-charset.jade → 3x/en/api/res-charset.jade b/en/api/res-charset.jade → 3x/en/api/res-charset.jade
diff --git a/en/api/res-clearCookie.jade → 3x/en/api/res-clearCookie.jade b/en/api/res-clearCookie.jade → 3x/en/api/res-clearCookie.jade
diff --git a/en/api/res-cookie.jade → 3x/en/api/res-cookie.jade b/en/api/res-cookie.jade → 3x/en/api/res-cookie.jade
diff --git a/en/api/res-download.jade → 3x/en/api/res-download.jade b/en/api/res-download.jade → 3x/en/api/res-download.jade
diff --git a/en/api/res-format.jade → 3x/en/api/res-format.jade b/en/api/res-format.jade → 3x/en/api/res-format.jade
diff --git a/en/api/res-get.jade → 3x/en/api/res-get.jade b/en/api/res-get.jade → 3x/en/api/res-get.jade
diff --git a/en/api/res-json.jade → 3x/en/api/res-json.jade b/en/api/res-json.jade → 3x/en/api/res-json.jade
diff --git a/en/api/res-jsonp.jade → 3x/en/api/res-jsonp.jade b/en/api/res-jsonp.jade → 3x/en/api/res-jsonp.jade
diff --git a/en/api/res-links.jade → 3x/en/api/res-links.jade b/en/api/res-links.jade → 3x/en/api/res-links.jade
diff --git a/en/api/res-locals.jade → 3x/en/api/res-locals.jade b/en/api/res-locals.jade → 3x/en/api/res-locals.jade
diff --git a/en/api/res-location.jade → 3x/en/api/res-location.jade b/en/api/res-location.jade → 3x/en/api/res-location.jade
diff --git a/en/api/res-redirect.jade → 3x/en/api/res-redirect.jade b/en/api/res-redirect.jade → 3x/en/api/res-redirect.jade
diff --git a/en/api/res-render.jade → 3x/en/api/res-render.jade b/en/api/res-render.jade → 3x/en/api/res-render.jade
diff --git a/en/api/res-send.jade → 3x/en/api/res-send.jade b/en/api/res-send.jade → 3x/en/api/res-send.jade
diff --git a/en/api/res-sendfile.jade → 3x/en/api/res-sendfile.jade b/en/api/res-sendfile.jade → 3x/en/api/res-sendfile.jade
diff --git a/en/api/res-set.jade → 3x/en/api/res-set.jade b/en/api/res-set.jade → 3x/en/api/res-set.jade
diff --git a/en/api/res-status.jade → 3x/en/api/res-status.jade b/en/api/res-status.jade → 3x/en/api/res-status.jade
diff --git a/en/api/res-type.jade → 3x/en/api/res-type.jade b/en/api/res-type.jade → 3x/en/api/res-type.jade
diff --git a/en/api/res.jade → 3x/en/api/res.jade b/en/api/res.jade → 3x/en/api/res.jade
diff --git a/Makefile b/Makefile
@@ -6,11 +6,12 @@ HTML = index.html \
 	guide.html \
 	applications.html \
 	community.html \
-	faq.html
+	faq.html \
+	3x/api.html
 
 docs: $(HTML)
 
-%.html: %.jade
+%.html: %.jade includes/*.jade
 	$(JADE) --path $< < $< > $@
 
 clean:

diff --git a/api.jade b/api.jade
@@ -1,37 +1 @@
-!!! 5
-html
-  head
-    title Express - api reference
-    include includes/head
-  body.inner
-    .bar
-    section#content
-      header
-        include includes/logo
-        active = './api.html'
-        include includes/menu
-
-      include includes/mixins
-
-      include en/api/menu
-
-      #right
-        include en/api/express
-
-        h2 Application
-        a(name='application')
-        include en/api/app
-
-        h2 Request
-        a(name='request')
-        include en/api/req
-
-        h2 Response
-        a(name='response')
-        include en/api/res
-
-        h2 Middleware
-        a(name='middleware')
-        include en/api/middleware
-
-    include includes/footer
+include ./3x/api
diff --git a/applications.jade b/applications.jade
@@ -8,7 +8,7 @@ html
     section#content
       header
         include includes/logo
-        active = './applications.html'
+        active = '/applications.html'
         include includes/menu
       include en/applications
     include includes/footer
diff --git a/community.jade b/community.jade
@@ -8,7 +8,7 @@ html
     section#content
       header
         include includes/logo
-        active = './community.html'
+        active = '/community.html'
         include includes/menu
       include en/community
     include includes/footer
diff --git a/faq.jade b/faq.jade
@@ -8,7 +8,7 @@ html
     section#content
       header
         include includes/logo
-        active = './faq.html'
+        active = '/faq.html'
         include includes/menu
       #faq
         include en/faq

diff --git a/guide.jade b/guide.jade
@@ -8,7 +8,7 @@ html
     section#content
       header
         include includes/logo
-        active = './guide.html'
+        active = '/guide.html'
         include includes/menu
 
       include includes/mixins

diff --git a/includes/footer.jade b/includes/footer.jade
@@ -10,7 +10,7 @@ script.
   })();
 
 a#top(href='#')
-  img(src='images/arrow.png')
+  img(src='/images/arrow.png')
 
 footer
   #footer-content

diff --git a/includes/head.jade b/includes/head.jade
@@ -1,6 +1,6 @@
-link(rel='stylesheet', href='style.css')
+link(rel='stylesheet', href='/style.css')
 link(rel='stylesheet', href='//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;subset=latin,latin-ext')
 meta(http-equiv='Content-Type', content='text/html; charset=UTF-8')
-script(src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js')
-script(src='app.js')
-script(src='retina.js')
+script(src='http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js')
+script(src='/app.js')
+script(src='/retina.js')
diff --git a/includes/menu.jade b/includes/menu.jade
@@ -2,10 +2,10 @@
 include mixins
 
 nav.clearfix
-  +item('./') Home
-  +item('./api.html') API Reference
-  +item('./guide.html') Guide
-  +item('./applications.html') Applications
-  +item('./community.html') Community
-  +item('./faq.html') FAQ
+  +item('/') Home
+  +item('/3x/api.html') API Reference
+  +item('/guide.html') Guide
+  +item('/applications.html') Applications
+  +item('/community.html') Community
+  +item('/faq.html') FAQ
 
diff --git a/index.jade b/index.jade
@@ -9,7 +9,7 @@ html
     section#content
       header
         include includes/logo
-        active = './'
+        active = '/'
         include includes/menu
      section#logos
        .content

diff --git a/style.css b/style.css
@@ -58,7 +58,7 @@ h2 {
 }
 
 h3 {
-  background: url(images/hr.png) top center no-repeat;
+  background: url(/images/hr.png) top center no-repeat;
   margin-top: 40px;
   padding-top: 50px;
   padding-bottom: 5px;
@@ -281,7 +281,7 @@ html[xmlns] .clearfix {
 /* boxes */
 
 #boxes {
-  background: url(images/hr.png) top center no-repeat;
+  background: url(/images/hr.png) top center no-repeat;
   margin-left: 50px;
   padding-top: 50px;
   padding-bottom: 50px;
@@ -358,7 +358,7 @@ html[xmlns] .clearfix {
 }
 
 .application {
-  background: url(images/hr.png) top center no-repeat;
+  background: url(/images/hr.png) top center no-repeat;
   padding: 80px 0;
   height: 600px;
   position: relative;