Skip to content

Commit

Permalink
ISPN-11090 fixing mvn build errors with doc html
Browse files Browse the repository at this point in the history
  • Loading branch information
oraNod authored and tristantarrant committed Dec 16, 2019
1 parent f1ebb11 commit 2c36140
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
The {brandname} server distribution contains a server module that implements the link:http://github.com/memcached/memcached/blob/master/doc/protocol.txt[Memcached text protocol]. This allows Memcached clients to talk to one or several {brandname} backed Memcached servers. These servers can be standalone just like Memcached, where each server acts independently and does not communicate with the rest. They can also be clustered, where the servers replicate or distribute their contents to other {brandname} backed Memcached servers, providing clients with failover capabilities.


include::{topics}/con_memcached_client_encoding.adoc[leveloffset=+2]
include::{topics}/con_memcached_client_encoding.adoc[leveloffset=+1]

== Command Clarification

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[id='configuring_endpoints']
:context: server
= Setting Up {brandname} Endpoints
= Configuring {brandname} Server Endpoints
{brandname} servers provide listener endpoints that handle requests from remote
client applications.

Expand All @@ -10,10 +10,6 @@ include::{topics}/con_endpoints_rest.adoc[leveloffset=+2]
include::{topics}/con_endpoints_memcached.adoc[leveloffset=+2]
include::{topics}/ref_endpoints_comparison.adoc[leveloffset=+2]

= Configuring {brandname} Server Endpoints
{brandname} server provides listener endpoints that handle inbound connections
from client applications.

include::{topics}/ref_endpoints_connectors.adoc[leveloffset=+1]
include::{topics}/ref_endpoints_hotrod_connector.adoc[leveloffset=+2]
include::{topics}/ref_endpoints_rest_connector.adoc[leveloffset=+2]
Expand Down
1 change: 0 additions & 1 deletion documentation/src/main/asciidoc/titles/server/stories.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ include::{stories}/assembly_server_networking.adoc[leveloffset=+1]
include::{stories}/assembly_server_endpoints.adoc[leveloffset=+1]
include::{stories}/assembly_server_monitoring.adoc[leveloffset=+1]
include::{stories}/assembly_server_security.adoc[leveloffset=+1]
include::{stories}/assembly_server_single_port.adoc[leveloffset=+1]
include::{stories}/assembly_server_remote_execution.adoc[leveloffset=+1]
include::{stories}/assembly_server_rolling_upgrades.adoc[leveloffset=+1]
ifdef::productized[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ Download the code style JAR file from link:https://github.com/infinispan/infinis

== Builds
{brandname} uses link:http://maven.apache.org/[Maven] for builds. Make sure you have Maven 3 installed, and properly configured.
For more information, read <<_building_infinispan,the Maven chapter>>.

=== Continuous Integration
{brandname} uses link:http://www.jetbrains.com/teamcity[TeamCity] for continuous integration.
Expand Down Expand Up @@ -190,7 +189,7 @@ It is recommended that you use a spellchecker plugin for your IDE.

=== Check-in comments

Please ensure any commit comments use <<_comments, this format>> if related to a task or issue in JIRA.
Please ensure any commit comments use link:#check_in_comments[this format] if related to a task or issue in JIRA.
This helps JIRA pick out these checkins and display them on the issue, making it very useful for back/forward porting fixes.
If your comment does not follow this format, your commit may not be merged into upstream.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,13 @@ transcoders from Protobuf format to most common formats like JSON and POJO.
When using filters/converters with those caches, and it's desirable to use filter/converters with Java Objects rather
binary Protobuf data, it's necessary to configure the extra ProtoStream marshallers so that the server can unmarshall
the data before filtering/converting. To do so, you must configure the required <<protostream,SerializationContextInitializer(s)>>
as part of the <<protostream_cm_config,server's configuration>>.
as part of the {brandname} server configuration.

//Community Only
ifndef::productized[]
See link:../developing/developing.html#protostream_cm_config[ProtoStream] for
more information.
endif::productized[]

=== Listener State Handling

Expand Down
5 changes: 3 additions & 2 deletions documentation/src/main/asciidoc/topics/transactions.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[[transactions]]
= Transactions
[id='transaction_manager']
= {brandname} Transactions
{brandname} can be configured to use and to participate in JTA compliant transactions.

Alternatively, if transaction support is disabled, it is equivalent to using autocommit in JDBC calls, where modifications are potentially replicated after every change (if replication is enabled).

On every cache operation {brandname} does the following:
Expand Down
1 change: 0 additions & 1 deletion documentation/src/main/asciidoc/topics/upgrading.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,6 @@ Please use instead `AtomicMapLookup.getAtomicMap(cache.getAdvancedCache().withFl

* Package `org.infinispan.config` (and all methods involving the old configuration classes).
All methods removed has an overloaded method which receives the new configuration classes as parameters.
Please refer to <<_configuration>> for more information about the new configuration classes.

NOTE: This only affects the programmatic configuration.

Expand Down

0 comments on commit 2c36140

Please sign in to comment.