diff --git a/HISTORY.TXT b/HISTORY.TXT index 5503a8cd..5e90a86b 100644 --- a/HISTORY.TXT +++ b/HISTORY.TXT @@ -42,7 +42,7 @@ List of changes from version 3.2 to 3.2.1 (until October 23rd, 2015) - comparative gene prediction (CGP): make the parameters from the GCB proceedings paper match again - new CGP default parameters (tested on 5 clades) - CGP version penalizes very long introns equivalently to a geometric distribution - - code now under artistic licence only + - code now under artistic license only List of changes from version 3.1 to 3.2 (until September 25th, 2015) - comparative gene prediction (CGP option) has sensible default parameters of the logistic regression model - new tool hal2maf_split.pl for splitting an alignment for parallel comparative prediction @@ -85,10 +85,10 @@ List of changes from version 3.0.2 to 3.0.3 (until August 28th, 2014) - other bugfixes in comparative mode - removal of mysql++ code from package: this is available as Debian/Ubuntu package List of changes from version 3.0 to 3.0.2 (until February 22nd, 2014) - - inclusion of scanner and parser code for Newick tree format (GPL licence), easier installation of + - inclusion of scanner and parser code for Newick tree format (GPL license), easier installation of comparative augustus functionality - - therefore release under more restrictive GPL licence (the plan is to replace this later - and switch back to the more permissive and non-viral artistic open source licence) + - therefore release under more restrictive GPL license (the plan is to replace this later + and switch back to the more permissive and non-viral artistic open source license) - drop requirement to set environment variable AUGUSTUS_CONFIG_PATH - bugfixes (etraining: "not Genbank format", gtf2gff.pl, compilation warning) List of changes from version 2.7 to 3.0 (until January 8th, 2014) @@ -153,7 +153,7 @@ List of changes from version 2.4 to 2.5 (until Nov 13th, 2010) - new species pneumocystis (fungus), user contributed by Marco Pagni List of changes from version 2.3.1 to 2.4 (until July 27, 2010) - improved human parameter set: roughly 13 percent points better on CDS exon level - - improved fly paramter set + - improved fly parameter set - added new species 'lamprey', contributed by Falk Hildebrand and Shigehiro Kuraku - added new species Leishmania tarentolae, Trichinella spiralis - added maize5 parameter set, better than 'maize' and with UTR model @@ -274,7 +274,7 @@ List of changes from version 1.6 to version 1.7 (until October 5th, 2005): List of changes from version 1.5 to version 1.6 (until August 3rd, 2005): - - The source code is now freely available (Artistic Licence). + - The source code is now freely available (Artistic License). - New species: Tribolium castaneum, Aedes aegypti, Coprinus cinereus - Bugfix: Wrong interpretation of reading frame for reverse strand exon hints. - Training of hints possible with nested genes. diff --git a/README-cgp.md b/README-cgp.md index 83273023..6dbb3742 100644 --- a/README-cgp.md +++ b/README-cgp.md @@ -10,7 +10,7 @@ (not needed unless you run into compiler errors related to 'parse.cc' or 'lex.cc') [AUTHORS AND CONTACT](docs/CONTACT.md) [REFERENCES](README.md#references) -[LICENCES](README.md#licenses) +[LICENSES](README.md#licenses) # INTRODUCTION diff --git a/README.md b/README.md index b9d614d4..bb571b10 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [WEB-SERVER](#web-server) [AUTHORS AND CONTACT](docs/CONTACT.md) [REFERENCES](#references) -[LICENCES](#licenses) +[LICENSES](#licenses) # INTRODUCTION diff --git a/augustus-training/dynamic/about.html b/augustus-training/dynamic/about.html index a189cbbb..1b5e831c 100644 --- a/augustus-training/dynamic/about.html +++ b/augustus-training/dynamic/about.html @@ -35,7 +35,7 @@
-Choose the translation table number accoding to this table. translation_table=1 is +Choose the translation table number according to this table. translation_table=1 is the default value and the standard with stop codons taa, tga, tag. If you have a species with the standard genetic code you don't have to do anything. In case your species' code is not covered by this table send us a note with the string of 64 one-letter amino acid codes in the codon order below.
diff --git a/docs/tutorial2015/index.html b/docs/tutorial2015/index.html index 37f99d86..824eae57 100644 --- a/docs/tutorial2015/index.html +++ b/docs/tutorial2015/index.html @@ -66,7 +66,7 @@cat est.psl | filterPSL.pl --best --minCover=80 > est.f.pslest.f.psl now only contains for each query -the best alginment(s) and that only if it covers at least 80% of the query length. +the best alignment(s) and that only if it covers at least 80% of the query length. This reduces the number of alignments:
wc -l est.psl est.f.psl diff --git a/docs/tutorial2015/results/aug.nasonia.1-1M.gff b/docs/tutorial2015/results/aug.nasonia.1-1M.gff index 0624c79d..542b1bf1 100644 --- a/docs/tutorial2015/results/aug.nasonia.1-1M.gff +++ b/docs/tutorial2015/results/aug.nasonia.1-1M.gff @@ -6,7 +6,7 @@ # Bioinformatics 24: 637-644, doi 10.1093/bioinformatics/btn013 # No extrinsic information on sequences given. # Sources of extrinsic information: M RM -# Initialising the parameters using config directory /home/mario/augustus/trunks/config/ ... +# Initializing the parameters using config directory /home/mario/augustus/trunks/config/ ... # nasonia version. Using default transition matrix. # Looks like chr2L.sm.fa is in fasta format. # We have hints for 0 sequences and for 0 of the sequences in the input set. diff --git a/docs/tutorial2015/results/aug.nasonia.hints.gff b/docs/tutorial2015/results/aug.nasonia.hints.gff index 81fe82df..f2bc1d85 100644 --- a/docs/tutorial2015/results/aug.nasonia.hints.gff +++ b/docs/tutorial2015/results/aug.nasonia.hints.gff @@ -12,7 +12,7 @@ # Setting UTRpart local malus: 0.985 # reading in the file hints.gff ... # Have extrinsic information about 1 sequences (in the specified range). -# Initialising the parameters using config directory /home/mario/augustus/trunks/config/ ... +# Initializing the parameters using config directory /home/mario/augustus/trunks/config/ ... # nasonia version. Using default transition matrix. # start gene g1 chr2L AUGUSTUS gene 6774 9276 0.44 + . g1 diff --git a/docs/tutorial2015/results/aug.tomato.1-1M.gff b/docs/tutorial2015/results/aug.tomato.1-1M.gff index e995a522..ff4c5e1b 100644 --- a/docs/tutorial2015/results/aug.tomato.1-1M.gff +++ b/docs/tutorial2015/results/aug.tomato.1-1M.gff @@ -6,7 +6,7 @@ # Bioinformatics 24: 637-644, doi 10.1093/bioinformatics/btn013 # No extrinsic information on sequences given. # Sources of extrinsic information: M RM -# Initialising the parameters using config directory /home/mario/augustus/trunks/config/ ... +# Initializing the parameters using config directory /home/mario/augustus/trunks/config/ ... # tomato version. Using default transition matrix. # Looks like chr2L.sm.fa is in fasta format. # We have hints for 0 sequences and for 0 of the sequences in the input set. diff --git a/docs/tutorial2015/results/aug.zebrafish.1-1M.gff b/docs/tutorial2015/results/aug.zebrafish.1-1M.gff index ae8fd7a6..02155aa4 100644 --- a/docs/tutorial2015/results/aug.zebrafish.1-1M.gff +++ b/docs/tutorial2015/results/aug.zebrafish.1-1M.gff @@ -6,7 +6,7 @@ # Bioinformatics 24: 637-644, doi 10.1093/bioinformatics/btn013 # No extrinsic information on sequences given. # Sources of extrinsic information: M RM -# Initialising the parameters using config directory /home/mario/augustus/trunks/config/ ... +# Initializing the parameters using config directory /home/mario/augustus/trunks/config/ ... # zebrafish version. Using default transition matrix. # admissible start codons and their probabilities: ATG(0.999), CTG(0.000667), TTG(0) # Looks like chr2L.sm.fa is in fasta format. diff --git a/docs/tutorial2015/results/firsttest.out b/docs/tutorial2015/results/firsttest.out index 6d1d8bdb..5fd08d8c 100644 --- a/docs/tutorial2015/results/firsttest.out +++ b/docs/tutorial2015/results/firsttest.out @@ -5,7 +5,7 @@ # Using native and syntenically mapped cDNA alignments to improve de novo gene finding # Bioinformatics 24: 637-644, doi 10.1093/bioinformatics/btn013 # No extrinsic information on sequences given. -# Initialising the parameters using config directory /home/mario/augustus/trunks/config/ ... +# Initializing the parameters using config directory /home/mario/augustus/trunks/config/ ... # bug version. Using default transition matrix. # admissible start codons and their probabilities: ATG(1), CTG(0), TTG(0) # Looks like genes.gb.test is in genbank format. Augustus uses the annotation for evaluation of accuracy. diff --git a/docs/tutorial2015/training.html b/docs/tutorial2015/training.html index 84035952..2d6ba5d8 100644 --- a/docs/tutorial2015/training.html +++ b/docs/tutorial2015/training.html @@ -376,7 +376,7 @@4. RUN THE SCRIPT optimize_augustus.pl
in the case of Tetrahymena, where taa and tag are coding for glutamine (Q).-Choose the translation table number accoding to this table. translation_table=1 is +Choose the translation table number according to this table. translation_table=1 is the default value and the standard with stop codons taa, tga, tag. If you have a species with the standard genetic code you don't have to do anything. In case your species' code is not covered by this table send us a note with the string of 64 one-letter amino acid codes in the codon order below.
diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/align2hints.pl b/docs/tutorial2018/BRAKER_v2.0.4+/align2hints.pl index cdc63562..8af67f9d 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/align2hints.pl +++ b/docs/tutorial2018/BRAKER_v2.0.4+/align2hints.pl @@ -11,7 +11,7 @@ # # # Release date: February xx 2018 # # # -# This script is under the Artistic Licence # +# This script is under the Artistic License # # (http://www.opensource.org/licenses/artistic-license.php) # # # # Usage: # diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/braker.pl b/docs/tutorial2018/BRAKER_v2.0.4+/braker.pl index 51b3614b..d3010428 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/braker.pl +++ b/docs/tutorial2018/BRAKER_v2.0.4+/braker.pl @@ -11,7 +11,7 @@ # # # Release date: February 9th 2018 # # # -# This script is under the Artistic Licence # +# This script is under the Artistic License # # (http://www.opensource.org/licenses/artistic-license.php) # # # #################################################################################################### @@ -2504,9 +2504,9 @@ sub training{ # decide on whether to keep CRF parameters if($target_2>$target_3){ - print LOG "\# ".(localtime).": CRF performance is worse than HMM performance, reverting to usage of HMM paramters.\n"; + print LOG "\# ".(localtime).": CRF performance is worse than HMM performance, reverting to usage of HMM parameters.\n"; }else{ - print LOG "\# ".(localtime).": CRF performance is better than HMM performance, keeping CRF paramters.\n"; + print LOG "\# ".(localtime).": CRF performance is better than HMM performance, keeping CRF parameters.\n"; } # cp config files print LOG "\# ".(localtime).": Copying parameter files to $species*.CRF\n"; diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/filterGenemark.pl b/docs/tutorial2018/BRAKER_v2.0.4+/filterGenemark.pl index 224a099b..6502f026 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/filterGenemark.pl +++ b/docs/tutorial2018/BRAKER_v2.0.4+/filterGenemark.pl @@ -14,7 +14,7 @@ # First release date: January 7th 2015 # # Last update: February 10th 2016 # # -# This script is under the Artistic Licence # +# This script is under the Artistic License # # (http://www.opensource.org/licenses/artistic-license.php) # # # #################################################################################################### diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/filterIntronsFindStrand.pl b/docs/tutorial2018/BRAKER_v2.0.4+/filterIntronsFindStrand.pl index 54c4338a..fecbf652 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/filterIntronsFindStrand.pl +++ b/docs/tutorial2018/BRAKER_v2.0.4+/filterIntronsFindStrand.pl @@ -11,7 +11,7 @@ # # # Release date: January 7th 2015 # # # -# This script is under the Artistic Licence # +# This script is under the Artistic License # # (http://www.opensource.org/licenses/artistic-license.php) # # # #################################################################################################### diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/licence.txt b/docs/tutorial2018/BRAKER_v2.0.4+/licence.txt index 6ddf1061..7315b9c4 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/licence.txt +++ b/docs/tutorial2018/BRAKER_v2.0.4+/licence.txt @@ -1,4 +1,4 @@ -Artistic Licence (http://www.opensource.org/licenses/artistic-license.php) +Artistic License (http://www.opensource.org/licenses/artistic-license.php) Preamble diff --git a/docs/tutorial2018/BRAKER_v2.0.4+/startAlign.pl b/docs/tutorial2018/BRAKER_v2.0.4+/startAlign.pl index 347440c7..d203ede1 100644 --- a/docs/tutorial2018/BRAKER_v2.0.4+/startAlign.pl +++ b/docs/tutorial2018/BRAKER_v2.0.4+/startAlign.pl @@ -11,7 +11,7 @@ # # # Release date: July 11th 2017 # # # -# This script is under the Artistic Licence # +# This script is under the Artistic License # # (http://www.opensource.org/licenses/artistic-license.php) # # # #################################################################################################### diff --git a/docs/tutorial2018/README_augustus.TXT b/docs/tutorial2018/README_augustus.TXT index 85f2e794..065d5483 100644 --- a/docs/tutorial2018/README_augustus.TXT +++ b/docs/tutorial2018/README_augustus.TXT @@ -26,7 +26,7 @@ 10. MEA: USING THE MAXIMUM EXPECTED ACCURACY APPROACH 11. CONTACT ME 12. REFERENCES - 13. LICENCES + 13. LICENSES 1. INTRODUCTION --------------- @@ -721,7 +721,7 @@ HS04636 blat2hints exonpart 500 599 . + . priority=2; source=E HS04636 blat2hints intron 550 650 . + . priority=5; source=mRNA When two hints or hint groups contradict each other then the hints with the lower priority number -are ignored. This is especially usefull if for a genome several sources of hints are available, +are ignored. This is especially useful if for a genome several sources of hints are available, where one source should be trusted when in doubt. For example, the rhesus macaque currently has few native ESTs but human ESTs often also align to rhesus. Giving the hints from native ESTs a higher priority means that AUGUSTUS uses only them for genes with support by native ESTs and uses the alien EST alignments @@ -965,7 +965,7 @@ Mario Stanke and Stephan Waack (2003), Gene Prediction with a Hidden-Markov Model and a new Intron Submodel. Bioinformatics, Vol. 19, Suppl. 2, pages ii215-ii225 - 13. LICENCES + 13. LICENSES ------------ All source code, i.e. @@ -973,4 +973,4 @@ All source code, i.e. - the scripts (scripts/*.pl) - the auxiliary programs (auxprogs/) - the tree-parser (src/scanner,src/parser) -are under the Artistic Licence (see src/LICENCE.TXT). +are under the Artistic License (see src/LICENSE.TXT). diff --git a/docs/tutorial2018/data/augustus_ab_initio.gff b/docs/tutorial2018/data/augustus_ab_initio.gff index 6fcf0f08..334f1434 100644 --- a/docs/tutorial2018/data/augustus_ab_initio.gff +++ b/docs/tutorial2018/data/augustus_ab_initio.gff @@ -5,7 +5,7 @@ # Using native and syntenically mapped cDNA alignments to improve de novo gene finding # Bioinformatics 24: 637-644, doi 10.1093/bioinformatics/btn013 # No extrinsic information on sequences given. -# Initialising the parameters ... +# Initializing the parameters ... # o.tauri version. Using default transition matrix. # Looks like masking/genome.fa.softmasked is in fasta format. # We have hints for 0 sequences and for 0 of the sequences in the input set. diff --git a/docs/tutorial2018/index.html b/docs/tutorial2018/index.html index 2811393f..10c72ba8 100644 --- a/docs/tutorial2018/index.html +++ b/docs/tutorial2018/index.html @@ -12,7 +12,7 @@Using BRAKER2 and AUGUSTUS
General remarks
head -n 100 masking/genome.freq @@ -360,7 +360,7 @@3. Gene prediction
The options in the BRAKE call have the follownig meanings: