fixed links in elasticsearch README

extensions/apidoc/models/PropertyDoc.php

@@ -69,7 +69,7 @@ class PropertyDoc extends BaseDoc
 				$this->types = $tag->getTypes();
 				$this->description = ucfirst($tag->getDescription());
 				if (($pos = strpos($this->description, '.')) !== false) {
-					$this->shortDescription = substr($this->description, 0, $pos);
+					$this->shortDescription = substr($this->description, 0, $pos + 1);
 				} else {
 					$this->shortDescription = $this->description;
 				}

extensions/apidoc/templates/html/views/eventDetails.php

@@ -32,7 +32,7 @@ ArrayHelper::multisort($events, 'name');
 		<?php echo $event->trigger->signature; ?>
 	</div>*/ ?>
 
-	<p><?= ApiMarkdown::process($event->description, $type); ?></p>
+	<?= ApiMarkdown::process($event->description, $type); ?>
 
 	<?= $this->render('seeAlso', ['object' => $event]); ?>
 

extensions/apidoc/templates/html/views/methodDetails.php

@@ -62,8 +62,8 @@ ArrayHelper::multisort($methods, 'name');
 
 <!--	--><?php //$this->renderPartial('sourceCode',array('object'=>$method)); ?>
 
-	<p><?= ApiMarkdown::process($method->shortDescription, $type, true) ?></strong></p>
+	<p><strong><?= ApiMarkdown::process($method->shortDescription, $type, true) ?></strong></p>
-	<p><?= ApiMarkdown::process($method->description, $type) ?></p>
+	<?= ApiMarkdown::process($method->description, $type) ?>
 
 	<?= $this->render('seeAlso', ['object' => $method]); ?>
 

extensions/apidoc/templates/html/views/propertyDetails.php

@@ -35,7 +35,7 @@ ArrayHelper::multisort($properties, 'name');
 
 	<div class="signature"><?php echo $this->context->renderPropertySignature($property); ?></div>
 
-	<p><?= ApiMarkdown::process($property->description, $type) ?></p>
+	<?= ApiMarkdown::process($property->description, $type) ?>
 
 	<?= $this->render('seeAlso', ['object' => $property]); ?>
 

extensions/elasticsearch/README.md

@@ -50,9 +50,6 @@ TBD
 
 > **NOTE:** elasticsearch limits the number of records returned by any query to 10 records by default.
 > If you expect to get more records you should specify limit explicitly in relation definition.
- * This is also important for relations that use [[via()]] so that if via records are limited to 10
- * the relations records can also not be more than 10.
- *
 
 
 Using the ActiveRecord
@@ -60,14 +57,15 @@ Using the ActiveRecord
 
 For general information on how to use yii's ActiveRecord please refer to the [guide](https://github.com/yiisoft/yii2/blob/master/docs/guide/active-record.md).
 
-For defining an elasticsearch ActiveRecord class your record class needs to extend from `yii\elasticsearch\ActiveRecord` and
+For defining an elasticsearch ActiveRecord class your record class needs to extend from [[yii\elasticsearch\ActiveRecord]] and
-implement at least the `attributes()` method to define the attributes of the record.
+implement at least the [[yii\elasticsearch\ActiveRecord::attributes()|attributes()]] method to define the attributes of the record.
 The handling of primary keys is different in elasticsearch as the primary key (the `_id` field in elasticsearch terms)
 is not part of the attributes by default. However it is possible to define a [path mapping](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-id-field.html)
 for the `_id` field to be part of the attributes.
 See [elasticsearch docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-id-field.html) on how to define it.
-The `_id` field of a document/record can be accessed using [[ActiveRecord::getPrimaryKey()]] and [[ActiveRecord::setPrimaryKey()]].
+The `_id` field of a document/record can be accessed using [[yii\elasticsearch\ActiveRecord::getPrimaryKey()|getPrimaryKey()]] and
-When path mapping is defined, the attribute name can be defined using the [[primaryKey()]] method.
+[[yii\elasticsearch\ActiveRecord::setPrimaryKey()|setPrimaryKey()]].
+When path mapping is defined, the attribute name can be defined using the [[yii\elasticsearch\ActiveRecord::primaryKey()|primaryKey()]] method.
 
 The following is an example model called `Customer`:
 
@@ -101,7 +99,8 @@ class Customer extends \yii\elasticsearch\ActiveRecord
 }
 ```
 
-You may override [[index()]] and [[type()]] to define the index and type this record represents.
+You may override [[yii\elasticsearch\ActiveRecord::index()|index()]] and [[yii\elasticsearch\ActiveRecord::type()|type()]]
+to define the index and type this record represents.
 
 The general usage of elasticsearch ActiveRecord is very similar to the database ActiveRecord as described in the
 [guide](https://github.com/yiisoft/yii2/blob/master/docs/guide/active-record.md).
@@ -109,13 +108,18 @@ It supports the same interface and features except the following limitations and
 
 - As elasticsearch does not support SQL, the query API does not support `join()`, `groupBy()`, `having()` and `union()`.
   Sorting, limit, offset and conditional where are all supported.
-- `from()` does not select the tables, but the [index](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/glossary.html#glossary-index)
+- [[yii\elasticsearch\ActiveQuery::from()|from()]] does not select the tables, but the
+  [index](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/glossary.html#glossary-index)
   and [type](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/glossary.html#glossary-type) to query against.
-- `select()` has been replaced with `fields()` which basically does the same but `fields` is more elasticsearch terminology.
+- `select()` has been replaced with [[yii\elasticsearch\ActiveQuery::fields()|fields()]] which basically does the same but
+  `fields` is more elasticsearch terminology.
   It defines the fields to retrieve from a document.
-- `via`-relations can not be defined via a table as there are no tables in elasticsearch. You can only define relations via other records.
+- [[yii\elasticsearch\ActiveQuery::via()|via]]-relations can not be defined via a table as there are no tables in elasticsearch. You can only define relations via other records.
-- As elasticsearch is not only a data storage but also a search engine there is of course support added for search your records.
+- As elasticsearch is not only a data storage but also a search engine there is of course support added for searching your records.
-  There are `query()`, `filter()` and `addFacets()` methods that allows to compose an elasticsearch query.
+  There are
+  [[yii\elasticsearch\ActiveQuery::query()|query()]],
+  [[yii\elasticsearch\ActiveQuery::filter()|filter()]] and
+  [[yii\elasticsearch\ActiveQuery::addFacets()|addFacets()]] methods that allows to compose an elasticsearch query.
   See the usage example below on how they work and check out the [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html)
   on how to compose `query` and `filter` parts.
 - It is also possible to define relations from elasticsearch ActiveRecords to normal ActiveRecord classes and vice versa.