Re-up 3.5 to match current

seancorfield · seancorfield · commit 0d01b369a59f · 2015-10-21T11:50:20.000-07:00
diff --git a/source/documentation/3.5/cfml-and-clojure.markdown b/source/documentation/3.5/cfml-and-clojure.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Using Clojure with CFML"
-date: 2015-09-15 16:00
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/)._
-
 # Clojure and CFML Sitting in a tree
 {:.no_toc}
 
diff --git a/source/documentation/3.5/developing-applications.markdown b/source/documentation/3.5/developing-applications.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Developing Applications with FW/1"
-date: 2015-09-22 12:30
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/developing-applications.html)._
-
 FW/1 is intended to allow you to quickly build applications with the minimum of overhead and interference from the framework itself. The convention-based approach means that you can quickly put together an outline of your site or application merely by creating folders and files in the `views` folder. As you are ready to start adding business logic to the application, you can add controllers and/or services and domain objects as needed to implement the validation and data processing.
 
 * Table of Contents
diff --git a/source/documentation/3.5/index.markdown b/source/documentation/3.5/index.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Getting Started with FW/1"
-date: 2015-09-05 11:15
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/)._
-
 FW/1 was created in July 2009 as a reaction against complexity and bloat in other frameworks in the CFML community. FW/1 itself is a single file, and provides a simple, convention-based approach to MVC (Model-View-Controller) applications, as well as REST APIs. Whilst it has become more sophisticated over time, it has remained a single file, focused on getting out of your way and providing the intuitive plumbing you need. For historical background, you can read the [introductory blog post](http://framework-one.github.io/blog/2009/07/19/introducing-framework-one/) from July 2009.
 
 As of release 3.1, FW/1 also includes DI/1 - a simple, convention-based Dependency Injection framework - and AOP/1 - a simple, convention-based Aspect-Oriented Programming framework. As of release 3.5, FW/1 lets you mix'n'match CFML and Clojure code. If those phrases don't mean anything to you, don't worry, you won't need to know anything about them to get started.
diff --git a/source/documentation/3.5/reference-manual.markdown b/source/documentation/3.5/reference-manual.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "FW/1 Reference Manual"
-date: 2015-10-16 02:40
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/reference-manual.html)._
-
 This page provides a description of all the APIs and components involved in a FW/1 application. Please also read the [Roadmap](roadmap.html) to see how things may change in the future.
 
 * TOC
diff --git a/source/documentation/3.5/roadmap.markdown b/source/documentation/3.5/roadmap.markdown
@@ -1,20 +1,20 @@
 ---
 layout: page
 title: "FW/1 Roadmap"
-date: 2015-09-05 14:30
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/roadmap.html)._
-
 Whilst you can read the [FW/1 issues list](https://github.com/framework-one/fw1/issues) to see what's on the cards for future releases, several people have asked that I document things at a higher level so they can get a better sense of what's coming.
 
 3.x Integrations
 ---
-FW/1 3.5 is the `development` branch (formerly the `clojure` branch), coming soon after the 3.1 release. It adds integraton of Clojure controllers and autowired Clojure services. It does this by bundling cfmljure and providing an extension to DI/1, as well as a controller adapter. It also provides direct support for the Lucee language (a new dialect of CFML, introduced in Lucee 5.0), as well as a new, improved way to add subsystems to an existing application. In addition, WireBox is better support as a DI option, and the folder naming conventions can be configured for the first time. It is a major release but also remains compatible with earlier 3.x releases.
+FW/1 3.6 is tentatively planned as improving basic REST support and will be a maintenance release for 3.5.
+
+FW/1 3.5 is the current stable release, coming soon after the 3.1 release. It adds integraton of Clojure controllers and autowired Clojure services. It does this by bundling cfmljure and providing an extension to DI/1, as well as a controller adapter. It also provides direct support for the Lucee language (a new dialect of CFML, introduced in Lucee 5.0), as well as a new, improved way to add subsystems to an existing application. In addition, WireBox is better support as a DI option, and the folder naming conventions can be configured for the first time. It is a major release but also remains compatible with earlier 3.x releases.
 
-FW/1 3.1 is the current stable release, and it is primarily a maintenance release for 3.0, but it also bundles AOP/1 for the first time. It builds on core 3.0 features:
+FW/1 3.1 is the previous stable release, and it was primarily a maintenance release for 3.0, but it also bundled AOP/1 for the first time. It builds on core 3.0 features:
 
 * Using DI/1 to manage services and beans
 * Explicitly calling services in the `item()` controller methods
diff --git a/source/documentation/3.5/using-aop-one.markdown b/source/documentation/3.5/using-aop-one.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Using AOP/1"
-date: 2015-09-05 20:30
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/using-aop-one.html)._
-
 AOP/1 is a simple Aspect Oriented Programming extension for [DI/1 (a.k.a Inject One)](using-di-one.html) which allows you to define interceptors for your beans.
 
 These interceptors can run code before or after a method is called on a bean without the need for you to alter the code in your bean.  This allows you to create generic services (such as a logger service) that is coded and configured to operate completely separate from your other services and beans.  What this means is you no longer need to mix unrelated service code together by using dedicated interceptors.
diff --git a/source/documentation/3.5/using-di-one.markdown b/source/documentation/3.5/using-di-one.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Using DI/1"
-date: 2015-09-15 16:00
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/using-di-one.html)._
-
 DI/1 - a.k.a Inject One - is a simple, convention-based Dependency Injection framework. 
 
 DI/1 searches specified directories for CFCs and treats them as singletons or non-singletons (transients) based on naming conventions for the CFCs themselves, or the folders in which they are found. You can override the conventions by configuration if needed.
diff --git a/source/documentation/3.5/using-subsystems.markdown b/source/documentation/3.5/using-subsystems.markdown
@@ -1,13 +1,11 @@
 ---
 layout: page
 title: "Using Subsystems in FW/1"
-date: 2015-09-15 16:00
+date: 2015-10-21 12:00
 comments: false
 sharing: false
 footer: true
 ---
-_This is the upcoming (3.5 - develop) documentation - for the current stable release, read the [3.1 master stable documentation](/documentation/3.1/using-subsystems.html)._
-
 Subsystems give you a way of modularizing your FW/1 application as it grows. They also provide a way to incorporate other FW/1 applications directly into an existing one. Subsystems can be used to create modules that have no dependencies on the parent application or you can use subsystems to group common functionality together.
 
 * TOC
