You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/01/08 23:28:32 UTC
[47/52] [abbrv] [partial] isis-site git commit: republishes,
updating content and creates new SNAPSHOT
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/cgcom/images/docker-daemon.png
----------------------------------------------------------------------
diff --git a/content/guides/cgcom/images/docker-daemon.png b/content/guides/cgcom/images/docker-daemon.png
deleted file mode 100644
index e3dd669..0000000
Binary files a/content/guides/cgcom/images/docker-daemon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/dg/_images/ditaa-demo.png
----------------------------------------------------------------------
diff --git a/content/guides/dg/_images/ditaa-demo.png b/content/guides/dg/_images/ditaa-demo.png
deleted file mode 100644
index c3ad644..0000000
Binary files a/content/guides/dg/_images/ditaa-demo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/dg/_images/graphviz-demo.png
----------------------------------------------------------------------
diff --git a/content/guides/dg/_images/graphviz-demo.png b/content/guides/dg/_images/graphviz-demo.png
deleted file mode 100644
index 527839e..0000000
Binary files a/content/guides/dg/_images/graphviz-demo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/dg/_images/plantuml-demo.png
----------------------------------------------------------------------
diff --git a/content/guides/dg/_images/plantuml-demo.png b/content/guides/dg/_images/plantuml-demo.png
deleted file mode 100644
index b265c7a..0000000
Binary files a/content/guides/dg/_images/plantuml-demo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/dg/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg/dg.html b/content/guides/dg/dg.html
index ca10dcd..96720a7 100644
--- a/content/guides/dg/dg.html
+++ b/content/guides/dg/dg.html
@@ -179,6 +179,7 @@ table.CodeRay td.code>pre{padding:0}
<li><a href="../../guides/ugfun/ugfun.html">Fundamentals</a></li>
<li><a href="../../guides/ugvw/ugvw.html">Wicket Viewer</a></li>
<li><a href="../../guides/ugvro/ugvro.html">Restful Objects Viewer</a></li>
+ <li><a href="../../guides/ugodn/ugodn.html">DataNucleus Object Store</a></li>
<li><a href="../../guides/ugsec/ugsec.html">Security</a></li>
<li><a href="../../guides/ugtst/ugtst.html">Testing</a></li>
<li><a href="../../guides/ugbtb/ugbtb.html">Beyond the Basics</a></li>
@@ -196,25 +197,32 @@ table.CodeRay td.code>pre{padding:0}
</ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Downloads<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="../../downloads.html">Downloads</a></li>
- <li><a href="../../release-notes/release-notes.html">Release Notes</a></li>
- <li><a href="../../migration-notes/migration-notes.html">Migration Notes</a></li>
- <li role="separator" class="divider"></li>
<li class="dropdown-header">Maven archetypes</li>
<li><a href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_helloworld-archetype">helloworld</a></li>
<li><a href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp</a></li>
<li role="separator" class="divider"></li>
- <li><a href="https://issues.apache.org/jira/browse/ISIS">ASF JIRA</a></li>
+ <li><a href="../../downloads.html">Downloads</a></li>
+ <li><a href="../../release-notes/release-notes.html">Release Notes</a></li>
+ <li><a href="../../migration-notes/migration-notes.html">Migration Notes</a></li>
+ <li role="separator" class="divider"></li>
<li><a href="https://github.com/apache/isis">Github mirror</a></li>
</ul> </li>
<li class="dropdown hidden-sm"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Support<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="../../support.html">Mailing lists</a></li>
+ <li class="dropdown-header">Guides</li>
+ <li><a href="../../guides/dg/dg.html">Developers' Guide</a></li>
+ <li><a href="../../guides/cgcom/cgcom.html">Committers' Guide</a></li>
+ <li><a href="../../guides/htg.html">Hints-n-Tips Guide</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Mailing Lists</li>
+ <li><a href="../../support.html">How to subscribe</a></li>
<li><a href="https://lists.apache.org/list.html?users@isis.apache.org">Archives (ASF Pony mail)</a></li>
<li><a href="http://isis.markmail.org/search/?q=">Archives (Markmail)</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Other Resources</li>
+ <li><a href="https://issues.apache.org/jira/browse/ISIS">ASF JIRA</a></li>
<li><a href="http://stackoverflow.com/questions/tagged/isis">Stack Overflow</a></li>
- <li><a href="../../guides/dg/dg.html">How to contribute</a></li>
- <li><a href="../../help.html">Other resources</a></li>
+ <li><a href="../../help.html">Wiki, Fisheye etc.</a></li>
</ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">@ASF<span class="caret"></span></a>
<ul class="dropdown-menu">
@@ -1408,26 +1416,13 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
<p>If you are an <a href="http://www.eclipse.org">Eclipse</a> user, then we recommend you download the "Eclipse JEE package" configuration.</p>
</div>
<div class="paragraph">
- <p>When running an Apache Isis application, it’s necessary to setup the development environment so that the Java bytecode can be enhanced by the <a href="http://www.datanucleus.org">DataNucleus</a> enhancer. If working in Eclipse, then JDO enhancement is most easily done by installing the <a href="http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html">DataNucleus' Eclipse plugin</a>. This hooks the bytecode enhancement of your domain objects into Eclipse’s normal incremental compilation.</p>
+ <p>When running an Apache Isis application, it’s necessary to setup the development environment so that the Java bytecode can be enhanced by the <a href="http://www.datanucleus.org">DataNucleus</a> enhancer. If working in Eclipse, then JDO enhancement is most easily done by installing the <a href="http://www.datanucleus.org/products/accessplatform/jpa/tools.html#eclipse">DataNucleus' Eclipse plugin</a>. This hooks the bytecode enhancement of your domain objects into Eclipse’s normal incremental compilation.</p>
</div>
<div class="paragraph">
- <p>This plugin needs to be configured for each of your domain modules (usually just one in any given app). The steps are therefore:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p>import the project into Eclipse</p> </li>
- <li> <p>configure the DataNucleus enhancer</p> </li>
- <li> <p>run the app from the <code>.launch</code> file</p> </li>
- </ul>
- </div>
- <div class="sect3">
- <h4 id="__dg_ide_eclipse_screencast">2.2.1. Screencast</h4>
- <div class="paragraph">
- <p>This <a href="https://www.youtube.com/watch?v=RgcYfjQ8yJA">screencast</a> shows how to import an Apache Isis maven-based application into Eclipse and configure to use with the JDO Objectstore.</p>
- </div>
+ <p>This plugin needs to be configured for each of your domain modules (usually just one in any given app).</p>
</div>
<div class="sect3">
- <h4 id="__dg_ide_eclipse_editor-templates">2.2.2. Editor Templates</h4>
+ <h4 id="__dg_ide_eclipse_editor-templates">2.2.1. Editor Templates</h4>
<div class="paragraph">
<p>We provide a set of editor templates. These are used to add new methods to existing classes. (These are equivalent to the <a href="../dg/dg.html#__dg_ide_intellij_live-templates">IntelliJ live templates</a>):</p>
</div>
@@ -1443,13 +1438,90 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__dg_ide_eclipse_importing-the-project">2.2.3. Importing the Project</h4>
+ <h4 id="__dg_ide_eclipse_configure-lombok">2.2.2. Install Project Lombok</h4>
+ <div class="paragraph">
+ <p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> uses <a href="http://projectlombok.org">Project Lombok</a> annotations (<code>@Getter</code> and <code>@Setter</code> and so on) to reduce the boilerplate. For Eclipse IDE this requires an <a href="https://projectlombok.org/setup/eclipse">installation step</a>:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>Locate the <code>lombok.jar</code> jar file:</p>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/010-lombok-locate-jar.png"><img src="images/eclipse/2017-oxygen/010-lombok-locate-jar.png" alt="010 lombok locate jar" width="600px"></a>
+ </div>
+ </div> </li>
+ <li> <p>Run using <code>java -jar</code> (or double click on Windows):</p>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png"><img src="images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png" alt="020 lombok install into eclipse" width="600px"></a>
+ </div>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Then restart Eclipse.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="__dg_ide_eclipse_install-datanucleus-plugin">2.2.3. Install the DataNucleus plugin</h4>
+ <div class="paragraph">
+ <p>The DataNucleus plugin hooks into the Eclipse compiler and will automatically enhance the compiled class files:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>Use Help > Install New Software:</p>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png"><img src="images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png" alt="030 datanucleus install new software" width="600px"></a>
+ </div>
+ </div> </li>
+ <li> <p>Specify the DataNucleus plugin repository:</p>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png"><img src="images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png" alt="040 datanucleus specify repository" width="400px"></a>
+ </div>
+ </div> </li>
+ <li> <p>Select the plugin</p>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png"><img src="images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png" alt="050 datanucleus select plugin" width="600px"></a>
+ </div>
+ </div> </li>
+ <li> <p>Press Next and Finish to complete the installation of the plugin</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Then restart Eclipse</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="__dg_ide_eclipse_importing-the-project">2.2.4. Importing the Project</h4>
<div class="paragraph">
<p>Use File > Import, then Maven > Existing Maven Projects.</p>
</div>
+ <div class="paragraph">
+ <p>However, you will have some compile errors until you enable annotation processing, discussed below.</p>
+ </div>
+ <div class="sect4">
+ <h5 id="__dg_ide_eclipse_enable-annotation-processing">Enable Annotation Processing</h5>
+ <div class="paragraph">
+ <p>Both DataNucleus and Project Lombok use annotation processors that must be enabled in Eclipse.</p>
+ </div>
+ <div class="paragraph">
+ <p>For each project, open its <em>Properties</em> page and then <em>Java Compiler > Annotation Processing</em> to specify the generated source directory of <code>target/generated-sources/annotations</code>:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/eclipse/2017-oxygen/060-enable-annotation-processor.png"><img src="images/eclipse/2017-oxygen/060-enable-annotation-processor.png" alt="060 enable annotation processor" width="600px"></a>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Eclipse should automatically add this directory as a source path; at this point all remaining compiler errors should disappear.</p>
+ </div>
+ </div>
</div>
<div class="sect3">
- <h4 id="_add_datanucleus_support">2.2.4. Add DataNucleus support</h4>
+ <h4 id="__dg_ide_eclipse_add-datanucleus-support">2.2.5. Configure DataNucleus</h4>
<div class="admonitionblock tip">
<table>
<tbody>
@@ -1464,7 +1536,7 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
</table>
</div>
<div class="paragraph">
- <p>In Eclipse, for the <em>domain object model</em> project, first add DataNucleus support:</p>
+ <p>In Eclipse, for the <em>domain object model</em> project(s), first add DataNucleus support:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -1556,7 +1628,7 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_running_the_app">2.2.5. Running the App</h4>
+ <h4 id="__dg_ide_eclipse_running-the-app">2.2.6. Running the App</h4>
<div class="paragraph">
<p>The simpleapp archetype automatically provides a <code>.launch</code> configurations in the <code>webapp</code> module. You can therefore very simply run the application by right-clicking on one of these files, and choosing "Run As…" or "Debug As…".</p>
</div>
@@ -1575,19 +1647,16 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_other_domain_projects">2.2.6. Other domain projects.</h4>
+ <h4 id="_other_domain_projects">2.2.7. Other domain projects.</h4>
<div class="paragraph">
<p>There is nothing to prevent you having multiple domain projects. You might want to do such that each domain project corresponds to a <a href="http://www.methodsandtools.com/archive/archive.php?id=97p2">DDD module</a>, thus guaranteeing that there are no cyclic dependencies between your modules.</p>
</div>
<div class="paragraph">
- <p>If you do this, make sure that each project has its own <code>persistence.xml</code> file.</p>
- </div>
- <div class="paragraph">
- <p>And, remember also to configure Eclipse’s DataNucleus plugin for these other domain projects.</p>
+ <p>If you do this, make sure that each project has its own <code>persistence.xml</code> file. And, remember also to configure Eclipse’s DataNucleus plugin for these other domain projects.</p>
</div>
</div>
<div class="sect3">
- <h4 id="_advanced">2.2.7. Advanced</h4>
+ <h4 id="_advanced">2.2.8. Advanced</h4>
<div class="paragraph">
<p>In this section are a couple of options that will reduce the length of the change code/build/deploy/review feedback loop.</p>
</div>
@@ -1913,19 +1982,13 @@ gradle -t --offline -b liveReload.gradle &</code></pre>
<div class="sect4">
<h5 id="__dg_building-isis_git_installation_cloning-the-apache-isis-repo">Cloning the Apache Isis repo</h5>
<div class="paragraph">
- <p>First, clone the Apache Isis repo.</p>
- </div>
- <div class="paragraph">
- <p>If you are a <strong>committer</strong>, then clone from the Apache read/write repo:</p>
+ <p>First, clone the Apache Isis repo:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">git clone https://git-wip-us.apache.org/repos/asf/isis.git</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">git clone https://github.com/apache/isis.git</code></pre>
</div>
</div>
- <div class="paragraph">
- <p>If you are <strong>not a committer</strong>, please see the <a href="../dg/dg.html#_dg_contributing">contributing</a> page for details on which repo to clone from.</p>
- </div>
</div>
<div class="sect4">
<h5 id="__dg_building-isis_git_installation_configuring-git">Configuring Git</h5>
@@ -2115,19 +2178,6 @@ git config user.email <i>myusername@apache.org</i></code></pre>
<pre class="CodeRay highlight"><code data-lang="bash">export MAVEN_OPTS="-Xms512m -Xmx1024m"</code></pre>
</div>
</div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>Previously we suggested <code>-XX:MaxPermSize=256m</code>, but this option has been removed in Java 8. (As of <code>1.9.0</code>, Apache Isis is built using Java 8 but with source and target set to JDK 1.7).</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect2">
<h3 id="__dg_building-isis_building-all-of-apache-isis">4.4. Building all of Apache Isis</h3>
@@ -2461,10 +2511,10 @@ bundle install</code></pre>
<div class="sect2">
<h3 id="_recommended_workflow_github">6.1. Recommended Workflow (github)</h3>
<div class="paragraph">
- <p>Apache Isis' source code is hosted in an Apache git repo (<a href="https://git-wip-us.apache.org/repos/asf/isis.git">https</a>, <a href="http://git-wip-us.apache.org/repos/asf/isis.git">http</a>), with a clone on github (<a href="https://github.com/apache/isis.git">https</a>, or ssh: <code>git@github.com:apache/isis.git</code>.</p>
+ <p>Apache Isis' source code is hosted in at github (<a href="https://github.com/apache/isis.git">https</a>, or ssh: <code>git@github.com:apache/isis.git</code>).</p>
</div>
<div class="paragraph">
- <p>As you might imagine, only committers are permitted to push changes to the central git repo. As a contributor, we recommend that you fork the <a href="https://github.com/apache/isis.git">apache/isis</a> repo in github, and then use your fork as a way of publishing your patches for the Apache Isis committers to apply.</p>
+ <p>As you might imagine, only committers are permitted to push changes to the github repo. As a contributor, we recommend that you fork the <a href="https://github.com/apache/isis.git">apache/isis</a> github repo, and then use your fork as a way of publishing your patches for the Apache Isis committers to apply.</p>
</div>
<div class="paragraph">
<p>The diagram below illustrates the process:</p>
@@ -2495,24 +2545,7 @@ bundle install</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_alternative_workflow_jira_patches">6.2. Alternative Workflow (JIRA patches)</h3>
- <div class="paragraph">
- <p>As an alternative, you may decide to clone directly from <a href="https://github.com/apache/isis.git">github.com/apache/isis</a> rather than create your own fork:</p>
- </div>
- <div class="imageblock">
- <div class="content">
- <a class="image" href="images/contributing/git-workflow-2.png"><img src="images/contributing/git-workflow-2.png" alt="git workflow 2" width="600px"></a>
- </div>
- </div>
- <div class="paragraph">
- <p>In this case your <code>upstream</code> repo is the same as your <code>origin</code> repo, which might seem more straightforward. On the other hand, if you go this route then you’ll need create patches locally and attach them to the JIRA ticket.</p>
- </div>
- <div class="paragraph">
- <p>For the Apache Isis committers it really doesn’t matter which route you take, so go with whatever’s most comfortable.</p>
- </div>
- </div>
- <div class="sect2">
- <h3 id="_setting_up_your_fork_clone">6.3. Setting up your fork/clone</h3>
+ <h3 id="_setting_up_your_fork_clone">6.2. Setting up your fork/clone</h3>
<div class="paragraph">
<p>If you choose to create your own fork then you’ll need an account on <a href="https://github.com">github.com</a>. You then fork simply by pressing the "Fork" button:</p>
</div>
@@ -2557,7 +2590,7 @@ bundle install</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_commit_messages">6.4. Commit messages</h3>
+ <h3 id="_commit_messages">6.3. Commit messages</h3>
<div class="paragraph">
<p>Although with git your commits are always performed on your local repo, those commit messages become public when the patch is applied by an Apache Isis committer. You should take time to write a meaningful commit message that helps explain what the patch refers to; if you don’t then there’s a chance that your patch may be rejected and not applied. No-one likes hard work to go to waste!</p>
</div>
@@ -2581,7 +2614,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect2">
- <h3 id="_creating_the_patch_file">6.5. Creating the patch file</h3>
+ <h3 id="_creating_the_patch_file">6.4. Creating the patch file</h3>
<div class="paragraph">
<p>If you are working without a github fork of Apache Isis, then you can create the patches from your own local git repository.</p>
</div>
@@ -2598,12 +2631,12 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect2">
- <h3 id="_sample_contribution_workflow">6.6. Sample Contribution Workflow</h3>
+ <h3 id="_sample_contribution_workflow">6.5. Sample Contribution Workflow</h3>
<div class="paragraph">
<p>Assuming you’re development environment is all setup, let’s walk through how you might make contribute a patch. In this example, suppose that you’ve decided to work on JIRA ticket #123, an enhancement to support Blob/Clob datatypes.</p>
</div>
<div class="sect3">
- <h4 id="_update_your_master_branch">6.6.1. Update your master branch</h4>
+ <h4 id="_update_your_master_branch">6.5.1. Update your master branch</h4>
<div class="paragraph">
<p>The first thing to do is to make sure your local clone is up-to-date. We do this by retrieving new commits from upstream repo and then merging them as a fast-forward into your local branch.</p>
</div>
@@ -2618,7 +2651,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect3">
- <h4 id="_create_a_topic_branch">6.6.2. Create a topic branch</h4>
+ <h4 id="_create_a_topic_branch">6.5.2. Create a topic branch</h4>
<div class="paragraph">
<p>We recommend you name topic branches by the JIRA ticket, ie <tt>ISIS-nnn-description</tt>. So let’s create a new branch based off <code>master</code> and call it "ISIS-123-blobs"</p>
</div>
@@ -2635,7 +2668,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect3">
- <h4 id="_make_file_changes_and_commit">6.6.3. Make File Changes and Commit</h4>
+ <h4 id="_make_file_changes_and_commit">6.5.3. Make File Changes and Commit</h4>
<div class="paragraph">
<p>Next, make changes to your files using the usual commands (see also our <a href="../dg/dg.html#_dg_git-cookbook">git cookbook</a> section):</p>
</div>
@@ -2656,7 +2689,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect3">
- <h4 id="_rebasing_with_code_master_code">6.6.4. Rebasing with <code>master</code></h4>
+ <h4 id="_rebasing_with_code_master_code">6.5.4. Rebasing with <code>master</code></h4>
<div class="paragraph">
<p>Before you can share your change, you should rebase (in other words replay) your changes on top of the <code>master</code> branch.</p>
</div>
@@ -2680,7 +2713,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect3">
- <h4 id="_raising_a_pull_request">6.6.5. Raising a pull request</h4>
+ <h4 id="_raising_a_pull_request">6.5.5. Raising a pull request</h4>
<div class="paragraph">
<p>If you have your own fork, you can now simply push the changes you’ve made locally to your fork:</p>
</div>
@@ -2704,7 +2737,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
</div>
</div>
<div class="sect2">
- <h3 id="_if_your_pull_request_is_accepted">6.7. If your pull request is accepted</h3>
+ <h3 id="_if_your_pull_request_is_accepted">6.6. If your pull request is accepted</h3>
<div class="paragraph">
<p>To double check that your pull request is accepted, update your <code>master</code> branch from the <code>upstream</code> remote:</p>
</div>
@@ -2718,7 +2751,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
<p>Finally, you might want to push the latest changes in master back up to your github fork. If so, use:</p>
</div>
<div class="sect3">
- <h4 id="_if_your_pull_request_is_rejected">6.7.1. If your pull request is rejected</h4>
+ <h4 id="_if_your_pull_request_is_rejected">6.6.1. If your pull request is rejected</h4>
<div class="paragraph">
<p>If your pull request is rejected, then you’ll need to update your branch from the main repository and then address the rejection reason.</p>
</div>