Merge remote-tracking branch 'joomla/3.4-dev' into ComposerIntegration
Some doc block tweaks in JUri
Fix code style
Merge branch '3.4-dev' into ComposerIntegration
Codestyle
Merge pull request #263 from wilsonge/composer-codestyle

Codestyle
Codestyle
[imp] Front End Module Editing, adding missing files.
[imp] Front End Module Editing, moving files to correct place.

Sorry for the mess :(
[imp] Code Style fixes. Fixes #4224. Fixes #4225. Fixes #4226. Fixes #4227. Fixes #4228. Fixes #4230

Fix function doc block

Code Style fixes for file

Code Style fixes for file

Fix code style in file

Code Style fixes for file
Update FOF 2.3.5. Fixes #4233
[fix] Allow to get permitions for section != 'component'. Fixes #4198

This will allow to set ACL different groups based on category permissions, for example:
access.xml
	<section name="component">
		[...]
	</section>
	<section name="category">
		<action name="roles.list" title="roles list" description="" />
		<action name="roles.manage" title="roles manage" description="" />
	</section>

view.html.php (view of a generic component)
[...]
$this->canDo = JHelperContent::getActions('com_componentname', 'category', $item->catid);
if (!$this->canDo->get('roles.manage')) {
            JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
            $app = JFactory::getApplication();
            $app->redirect('index.php');
}
[...]

Update content.php

Update content.php
Codestyle Modules. Closes #4242. Closes #4241
Code Style fixes for modules. Closes #4237.
Activates codestyle checks for modules folder.
Codestyle
Merge branch 'staging' into 3.4-dev
Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging
Merge pull request #34 from joomla/master

Sync Master with Joomla's
Merge pull request #4216 from zero-24/patch-11

[#33492] com_search Highlighter SPANs wrong position with german umlauts ans corrupted if overlapping searchwords
cs