Add git docs
diff --git a/content/batik/contributors.mdtext b/content/batik/contributors.mdtext
index 383d218..7836465 100644
--- a/content/batik/contributors.mdtext
+++ b/content/batik/contributors.mdtext
@@ -60,7 +60,7 @@
- [Bella Robinson](mailto:bella.robinson@cmis.csiro.au) is a Software Engineer working for CSIRO Australia. She was one of the main developers of the CSIRO SVG Toolkit and has also been working on a Pocket SVG Viewer for handheld devices. Her interests include graphics and XML programming. Bella Robinson implemented the SVG font support in Batik.
-In addition, [James Davidson](mailto:James.Davidson@eng.sun.com) and [Stefano Mazzochi](mailto:stefano@apache.org), two Apache veterans who helped the Batik team start the project at Apache, also have commit access to the Subversion repository.
+In addition, [James Davidson](mailto:James.Davidson@eng.sun.com) and [Stefano Mazzochi](mailto:stefano@apache.org), two Apache veterans who helped the Batik team start the project at Apache, also have commit access to the Git repository.
## Contributors { #contributors}
diff --git a/content/batik/dev/branches.mdtext b/content/batik/dev/branches.mdtext
index dcc6845..581a1d7 100644
--- a/content/batik/dev/branches.mdtext
+++ b/content/batik/dev/branches.mdtext
@@ -7,9 +7,9 @@
-trunk
+main
:
-The [trunk](https://github.com/apache/xmlgraphics-batik.git) is the main development branch. All bug fixes and most new non-experimental features are checked in to this branch. While it is the bleeding edge of the available Batik code, it is generally stable enough to use. For more information on SVG 1.2 features that are supported by the trunk, see the [SVG 1.2 support](../dev/svg12.html) page.
+The [main](https://github.com/apache/xmlgraphics-batik.git) is the main development branch. All bug fixes and most new non-experimental features are checked in to this branch. While it is the bleeding edge of the available Batik code, it is generally stable enough to use. For more information on SVG 1.2 features that are supported by the trunk, see the [SVG 1.2 support](../dev/svg12.html) page.
webapi
diff --git a/content/batik/dev/index.mdtext b/content/batik/dev/index.mdtext
index dc23b81..7bc7ea7 100644
--- a/content/batik/dev/index.mdtext
+++ b/content/batik/dev/index.mdtext
@@ -2,15 +2,15 @@
#Batik Development
-This section has information on the working on Batik, and on the features that are supported by the code in the Subversion repository that haven’t yet made it to a release.
+This section has information on the working on Batik, and on the features that are supported by the code in the Git repository that haven’t yet made it to a release.
## Branches
-The [branches](../dev/branches.html) page lists the branches of development that are in the Subversion repository and their purpose.
+The [branches](../dev/branches.html) page lists the branches of development that are in the Git repository and their purpose.
## SVG 1.2 support
-Some features of SVG 1.2 Tiny and Full are supported in the trunk, and these are listed on the [SVG 1.2 support](../dev/svg12.html) page.
+Some features of SVG 1.2 Tiny and Full are supported in the main, and these are listed on the [SVG 1.2 support](../dev/svg12.html) page.
## Test infrastructure
diff --git a/content/batik/dev/svg12.mdtext b/content/batik/dev/svg12.mdtext
index dbe7670..5e2c086 100644
--- a/content/batik/dev/svg12.mdtext
+++ b/content/batik/dev/svg12.mdtext
@@ -3,7 +3,7 @@
#SVG 1.2 support
-This page details information atbout Batik’s implementation of features from SVG 1.2, [Tiny](http://www.w3.org/TR/SVGTiny12/) and [Full](http://www.w3.org/TR/SVG12/). Note that the information on this page is based on the code in the Subversion repository trunk.
+This page details information atbout Batik’s implementation of features from SVG 1.2, [Tiny](http://www.w3.org/TR/SVGTiny12/) and [Full](http://www.w3.org/TR/SVG12/). Note that the information on this page is based on the code in the Git repository main.
## DOM Level 3 { #dom3}
diff --git a/content/batik/dev/test.mdtext b/content/batik/dev/test.mdtext
index 065cc85..94c1fc2 100644
--- a/content/batik/dev/test.mdtext
+++ b/content/batik/dev/test.mdtext
@@ -265,7 +265,7 @@
#### Daily usage ## { #Daily-usage}
-Once the intial set up has been done, you can use regard by simply updating your SVN copy, including the test-references. If no change occurs, your test will keep passing with your reference images. If a test fails (e.g., if someone checks in a new reference image from a platform different than the one you are using, you will have to check if it is because of system specific reasons or if there is a bigger problem.
+Once the intial set up has been done, you can use regard by simply updating your Git copy, including the test-references. If no change occurs, your test will keep passing with your reference images. If a test fails (e.g., if someone checks in a new reference image from a platform different than the one you are using, you will have to check if it is because of system specific reasons or if there is a bigger problem.
### SVG generator tests { #SVG-generator-tests}
diff --git a/content/batik/download b/content/batik/download
deleted file mode 100644
index 7e0bc5b..0000000
--- a/content/batik/download
+++ /dev/null
@@ -1,85 +0,0 @@
-Title: Download Batik
-
-
-# Download Batik
-
-There are several ways you can obtain Batik's binary or sources:
-
-
-## Download a distribution
-
-Every Batik release provides three distributions: a binary distribution (named batik-*version*.zip), a source distribution (named batik-src-*version*,zip) and a documentation distribution (named batik-docs-*version*.zip). These distributions are provided as ZIP files on the Apache mirrors. Note that it is good practice to [verify the integrity][1] of the distribution files.
-
-After downloading the distribution, consult the [installation notes][2] for details on how to install.
-
-
-## Current official release (closest mirror site selected automatically)
-
-You are currently using **http://www.bizdirusa.com/mirrors/apache/**. If you encounter a problem with this mirror, then please select another. If all mirrors are failing, there are backup mirrors at the end of the list. See [status][3] of mirrors.
-
-
-The current release is Apache Batik 1.7 (see the [release change log][4]).
-
-Binary distribution for JRE 1.4%2B
-
-[batik-1.7.zip][5] [[PGP][6]] [[MD5][7]]
-
-Binary distribution for JRE 1.3
-
-[batik-1.7-jre13.zip][8] [[PGP][9]] [[MD5][10]]
-
-Source distribution
-
-[batik-src-1.7.zip][11] [[PGP][12]] [[MD5][13]]
-
-Documentation distribution
-
-[batik-docs-1.7.zip][14] [[PGP][15]] [[MD5][16]]
-
-Squiggle Mac OS X disk image
-
-[Squiggle-1.7.dmg][17] [[PGP][18]] [[MD5][19]]
-
-Older releases are available from the [Apache archives][20]. However, we strongly recommend using the current release of Batik.
-
-As mentioned in the [installation notes][1], it is important that you verify the release that you download, using either the MD5 hash or verifying the PGP signature against the [PGP key of the developer who signed the release][21].
-
-
-## Current development snapshot
-
-Nightly snapshots of the source tree are available from the [Apache build server][22]. These snapshots represent the current state of development and may or may not be as stable as releases. There are two distributions provided: a complete copy of the Subversion repository trunk (named batik-svn-*date*.zip), including Batik's [regression testing utility][23] and reference images; and a snapshot of the aforementioned source code without any of the testing facilities (named batik-src-*date*.zip).
-
-
-## Subversion repository
-
-To fetch the latest Git repository main, just run the following command:
-
- git clone https://github.com/apache/xmlgraphics-batik.git
-
-You can also browse the Subversion repository using ViewCVS at .
-
- [1]: http://xmlgraphics.apache.org/install.html#verify
- [2]: http://xmlgraphics.apache.org/install.html
- [3]: http://www.apache.org/mirrors/
- [4]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/README.txt
- [5]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/batik-1.7.zip
- [6]: http://www.apache.org/dist/xmlgraphics/batik/batik-1.7.zip.asc
- [7]: http://www.apache.org/dist/xmlgraphics/batik/batik-1.7.zip.md5
- [8]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/batik-1.7-jre13.zip
- [9]: http://www.apache.org/dist/xmlgraphics/batik/batik-1.7-jre13.zip.asc
- [10]: http://www.apache.org/dist/xmlgraphics/batik/batik-1.7-jre13.zip.md5
- [11]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/batik-src-1.7.zip
- [12]: http://www.apache.org/dist/xmlgraphics/batik/batik-src-1.7.zip.asc
- [13]: http://www.apache.org/dist/xmlgraphics/batik/batik-src-1.7.zip.md5
- [14]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/batik-docs-1.7.zip
- [15]: http://www.apache.org/dist/xmlgraphics/batik/batik-docs-1.7.zip.asc
- [16]: http://www.apache.org/dist/xmlgraphics/batik/batik-docs-1.7.zip.md5
- [17]: http://www.bizdirusa.com/mirrors/apache//xmlgraphics/batik/Squiggle-1.7.dmg
- [18]: http://www.apache.org/dist/xmlgraphics/batik/Squiggle-1.7.dmg.asc
- [19]: http://www.apache.org/dist/xmlgraphics/batik/Squiggle-1.7.dmg.md5
- [20]: http://archive.apache.org/dist/xmlgraphics/batik
- [21]: http://www.apache.org/dist/xmlgraphics/batik/KEYS
- [22]: http://svn.apache.org/builds/xml-batik
- [23]: http://xmlgraphics.apache.org/dev/test.html
-
-
\ No newline at end of file
diff --git a/content/batik/status.mdtext b/content/batik/status.mdtext
index f6673f6..67e20fd 100644
--- a/content/batik/status.mdtext
+++ b/content/batik/status.mdtext
@@ -21,7 +21,7 @@
:
If a feature is <span class="yes">fully</span> supported, this means that Batik performs the correct processing for it, as detailed in the relevant specification.
-Note that the information on this page is based on the code in the Subversion repository trunk.
+Note that the information on this page is based on the code in the Git repository main.
## Elements, attributes and properties { #elements}
@@ -3021,7 +3021,7 @@
</div></div>
# SVG 1.1 test suite { #test}
-The table below lists the test cases from the December 2006 release of the [SVG 1.1 test suite](http://www.w3.org/Graphics/SVG/Test/) and whether the latest Batik code in the Subversion repository passes each one.
+The table below lists the test cases from the December 2006 release of the [SVG 1.1 test suite](http://www.w3.org/Graphics/SVG/Test/) and whether the latest Batik code in the Git repository passes each one.
| SVG 1.1 test suite | | |
|--------------------|--|--|
diff --git a/content/fop/dev/conventions.mdtext b/content/fop/dev/conventions.mdtext
index 22cf8b8..3013c06 100644
--- a/content/fop/dev/conventions.mdtext
+++ b/content/fop/dev/conventions.mdtext
@@ -33,7 +33,7 @@
| No underscores in variable names except for static finals. | Upper/lower case distinctions can be made in all other variable names, eliminating the need for artificial word boundaries. | checkstyle |
| Opening brace for a block should be on the same line as its control statement (if, while, etc.). | Standardization, general preference. | checkstyle |
| Write appropriate javadoc entries for all public and protected classes, methods, and variables. | Basic API documentation is needed. | checkstyle |
-| By [ASF policy](http://mail-archives.apache.org/mod_mbox/jakarta-jmeter-dev/200402.mbox/%3C4039F65E.7020406@atg.com%3E), @author tags are officially discouraged. However it is permissible to indicate the original author(s) of an entire file or package in a comment provided it follows the copyright and license header. | Attribution of subsequent contributions are recorded by the SVN commit history logs, so should not be included. | checkstyle |
+| By [ASF policy](http://mail-archives.apache.org/mod_mbox/jakarta-jmeter-dev/200402.mbox/%3C4039F65E.7020406@atg.com%3E), @author tags are officially discouraged. However it is permissible to indicate the original author(s) of an entire file or package in a comment provided it follows the copyright and license header. | Attribution of subsequent contributions are recorded by the Git commit history logs, so should not be included. | checkstyle |
For developers that dislike these conventions, one workaround is to develop using their own style, then use a formatting tool like [astyle](http://astyle.sourceforge.net/) (Artistic Style) before committing.
diff --git a/content/fop/dev/design/index.mdtext b/content/fop/dev/design/index.mdtext
index d3245de..b6a6da7 100644
--- a/content/fop/dev/design/index.mdtext
+++ b/content/fop/dev/design/index.mdtext
@@ -2,7 +2,7 @@
#Apache™ FOP Design: Introduction
-<note>The articles in this section pertain mainly to the *redesign* or *trunk* line of development. The redesign is mainly focusing on parts of the layout process (converting the FO tree into the Area Tree). Therefore other (non-layout) sections in this document are probably largely accurate for the maintenance branch, but should be used with care in that context.</note>
+<note>The articles in this section pertain mainly to the *redesign* or *main* line of development. The redesign is mainly focusing on parts of the layout process (converting the FO tree into the Area Tree). Therefore other (non-layout) sections in this document are probably largely accurate for the maintenance branch, but should be used with care in that context.</note>
## The Black Box View { #black-box}
diff --git a/content/fop/dev/doc.mdtext b/content/fop/dev/doc.mdtext
index 89bb1ae..8263442 100644
--- a/content/fop/dev/doc.mdtext
+++ b/content/fop/dev/doc.mdtext
@@ -6,9 +6,9 @@
## General Information { #general}
-All raw documentation content is managed in the Apache™ FOP SVN repository. Updates should be committed to the repository, then the repository files are used to generate usable output. The remaining discussions on this page assume that the SVN repository is the starting place for processing. The path to the documentation is src/documentation/content/xdocs.
+All raw documentation content is managed in the Apache™ FOP Git repository. Updates should be committed to the repository, then the repository files are used to generate usable output. The remaining discussions on this page assume that the Git repository is the starting place for processing. The path to the documentation is src/documentation/content/xdocs.
-<note>All documentation is maintained on the trunk.</note>
+<note>All documentation is maintained on the main.</note>
Basic documents are stored in XML files, and use DTDs provided by Apache Forrest.
@@ -29,64 +29,8 @@
Other approaches were considered, but all seemed to have significantly higher costs both to the users and the developers. From the user's standpoint, the choice is either that they potentially have to look multiple places to get the information they need (which was rejected), or they have to filter out an occasional feature that is in code available subsequent to their release (which was accepted).
-## Website { #web}
-
-### Background { #web-background}
-
-The FOP web site and documentation are generated using [Apache Forrest](http://forrest.apache.org).
-
-The following table summarizes the flow of data to the FOP website in chronological order:
-
-| Process | Output | State | View(s) |
-|---------|--------|-------|---------|
-| Developer commits code to FOP repository. | FOP repository (SVN) | Raw XML and other content | [in SVN](http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/src/documentation/content/xdocs/) |
-| Developer builds and uploads documentation using ForrestBot. | /www/xmlgraphics.apache.org/fop on people.apache.org | sync-ready | n/a |
-| Cron job runs rsync to synchronize the website with the real web server (runs every few hours). | Infrastructure knows. :-) | web-ready | [FOP Web Site](http://xmlgraphics.apache.org/fop) |
-
-<note>Server-side ForrestBot is currently not available for website publishing. We use it locally and with manual invocation.</note>
-
-### ForrestBot "publish" Step-by-Step { #web-forrestbot-publish}
-
-We're using ForrestBot for build and deploy the FOP website. ForrestBot comes with Apache Forrest 0.8. The root directory of your FOP checkout contains the file "publish.xml" which is an Ant build file that manages the build and the deployment of the FOP website. Please look into this file for further instructions to set up ForrestBot on your machine. Basically, we're simply running ForrestBot manually by typing "ant -f publish.xml" once we're happy with our changes to the site. Step-by-step instructions for the deployment process again:
-
-<note>Please make sure you use Forrest from the Trunk (revision 632959 or later) for the time being. You will need to download it directly from SVN: [http://svn.apache.org/repos/asf/forrest/trunk](http://svn.apache.org/repos/asf/forrest/trunk).</note>
-
-- Modify the sources of the website and check locally with Forrest (run "forrest run" or just "forrest").
-
-- Once you're satisfied, run "ant -f publish.xml" to do a clean build of the website. If the build runs without problems, the website will be uploaded as a whole using SVN to the [website staging directory in SVN](https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/fop/).
-
-- Then log into people.apache.org using SSH, go to the /www/xmlgraphics.apache.org directory and run "svn up".
-
-- Wait for the next rsync cycle and check your changes in the live site. (Sorry, no manual rsync available ATM)
-
-The reason for putting the generated website in the SVN repository: The infrastructure people want to be able to restore the websites themselves in case of a crash.
-
-### Using a Local Forrest { #web-local-forrest}
-
-To use a local Forrest (during website development, not for deployment):
-
-- [download](http://forrest.apache.org/mirrors.cgi#closest) latest the Forrest release (currently Forrest 0.8)
-
-- set environment variable FORREST_HOME=~/apache-forrest-0.8 where ~ is the directory where Forrest is installed (see [http://forrest.apache.org/docs/your-project.html](http://forrest.apache.org/docs/your-project.html) for details)
-
-- set environment variable PATH=$PATH:$FORREST_HOME/bin
-
-- cd to your local FOP checkout
-
-- update your local FOP checkout (svn update)
-
-- run forrest(.bat), which will build the web-site documents in xml-fop/build/site.
-
-<note>You can use "forrest run" to start a local web server. That improves development speed as you can simply refresh in the browser after a change.</note>
-
### Updating Distribution Files { #distribution}
The Apache distribution system mirrors distributions around the world. Since it uses [Apache httpd](http://httpd.apache.org/) Module [mod_autoindex](http://httpd.apache.org/docs/2.2/mod/mod_autoindex.html#headername) you also need to manually update the HEADER.html & READER.html files on `people.apache.org` in `/www/www.apache.org/dist/xmlgraphics/fop/`.
Please be careful when doing stuff like that.
-
-### Deleting Documentation Files { #delete}
-
-ForrestBot simply uploads the whole generated site. It doesn't delete obsolete files. You can do that manually in the /www/xmlgraphics.apache.org/fop folder on cvs.apache.org. Be careful when doing stuff like that.
-
-<note>Please make sure you always have **group rw permissions on all files** under the /www directory!</note>
diff --git a/content/fop/dev/implement.mdtext b/content/fop/dev/implement.mdtext
index 7f2e208..1384248 100644
--- a/content/fop/dev/implement.mdtext
+++ b/content/fop/dev/implement.mdtext
@@ -7,7 +7,7 @@
## Overview { #Overview}
-The input FO document is sent to the FO tree builder via SAX events. Fragments of an FO Tree are built from this process. As each page-sequence element is completed, it is passed to a layout processor, which in turn converts it into an Area Tree. The Area Tree is then given to the Renderer, which converts it into a stream of data containing the output document. The sections below will provide additional details. Where needed differences between the trunk and maintenance branches are shown in tabular format.
+The input FO document is sent to the FO tree builder via SAX events. Fragments of an FO Tree are built from this process. As each page-sequence element is completed, it is passed to a layout processor, which in turn converts it into an Area Tree. The Area Tree is then given to the Renderer, which converts it into a stream of data containing the output document. The sections below will provide additional details. Where needed differences between the main and maintenance branches are shown in tabular format.
## Startup { #Startup}
diff --git a/content/fop/dev/index.mdtext b/content/fop/dev/index.mdtext
index 188a65b..4445d49 100644
--- a/content/fop/dev/index.mdtext
+++ b/content/fop/dev/index.mdtext
@@ -119,9 +119,9 @@
- Subscribe by sending an email to [fop-commits-subscribe@xmlgraphics.apache.org](mailto:fop-commits-subscribe@xmlgraphics.apache.org).
-### Download and Use the Developers' Code Using Subversion { #dev-code}
+### Download and Use the Developers' Code Using Git { #dev-code}
-Between releases the newest code can be accessed via SVN. To do this you need to install a SVN client on your computer, if it is not already there. An explanation how to connect to the FOP source repository can be found at [http://xmlgraphics.apache.org/repo.html](http://xmlgraphics.apache.org/repo.html). More information can be found on the [Tools page](tools.html).
+Between releases the newest code can be accessed via Git. To do this you need to install a Git client on your computer, if it is not already there. An explanation how to connect to the FOP source repository can be found at [http://xmlgraphics.apache.org/repo.html](http://xmlgraphics.apache.org/repo.html). More information can be found on the [Tools page](tools.html).
### Submitting Patches { #patches}
diff --git a/content/fop/dev/release.mdtext b/content/fop/dev/release.mdtext
index 6829321..82b7e1b 100644
--- a/content/fop/dev/release.mdtext
+++ b/content/fop/dev/release.mdtext
@@ -27,15 +27,15 @@
- Check and update the copyright year in NOTICE and build.xml.
-- Update version number in `build.xml` (not to be merged back into trunk).
+- Update version number in `build.xml` (not to be merged back into main).
- Build the dist files (`build[.sh] dist`) and upload them to your web directory on `people.apache.org`
- Ask on `fop-dev` ML to check the branch and the generated dist files for errors.
-- Tag the source tree with the release ID. For example, if the release is 1.0: `svn copy https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_0 https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0`
+- Tag the source tree with the release ID.
-- Make a fresh checkout with the just created tag: `svn co https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0`
+- Make a fresh checkout with the just created tag
- Copy the `jai_core.jar` and `jai_codec.jar` to `lib`.
@@ -43,7 +43,7 @@
- Alternatively, create a `build-local.properties` file that points to the above libraries.
-- Run `build[.sh] dist`. Do this using Sun JDK 1.5 or later. A Forrest installation is needed.
+- Run `build[.sh] dist`. Do this using JDK 1.5 or later.
- Create signatures. Don't forget to upload your KEY: `gpg -a -b --force-v3-sigs fop-1.0-src.tar.gz` etc.
@@ -53,8 +53,6 @@
- Check permissions: `chmod 664 ... ; chgrp xmlgraphics ...`
-- Add MD5 sums: `md5 fop-1.0-src.tar.gz > fop-1.0-src.tar.gz.md5` etc.
-
- Make a test download.
## 4. Vote for the new release { #vote}
@@ -71,13 +69,13 @@
### 5.1 Git { #git}
-- Merge the changes of the git release branch back into trunk (not the version number in the build file) and delete the branch.
+- Merge the changes of the git release branch back into main (not the version number in the build file).
### 5.2 Jira { #jira}
- Ask an FOP Jira admin to
- - rename trunk entry into the new release name,
- - and create a new trunk entry
+ - rename main entry into the new release name,
+ - and create a new main entry
or
@@ -85,7 +83,7 @@
### 5.3 CMS { #cms}
-- Copy trunk directory to a new release directory with the new version number.
+- Copy main directory to a new release directory with the new version number.
- Copy following files to the new release directory:
- `known-issues.mdtext` as `knownissues-overview.mdtext`
@@ -105,7 +103,7 @@
- In the new release directory, update the following files:
- `index.mdtext`
- - `compiling.mdtext` (change the introduction for trunk to that for a release).
+ - `compiling.mdtext` (change the introduction for main to that for a release).
- `changes_x.x.mdtext`
- Publish the updated documentation to the FOP website.
diff --git a/content/fop/dev/rtflib.mdtext b/content/fop/dev/rtflib.mdtext
index 73ed69d..f5a991c 100644
--- a/content/fop/dev/rtflib.mdtext
+++ b/content/fop/dev/rtflib.mdtext
@@ -22,7 +22,7 @@
### Status { #status}
-Although FOP's implementation of the RTFLib package is very incomplete, the RTFLib package itself is relatively mature. RTFLib is only available in the trunk [line of FOP development](index.html#lines).
+Although FOP's implementation of the RTFLib package is very incomplete, the RTFLib package itself is relatively mature. RTFLib is only available in the main [line of FOP development](index.html#lines).
<warning>This documentation is a work in progress. If you see errors or omissions, please report them to the [fop-dev mailing list](index.html#mail-fop-dev).</warning>
# User Documentation { #userdoc}
diff --git a/content/fop/dev/testing.mdtext b/content/fop/dev/testing.mdtext
index 6c712dd..4dc33a8 100644
--- a/content/fop/dev/testing.mdtext
+++ b/content/fop/dev/testing.mdtext
@@ -8,7 +8,7 @@
Apache™ projects use an automated build tool called "jenkins" to create nightly builds from the SVN repository. Jenkins sends "nag" messages if the build fails. This can be considered a sort of basic test of the build process. To view the most recent logs of the jenkins builds:
-- [Jenkins build for trunk](https://builds.apache.org/view/X/view/XmlGraphics/)
+- [Jenkins build for main](https://builds.apache.org/view/X/view/XmlGraphics/)
## Basic/API Testing { #basic}
diff --git a/content/fop/dev/tools.mdtext b/content/fop/dev/tools.mdtext
index d54d591..befe917 100644
--- a/content/fop/dev/tools.mdtext
+++ b/content/fop/dev/tools.mdtext
@@ -38,7 +38,7 @@
`git clone https://github.com/apache/xmlgraphics-fop.git`
-This will download the FOP trunk into the directory "xmlgraphics-fop".
+This will download the FOP main into the directory "xmlgraphics-fop".
### Step-by-step instructions for downloading FOP using TortoiseGit (on Windows) { #tortoisegit_download}
@@ -77,7 +77,7 @@
An IDE is not required, but will generally be found to be helpful, especially for serious debugging and refactoring.
-Borland's JBuilder 7/8 does not support Ant builds unless you have the Enterprise Edition (which is quite expensive). This causes problems with any code that is generated by the Ant build. First, you must run the Ant build before you can use the IDE. Second, when you are editing in the IDE, you must be editing the generated files, which means that you must make any changes to the source files in another editor. This is less serious for development on the trunk, but in the maintenance branch, all source files were "generated".
+Borland's JBuilder 7/8 does not support Ant builds unless you have the Enterprise Edition (which is quite expensive). This causes problems with any code that is generated by the Ant build. First, you must run the Ant build before you can use the IDE. Second, when you are editing in the IDE, you must be editing the generated files, which means that you must make any changes to the source files in another editor. This is less serious for development on the main, but in the maintenance branch, all source files were "generated".
Sun ONE Studio Four does support Ant, but seems to use a built-in version, and as of this writing chokes on the FOP build file, saying that it is not valid. There is awkward because there is no official DTD for Ant, and it may be merely an Ant version issue.
diff --git a/content/fop/download.mdtext b/content/fop/download.mdtext
index 2f65ca9..87d071f 100644
--- a/content/fop/download.mdtext
+++ b/content/fop/download.mdtext
@@ -10,7 +10,7 @@
- You wish to modify FOP.
-- You wish to use a version more recent than the latest release. For example, if you have read on the user mailing list that a bug has been fixed or a feature added that you are eager to try, you might download a source distribution from the SVN repository so that you don't have to wait for the next release.
+- You wish to use a version more recent than the latest release. For example, if you have read on the user mailing list that a bug has been fixed or a feature added that you are eager to try, you might download a source distribution from the Git repository so that you don't have to wait for the next release.
- You wish to build a local copy of the API documentation (javadocs).
diff --git a/content/fop/fo.mdtext b/content/fop/fo.mdtext
index 28bbc7a..2f7a53d 100644
--- a/content/fop/fo.mdtext
+++ b/content/fop/fo.mdtext
@@ -403,7 +403,7 @@
* [RenderX](http://www.renderx.com) has provided an [Unofficial DTD for FO Documents](http://www.renderx.com/Tests/validator/fo.dtd.html), which may be helpful in validating general FO issues.
* [AntennaHouse](http://www.antennahouse.com) has provided a tool called [focheck](https://github.com/AntennaHouse/focheck) for XSL-FO validation using RELAX NG and Schematron
-FOP also maintains an [Unofficial FOP Schema](http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/src/foschema/fop.xsd?view=co) in the FOP Subversion Repository. This document can be used either to validate against the FO standard, or against the actual FOP implementation. See the notes near the beginning of the document for instructions on how to use it.
+FOP also maintains an [Unofficial FOP Schema](http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/src/foschema/fop.xsd?view=co) in the FOP Git Repository. This document can be used either to validate against the FO standard, or against the actual FOP implementation. See the notes near the beginning of the document for instructions on how to use it.
### Producing landscape pages { #landscape}
diff --git a/content/fop/trunk/compiling.mdtext b/content/fop/trunk/compiling.mdtext
index 38fec49..cab5b0b 100644
--- a/content/fop/trunk/compiling.mdtext
+++ b/content/fop/trunk/compiling.mdtext
@@ -5,7 +5,7 @@
## Do You Need To Build? { #build-needed}
-Apache™ FOP snapshots are either pre-compiled binary or source. If you are using a binary snapshot, it is already built and there is no need to build it again. If you got the source code from a repository snapshot or via Subversion you will need to build FOP. See the [Download Instructions](../download.html) for information about where to obtain binary or repository snapshots, and whether a binary or source snapshot is best for your needs.
+Apache™ FOP snapshots are either pre-compiled binary or source. If you are using a binary snapshot, it is already built and there is no need to build it again. If you got the source code from a repository snapshot or via Git you will need to build FOP. See the [Download Instructions](../download.html) for information about where to obtain binary or repository snapshots, and whether a binary or source snapshot is best for your needs.
## Set Up Your Environment { #env}
diff --git a/content/fop/trunk/index.mdtext b/content/fop/trunk/index.mdtext
index 0a773b9..a58c161 100644
--- a/content/fop/trunk/index.mdtext
+++ b/content/fop/trunk/index.mdtext
@@ -15,4 +15,4 @@
## Download { #download}
-Nightly builds of trunk code can be downloaded here: [Nightly Snapshots](http://ci.apache.org/projects/xmlgraphics/fop/snapshots/).
\ No newline at end of file
+Nightly builds of main code can be downloaded here: [Nightly Snapshots](http://ci.apache.org/projects/xmlgraphics/fop/snapshots/).
\ No newline at end of file
diff --git a/content/mail.mdtext b/content/mail.mdtext
index 82b0d7e..6c7175f 100644
--- a/content/mail.mdtext
+++ b/content/mail.mdtext
@@ -17,7 +17,7 @@
- `*-users` Users list - for general usage questions about the product from an end-users perspective
-- `*-commits` commit list - this is a read-only list that sends out email with details of all changes to that project's CVS, SVN or Wiki repository
+- `*-commits` commit list - this is a read-only list that sends out email with details of all changes to that project's Git or Wiki repository
The ezmlm mailing list controller accepts commands by sending emails to `<listname>-command`, generally like the following:
