Skip to content

Commit b4836f5

Browse files
authored
Rmarano (#720)
* minor edits * fix link to LC doc section
1 parent 17cc086 commit b4836f5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

site/developer.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ This guide provides information for developers who wish to understand or contrib
44

55
## Requirements
66

7-
In addition to the requirements listed in [User Guide](user-guide.md#prerequisites), the following software is also required to obtain and build the operator:
7+
In addition to the requirements listed in the [User Guide](user-guide.md#prerequisites), the following software is also required to obtain and build the operator:
88

99
* Git (1.8 or later recommended)
10-
* Java Developer Kit (1.8u131 or later recommended, please use 1.8, tests will not work on 1.9 or later versions)
10+
* Java Developer Kit (1.8u131 or later recommended; please use 1.8, tests will not work on 1.9 or later versions)
1111
* Apache Maven (3.3 or later recommended)
1212

1313
The operator is written primarily in Java, BASH shell scripts, and WLST scripts. The Java code uses features introduced in Java 1.8 -- for example, closures -- but does not use any Java 1.9 feature.
@@ -28,11 +28,11 @@ $ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
2828

2929
The `master` branch is protected and contains source for the latest completed features and bug fixes. While this branch contains active work, we expect to keep it always "ready to release." Therefore, longer running feature work will be performed on specific branches, such as `feature/dynamic-clusters`.
3030

31-
Since we want to balance separating destabilizing work into feature branches against the possibility of later difficult merges, we encourage developers working on features to pull out any necessary refactoring or improvements that are general purpose into their own shorter-lived branches and create pull requests to `master` when these smaller work items are complete.
31+
Because we want to balance separating destabilizing work into feature branches against the possibility of later difficult merges, we encourage developers working on features to pull out any necessary refactoring or improvements that are general purpose into their own shorter-lived branches and create pull requests to `master` when these smaller work items are completed.
3232

3333
All commits to `master` must pass the [integration test suite](#running-integration-tests). Please run these tests locally before submitting a pull request. Additionally, each push to a branch in our GitHub repository triggers a run of a subset of the integration tests with the results visible [here](https://app.wercker.com/Oracle/weblogic-kubernetes-operator/runs).
3434

35-
Please submit pull requests to the `master` branch unless you are collaborating on a feature and have another target branch. Please see details on the Oracle Contributor Agreement (OCA) and guidelines for pull requests on the [README] (README.md).
35+
Please submit pull requests to the `master` branch unless you are collaborating on a feature and have another target branch. Please see details on the Oracle Contributor Agreement (OCA) and guidelines for pull requests on the [README](../README.md).
3636

3737
We will create git tags for each generally available (GA) release of the operator.
3838

@@ -86,7 +86,7 @@ $ docker load < /some/path/operator.tar
8686

8787
Use the Helm charts to [install the operator](helm-charts.md).
8888

89-
If the operator's behavior or Pod log is insufficient to diagnose and resolve failures, then you can connect a Java debugger to the operator using the [debugging options](helm-charts.md#debugging-options).
89+
If the operator's behavior or pod log is insufficient to diagnose and resolve failures, then you can connect a Java debugger to the operator using the [debugging options](helm-charts.md#debugging-options).
9090

9191
## Running integration tests
9292

@@ -103,7 +103,7 @@ $ mvn clean verify -P java-integration-tests
103103

104104
This project has adopted the following coding standards:
105105

106-
* Code will be formated using Oracle / WebLogic standards, which are identical to the [Google Java Style](https://google.github.io/styleguide/javaguide.html)
106+
* Code will be formated using Oracle / WebLogic standards, which are identical to the [Google Java Style](https://google.github.io/styleguide/javaguide.html).
107107
* Javadoc must be provided for all public packages, classes, and methods, and must include all parameters and returns. Javadoc is not required for methods that override or implement methods that are already documented.
108108
* All non-trivial methods should include `LOGGER.entering()` and `LOGGER.exiting()` calls.
109109
* The `LOGGER.exiting()` call should include the value that is going to be returned from the method, unless that value includes a credential or other sensitive information.
@@ -298,4 +298,4 @@ Finally, the operator periodically lists all Domains and rechecks them. This is
298298

299299
## Backward Compatibility Guidelines
300300

301-
Starting with the 2.0 release, future operator releases must be backwards-compatible with respect to the Domain resource schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface. We will maintain compatibility for three releases, excepting a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.
301+
Starting with the 2.0 release, future operator releases must be backward compatible with respect to the domain resource schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface. We will maintain compatibility for three releases, except in the case of a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.

site/user-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ presented in the correct order.
3333
* [Important considerations for WebLogic domains in Kubernetes](domains.md#important-considerations-for-weblogic-domains-in-kubernetes)
3434
* [Creating and managing WebLogic domains](creating-domain.md)
3535
* [Modifying domain configurations](domains.md#modifying-domain-configurations)
36-
* [Managing lifecycle operations](domains.md#managing-lifecycle-operations)
36+
* [Managing lifecycle operations](domains.md#managing-lifecycle-operations-including-shutting-down-and-deleting-domains)
3737
* [Using WLST](wlst.md)
3838
* [Scaling clusters](scaling.md)
3939

0 commit comments

Comments
 (0)