Skip to content

Commit

Permalink
Merge pull request codeigniter4#341 from jim-parry/fix/sphinx-errors
Browse files Browse the repository at this point in the history
Fix sphinx issues & remove test folder
  • Loading branch information
jim-parry authored Dec 30, 2016
2 parents b01b9bd + 295cfce commit 8aa194c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 592 deletions.
4 changes: 2 additions & 2 deletions user_guide_src/source/database/model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ are: datetime, date, or int (a PHP timestamp).

**$validationRules**

Contains either an array of validation rules as described in :ref:`_validation-array`
Contains either an array of validation rules as described in :ref:`validation-array`
or a string containing the name of a validation group, as described in the same section.
Described in more detail below.

**$validationMessages**

Contains an array of custom error messages that should be used during validation, as
described in :ref:`_validation-custom-errors`. Described in more detail below.
described in :ref:`validation-custom-errors`. Described in more detail below.

**$skipValidation**

Expand Down
1 change: 1 addition & 0 deletions user_guide_src/source/libraries/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Library Reference
security
sessions
throttler
typography
uploaded_files
uri
validation
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/sessions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ Preference Default Options
everything properly.

In addition to the values above, the cookie and native drivers apply the
following configuration values shared by the :doc:`Input <input>` and
following configuration values shared by the :doc:`IncomingRequest <incomingrequest>` and
:doc:`Security <security>` classes:

================== =============== ===========================================================================
Expand Down
195 changes: 0 additions & 195 deletions user_guide_src/source/test/cli.rst

This file was deleted.

Loading

0 comments on commit 8aa194c

Please sign in to comment.