From 7aab5a9562a3547d7ad8727a8abee5f859761bd4 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 7 Dec 2016 18:50:52 +1300 Subject: [PATCH] Remove trailing whitespace from text files (cherry picked from commit efb2b046fe41991003237dfb7114e37601977725) --- xapian-applications/omega/ChangeLog | 4 ++-- xapian-bindings/ChangeLog | 6 +++--- xapian-core/ChangeLog | 14 +++++++------- xapian-core/ChangeLog.0 | 24 ++++++++++++------------ xapian-core/HACKING | 12 ++++++------ xapian-core/languages/stopwords/arabic.txt | 4 ++-- xapian-core/net/replication_protocol.rst | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/xapian-applications/omega/ChangeLog b/xapian-applications/omega/ChangeLog index b82a2acfe..3aeca3f84 100644 --- a/xapian-applications/omega/ChangeLog +++ b/xapian-applications/omega/ChangeLog @@ -386,13 +386,13 @@ Wed Dec 03 04:17:18 GMT 2014 Olly Betts * templates/xml: Update handling of DATE1, DATE2 and DAYSMINUS which were renamed in 0.6.x and the compatibility aliases removed in - 1.0.0. + 1.0.0. Wed Dec 03 04:15:51 GMT 2014 Olly Betts * docs/omegascript.rst: Update documentation references to DATE1, DATE2, and DAYSMINUS which were renamed in 0.6.x and the - compatibility aliases removed in 1.0.0. + compatibility aliases removed in 1.0.0. Wed Dec 03 02:40:50 GMT 2014 Olly Betts diff --git a/xapian-bindings/ChangeLog b/xapian-bindings/ChangeLog index d3ee5875b..6486b2845 100644 --- a/xapian-bindings/ChangeLog +++ b/xapian-bindings/ChangeLog @@ -510,7 +510,7 @@ Mon Jun 30 02:18:04 GMT 2014 Olly Betts Sat Jun 28 11:15:47 GMT 2014 Olly Betts * Makefile.am,shortstop.list: Add and distribute new data file - 'shortstop.list', needed for new SimpleStopper ctor testcase. + 'shortstop.list', needed for new SimpleStopper ctor testcase. Sat Jun 28 09:34:15 GMT 2014 Olly Betts @@ -1287,7 +1287,7 @@ Tue Aug 28 04:33:21 GMT 2012 Dan Colish Sun Aug 12 05:45:32 GMT 2012 Dan Colish * java/Makefile.am,java/run-java-test: Remove jdb target from - Makefile. + Makefile. Sun Aug 12 04:54:04 GMT 2012 Dan Colish @@ -1374,7 +1374,7 @@ Mon Jun 04 12:01:06 GMT 2012 Olly Betts * swig-depcomp: Script which wraps a call to SWIG and tells it to generate dependencies, and then adjust the generated dependencies. * csharp/Makefile.am,java/Makefile.am,lua/Makefile.am,perl/Makefile.am, - php/Makefile.am,python/Makefile.am,ruby/Makefile.am,tcl8/Makefile.am: + php/Makefile.am,python/Makefile.am,ruby/Makefile.am,tcl8/Makefile.am: Use swig-depcomp. Mon Jun 04 07:07:28 GMT 2012 Olly Betts diff --git a/xapian-core/ChangeLog b/xapian-core/ChangeLog index 6fab84d13..723ce5a0e 100644 --- a/xapian-core/ChangeLog +++ b/xapian-core/ChangeLog @@ -2227,7 +2227,7 @@ Fri May 16 04:35:21 GMT 2014 Olly Betts Thu May 15 12:51:15 GMT 2014 Olly Betts - * HACKING: Add checking config/config.* are up to date to the + * HACKING: Add checking config/config.* are up to date to the release checklist. Thu May 15 12:47:28 GMT 2014 Olly Betts @@ -2663,7 +2663,7 @@ Mon Dec 23 04:16:58 GMT 2013 Olly Betts Mon Dec 23 04:01:05 GMT 2013 Olly Betts - * tests/api_unicode.cc: Add a test that a character due to be added in + * tests/api_unicode.cc: Add a test that a character due to be added in Unicode 7.0.0 is categorised as "unassigned". Mon Dec 23 03:50:37 GMT 2013 Olly Betts @@ -3832,7 +3832,7 @@ Thu Apr 25 06:49:48 GMT 2013 Olly Betts * backends/remote/remote-database.cc,common/remoteprotocol.h, docs/remote_protocol.rst,net/remoteserver.cc: Prefix compress - list of terms and metadata keys in the remote protocol. + list of terms and metadata keys in the remote protocol. This requires a remote protocol major version bump. Wed Apr 24 23:14:47 GMT 2013 Olly Betts @@ -4622,12 +4622,12 @@ Sat Aug 25 16:09:50 GMT 2012 Dan Colish ESetIterator exhaustion against the size of the underlying interee since comparison against an empty Itor is not suitable for an exhaustion test. Add FIXME that these Iterators should use an Internal - class. + class. Thu Aug 09 21:50:52 GMT 2012 Dan Colish * weight/weightinternal.h: Include config.h since macros are used - from it. + from it. Wed Aug 08 15:40:38 GMT 2012 Dan Colish @@ -4815,7 +4815,7 @@ Tue Jun 05 06:33:09 GMT 2012 Olly Betts 4.0 is now lumped in with 3.*, since we handle it exactly the same. Enable -Wdouble-promotion for GCC >= 4.6. Check for symbol visibility support under any GCC-alike (which means we now run the - test with Intel's compiler). Move the check for -Bsymbolic-functions + test with Intel's compiler). Move the check for -Bsymbolic-functions to be run for all compilers. Mon Jun 04 06:21:02 GMT 2012 Olly Betts @@ -5303,7 +5303,7 @@ Sun Mar 18 00:48:05 GMT 2012 Dan Colish Sun Mar 18 00:39:23 GMT 2012 Dan Colish * tests/.gitignore,tests/soaktest/.gitignore: Add additional ignores - for test artifacts + for test artifacts Fri Mar 16 05:23:54 GMT 2012 Olly Betts diff --git a/xapian-core/ChangeLog.0 b/xapian-core/ChangeLog.0 index 1d4eef048..dd25c9d11 100644 --- a/xapian-core/ChangeLog.0 +++ b/xapian-core/ChangeLog.0 @@ -25,7 +25,7 @@ Fri Nov 24 10:11:05 GMT 2000 Chris Emerson * Btree base files now store things in variable-length fields. The format number is also now used. - + * New function sys_read_all_bytes() to read an entire file into a string. @@ -90,7 +90,7 @@ Wed Nov 22 18:28:36 GMT 2000 Chris Emerson * Turned the rest of the Btree API functions into Btree member functions. - + * Added a bit of const to sys_write_* and get_[u]int4 Wed Nov 22 15:53:16 GMT 2000 Olly Betts @@ -191,10 +191,10 @@ Mon Nov 20 19:00:26 GMT 2000 Chris Emerson * Added new class Btree_base encapsulating the structure of the Quartz base file. - + * sys_read_bytes() and sys_read_block() now share most of their code. Some of the sys_* made available in btree_util.h. - + * Btree_create now a wrapper around Btree::create(). Mon Nov 20 14:27:20 GMT 2000 Richard Boulton @@ -303,7 +303,7 @@ Thu Nov 16 19:27:20 GMT 2000 Chris Emerson Fixed a few FIXMEs, and added some more. Did lots of tweaking to error handling. - + There are a few more occurrences to change. In some cases things can be made much cleaner when the code is objectified with constructors and destructors. Most of Btree_quit() moved @@ -313,12 +313,12 @@ Thu Nov 16 14:48:05 GMT 2000 Chris Emerson * Added method str(std::string) to om_ostringstream, to set the value of the internal string. - + * The testsuite now has a global om_ostringstream "tout", which should be used by test functions when printing anything out. Everything sent to the stream will be thrown out when the test succeeds, or printed out if it fails. - + * Tests in api_db.cc modified to use tout. Thu Nov 16 11:52:29 GMT 2000 Chris Emerson @@ -329,7 +329,7 @@ Wed Nov 15 18:14:10 GMT 2000 Chris Emerson * Added QuartzDocument class, and implemented QuartzDatabase:: open_document(). - + * Removed BerkeleyDB 3.1 bits from the Quartz Makefile.am Wed Nov 15 14:52:19 GMT 2000 Chris Emerson @@ -439,15 +439,15 @@ Tue Nov 7 17:51:47 GMT 2000 Chris Emerson eat_* and swap() allow more efficient manipulation of indexer data when the original does not need to be preserved. set_{int,double,string} have actually been implemented. - + * OmIndexerNode has new methods get_config_int(), get_config_double(), get_config_vector() so the configuration parameters are more useful. Also added a set_output() variant for const OmIndexerData&, for convenience. - + * OmConstantNode now supports int, double, and vector types as well as string. - + * Implemented config_modified() for several nodes. * OmListConcatNode makes use of more efficient data shuffling. @@ -2298,7 +2298,7 @@ Wed Sep 06 13:34:24 BST 2000 Olly Betts * Opening a termlist for a document which is not present now always throws OmDocNotFoundError (da and db backends need checking) - * Updated TODO. + * Updated TODO. Wed Sep 06 11:31:00 BST 2000 Olly Betts diff --git a/xapian-core/HACKING b/xapian-core/HACKING index 028069040..451f1c4cd 100644 --- a/xapian-core/HACKING +++ b/xapian-core/HACKING @@ -981,7 +981,7 @@ Here's an incomplete list of things to avoid: necessary, but could result in problems if the invocation of SWIG_commands failed after creating xapian_wrap.cc, but before creating xapian_wrap.h. Instead, we recommend creating an intermediate target:: - + # This rule works in most cases xapian_wrap.cc xapian_wrap.h: xapian_wrap.stamp xapian_wrap.stamp: xapian.i @@ -1171,13 +1171,13 @@ class keyword like so:: With recent versions of GCC (4.4.7 allows this, 3.3.5 doesn't), you can simply mark a method defined inline in a class with ``XAPIAN_DEPRECATED()`` like so: - + class Foo { public: // This fails to compile with GCC 3.3.5, so don't do this! XAPIAN_DEPRECATED(int old_inline_method()) { return 42; } }; - + Xapian 1.3.x and later require at least GCC 4.7, so you can just use the approach above. Xapian 1.2.x aims to support GCC 3.1 and later, so in the unlikely event of needing to adjust deprecation markers in 1.2.x, you need to @@ -1235,7 +1235,7 @@ to follow the style of the existing code. In particular: The default access for a class is always "private", so there's no need to specify that explicitly - in other words, write this:: - + class Foo { int internal_method(); @@ -1486,7 +1486,7 @@ introduction to the Xapian test system in ``docs/tests.html``. --------- * Commit: - + + If there's a trac ticket or other reference for the bug, mention it in the commit message - it's a great help to future developers trying to work out why a change was made. @@ -1511,7 +1511,7 @@ introduction to the Xapian test system in ``docs/tests.html``. If there are conflicts in test cases which aren't easy to resolve, it is acceptable to just drop those changes from the patch if we can still be confident that the issue is actually fixed by the patch. - + API Structure Notes =================== diff --git a/xapian-core/languages/stopwords/arabic.txt b/xapian-core/languages/stopwords/arabic.txt index 1e2d54b5d..c3bd1dd9b 100644 --- a/xapian-core/languages/stopwords/arabic.txt +++ b/xapian-core/languages/stopwords/arabic.txt @@ -1,7 +1,7 @@ | An Arabic stop word list. Comments begin with vertical bar. Each stop | word is at the start of a line. - | (This is not an official Snowball stop word list, basically inspired from + | (This is not an official Snowball stop word list, basically inspired from | Arabic Stop Words Project) إذ @@ -251,4 +251,4 @@ وما ومن وهو -يا \ No newline at end of file +يا diff --git a/xapian-core/net/replication_protocol.rst b/xapian-core/net/replication_protocol.rst index 94d2b9023..076636633 100644 --- a/xapian-core/net/replication_protocol.rst +++ b/xapian-core/net/replication_protocol.rst @@ -87,7 +87,7 @@ the future): - A byte: - 0 if the changes can safely be applied to a live database - + - 1 if the changes cannot be applied while searching is in progress. (This will be set if the database was modified in "DANGEROUS" mode). -- 2.11.4.GIT