Merge pull request #2393 from yiiframework-com-ua/uk_docs

 [Uk] Fixing typos
[ci skip]
docstring fixes #1353
Merge pull request #2275 branch 'copytruncate' of https://github.com/bdstevens/yii into bdstevens-copytruncate

* 'copytruncate' of https://github.com/bdstevens/yii:
  Allow for primary log rotation by copy and truncate rather than rename
a bit of refactoring for PR #2275 + CHANGELOG line
Added comment about ajax validaton to gii template

related to #2213
Merge pull request #1823 branch '1353-on-before-count' of https://github.com/jakob-stoeck/yii into jakob-stoeck-1353-on-before-count

* '1353-on-before-count' of https://github.com/jakob-stoeck/yii:
  docstring fixes #1353
  phpdoc correction for onbeforecount #1353
  Adds onBeforeCount for Active Records, fixes #1353
cleanup after #1823
Added note about module name case to gii view

fixes #2117
fixing bug where time() was being added twice to the cookie expiration date. Once before we pass it to CWebUser::saveToCookie, and another time inside the function.
$result variable initialization at "CProfileLogRoute::displaySummary()" has been added.
Fix doc comments at "CLogger"
Issue #2398 has been added to CHANGELOG.
Merge pull request #2400 from klimov-paul/2398-profile-log-route-undefined-var

Fix #2398: "Undefined variable: results" E_NOTICE at CProfileLogRoute
Cleanup after 3b288 and PR #2275
Fixes #2402 clientValidation rendered as HTML
Merge pull request #2405 from mdomba/2402-clientvalidation-rendered-as-html

Fixes #2402 clientValidation rendered as HTML
[ci skip]
fixed order in CHANGELOG file
Proper docstring for CActiveDataProvider::$_criteria and CActiveDataProvider::$_countCriteria.
Merge branch 'master' of github.com:yiisoft/yii into fixes-1796-CActiveDataProvider-countCriteria
Merge pull request #2392 from resurtm/fixes-1796-CActiveDataProvider-countCriteria

Fixes #1796: separate count criteria in CActiveDataProvider.