Changes between Version 104 and Version 105 of TracMercurial

Timestamp:

Jan 18, 2016, 2:35:35 PM (8 years ago)

Author:

figaro

Comment:

Further cosmetic changes

TracMercurial

@@ -1 @@
-[[PageOutline(2-3)]]
+[[PageOutline(2-5,Contents)]]
 
 = Mercurial Plugin for Trac
@@ -66 +66 @@
 === Trac
 
-Consult the version table [#Releases below] to check which version you need for your version of Trac. If you want to get a specific revision, add an `svn up -rxxx` step to the instructions below, after the checkout.
+Consult the version table to check which version you need for your version of Trac. If you want to get a specific revision, add an `svn up -rxxx` step to the instructions below, after the checkout.
 
 Installation of the plugin, depending on the version of Trac you are using:
@@ -118 +118 @@
 The TracMercurial plugin egg should be added to the `plugins` folder of the environment, or it can be globally installed: `python setup.py install` or a `python setup.py develop`. For general instructions about plugins, see also TracPlugins.
 
-If you installed the egg globally and you're modifying an existing Trac environment to use the Mercurial backend, then you have to explicitly '''enable''' the plugin in TracIni.
+If you installed the egg globally and you are modifying an existing Trac environment to use the Mercurial backend, then you have to explicitly '''enable''' the plugin in TracIni.
 
 Since the version 0.11 of the plugin, the package has been renamed to `tracext`:
@@ -193 +193 @@
 
 In Mercurial, the ''Previous Changeset''/''Next Changeset'' navigation is ''not'' purely sequential, as it is in Subversion.
-Instead of a ''flat'' history of successive changesets, we actually navigate a [http://en.wikipedia.org/wiki/Directed_acyclic_graph DAG] of changesets. 
+Instead of a ''flat'' history of successive changesets, we actually navigate a [wikipedia:Directed_acyclic_graph DAG] of changesets. 
 This means a changeset can have multiple parents (0, 1 or 2) and multiple children as well (0 to n). 
 
@@ -241 +241 @@
 ==== Highlight Conflict Resolution
 
-While visualizing changeset diffs for merge changesets, we already show the changes relative to both parents, which helps to understand how conflicts (if any) were solved. But this can be improved by specifically highlighting lines that differs from both parents.
+While visualizing changeset diffs for merge changesets, we already show the changes relative to both parents, which helps to understand how conflicts (if any) were solved. But this can be improved by specifically highlighting lines that differ from both parents.
 
 ==== Repository Management
@@ -264 +264 @@
 == Bugs and Limitations
 
-=== Features that Trac+svn has but not currently implemented for Trac+hg
+=== Features in Trac+svn but not in Trac+hg
 
  * No ''path history'' mode, ie show all create/delete operations that affected a given path.
@@ -304 +304 @@
  - [mercurial:CommandServer] and [mercurial:PythonHglib] (not yet used - see #10411)
 
-I'm interested in feedback concerning the code, in particular concerning Mercurial. I'm pretty sure I did things in a sub-optimal way, as I was discovering the guts of hg while writing the plugin.  Therefore, I'll be pleased to get tips for improvements.
+I'm interested in feedback concerning the code, in particular concerning Mercurial. I'm pretty sure I did things in a sub-optimal way, as I was discovering the guts of hg while writing the plugin. Therefore, I'll be pleased to get tips for improvements.
 
  -- ChristianBoos