[Pkg-owncloud-commits] [owncloud-doc] 220/227: Small corrections Merge branch 'lucene' of https://github.com/owncloud/documentation into lucene

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 7bc8e538eaa5fdee022369ba0657733e18d3a010
Merge: de0a6e0 f2fbc6a
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Oct 8 10:11:40 2014 -0700

    Small corrections
    Merge branch 'lucene' of https://github.com/owncloud/documentation into lucene
    
    Conflicts:
    	admin_manual/configuration/configuring_search.rst

 admin_manual/configuration/configuring_search.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --cc admin_manual/configuration/configuring_search.rst
index 00707b0,cda3d59..82c58a0
--- a/admin_manual/configuration/configuring_search.rst
+++ b/admin_manual/configuration/configuring_search.rst
@@@ -27,5 -26,5 +27,6 @@@ It does not work with the Encryption ap
  process does not have access to the key needed to decrypt files when the user is 
  not logged in.
  
- Not all PDF versions can be indexed because the its text extraction may be
- incompatible with newer PDF versions.
 -Not all PDF versions can be indexed because the its text extraction is 
++Not all PDF versions can be indexed because its text extraction may be
+ incompatible with newer PDF versions.
++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git