Skip to content

Commit 44a3c4f

Browse files
Sync docs from wheels@14470a2
1 parent 7d1b173 commit 44a3c4f

File tree

19 files changed

+42
-52
lines changed

19 files changed

+42
-52
lines changed

docs/3.1.0/guides/command-line-tools/cli-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ wheels security scan
159159

160160
| Wheels CLI | Wheels | CommandBox | CFML Engine |
161161
|------------|----------|------------|-------------|
162-
| 3.0.x | 2.5+ | 5.0+ | Lucee 5.3+, Adobe 2018+ |
163-
| 2.0.x | 2.0-2.4 | 4.0+ | Lucee 5.2+, Adobe 2016+ |
162+
| 3.0.x | 3.0+ | 5.0+ | Lucee 5.3+, Adobe 2018+ |
163+
| 2.0.x | 2.0-2.5 | 4.0+ | Lucee 5.2+, Adobe 2016+ |
164164

165165
## Community & Support
166166

docs/3.1.0/guides/command-line-tools/commands/core/init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Please enter a default cfengine: lucee5
9494
"name": "myapp",
9595
"version": "1.0.0",
9696
"dependencies": {
97-
"wheels": "^2.5.0"
97+
"wheels": "^3.1.0"
9898
}
9999
}
100100
```

docs/3.1.0/guides/command-line-tools/commands/generate/app-wizard.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Please enter a name for your application: MyWheelsApp
5555
### Step 2: Template Selection
5656
```
5757
Which Wheels Template shall we use?
58-
❯ 3.0.x - Wheels Base Template - Bleeding Edge
59-
2.5.x - Wheels Base Template - Stable Release
58+
❯ 3.1.x - Wheels Base Template - Latest
59+
3.0.x - Wheels Base Template - Stable Release
6060
Wheels Template - HTMX - Alpine.js - Simple.css
6161
Wheels Starter App
6262
Wheels - TodoMVC - HTMX - Demo App

docs/3.1.0/guides/command-line-tools/development-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The `wheels upgrade` command provides an interactive wizard for upgrading your W
8787
wheels upgrade --check
8888

8989
# Output:
90-
# Current Wheels version: 2.5.0
90+
# Current Wheels version: 3.1.0
9191
# Upgrade available: 3.1.0
9292
# Run 'wheels upgrade' to start the upgrade process.
9393
```

docs/3.1.0/guides/database-interaction-through-models/database-migrations/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66

77
# Database Migrations
88

9-
With Wheels 2.x, you can now create, alter and populate your database via cfscript in an organized manner. Using custom CFC files, you can create an organized database schema, and move between versions easily, either programmatically, via the provided GUI, or via the CLI. 
9+
Wheels allows you to create, alter and populate your database via cfscript in an organized manner. Using custom CFC files, you can create an organized database schema, and move between versions easily, either programmatically, via the provided GUI, or via the CLI. 
1010

1111
### Getting Started
1212

docs/3.1.0/guides/database-interaction-through-models/database-migrations/migrations-in-production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Please consult the internal documentation API reference under Configurations > D
3434

3535
### Further considerations with automatic migrations
3636

37-
If you are using automatic migrations, then you could lock down production mode even further. With Wheels 2.x there is more data available to development mode, such as the internal documentation, routing GUI and Migration GUI.
37+
If you are using automatic migrations, then you could lock down production mode even further. In development mode, there is more data available, such as the internal documentation, routing GUI and Migration GUI.
3838

3939
**Turn off environment switching**
4040

docs/3.1.0/guides/displaying-views-to-users/linking-pages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ To link to the `pages` resource, you add the parent resource's singular name fir
266266

267267
### Linking to a Delete Action
268268

269-
Wheels 2.0 introduced security improvements for actions that change data in your applications (i.e., creating, updating, and deleting database records). Wheels protects these actions by requiring that they happen along with a form `POST` in the browser.
269+
Wheels includes security improvements for actions that change data in your applications (i.e., creating, updating, and deleting database records). Wheels protects these actions by requiring that they happen along with a form `POST` in the browser.
270270

271271
A common UI pattern is to have a link to delete a record, usually in an admin area. Unfortunately, links can only trigger `GET` requests, so we need to work around this.
272272

docs/3.1.0/guides/handling-requests-with-controllers/caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The variables themselves are fairly self-explanatory. When `cacheDatabaseSchema`
9494
{% hint style="info" %}
9595
#### No more Design mode
9696

97-
Note that "Design" mode has been removed in Wheels 2.x: please use development mode instead.
97+
Note that "Design" mode has been removed: please use development mode instead.
9898
{% endhint %}
9999

100100
Please refer to the [Configuration and Defaults](https://wheels.dev/3.1.0/guides/working-with-wheels/configuration-and-defaults) chapter for a complete listing of all the variables you can set and their default values.

docs/3.1.0/guides/handling-requests-with-controllers/cors-requests.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ When we separate our systems in such a manner, we need to consider CORS (Cross O
1010

1111
### The "Quick and Dirty" approach
1212

13-
If you just need to satisfy your CORS requirement quickly, you can do so from Wheels 2.0 onwards with a simple configuration switch in your `/config/settings.cfm` file: `set(allowCorsRequests=true);`.
13+
If you just need to satisfy your CORS requirement quickly, you can do so with a simple configuration switch in your `/config/settings.cfm` file: `set(allowCorsRequests=true);`.
1414

1515
By default, this will enable the following CORS headers:
1616

@@ -29,13 +29,7 @@ This will satisfy most requirements to get going quickly, but is more of a blank
2929

3030
### Custom CORS Headers
3131

32-
{% hint style="info" %}
33-
#### From Wheels 2.1
34-
35-
The options below were introduced in Wheels 2.1
36-
{% endhint %}
37-
38-
From Wheels 2.1, we can be more specific. We still need to specify `set(allowCorsRequests=true);` in our `/config/settings.cfm` to turn on the main CORS functionality, but we can now provide some additional configuration options to fine tune our responses.
32+
We can be more specific. We still need to specify `set(allowCorsRequests=true);` in our `/config/settings.cfm` to turn on the main CORS functionality, but we can also provide some additional configuration options to fine tune our responses.
3933

4034
### Access Control Allow Origin
4135

@@ -56,7 +50,7 @@ set(accessControlAllowOrigin="https://app.domain.com,https://staging-app.domain.
5650

5751
You can also take advantage of the environment specific configurations, such as only allowing access to `localhost:8080` in `/config/development/settings.cfm` for example.
5852

59-
**Wheels 2.2** allows for subdomain wildcard matching for CORS permitted origins:
53+
Wheels also allows for subdomain wildcard matching for CORS permitted origins:
6054

6155
```javascript
6256
// Match https://foo.domain.com or https://bar.domain.com or https://www.mydomain.com

docs/3.1.0/guides/handling-requests-with-controllers/nesting-controllers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nesting Controllers
22

3-
With the new routing system in Wheels 2.x, there are lots of nice features which allow for better code organization. One of these is the ability to nest controllers into folders using the `namespace()` method in our `mapper()` call.
3+
With the routing system in Wheels, there are lots of nice features which allow for better code organization. One of these is the ability to nest controllers into folders using the `namespace()` method in our `mapper()` call.
44

55
For example, we may have a whole "Admin" section, where for each endpoint, we need to check some permissions, and possibly load some default data. Let's say we have a `Users` controller which provides standard CRUD operations.
66

0 commit comments

Comments
 (0)