0fd095 more fixes from upstream

Authored and Committed by tmraz 7 years ago
    more fixes from upstream
    
    - fix errors in manual causing build failure (#904777)
    
        
file modified
+9 -1