This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit eec65173cebf9f3f1f3907fe6195872616517483
Author: Kay Schenk <[email protected]>
AuthorDate: Tue Sep 30 23:45:30 2014 +0000

    #i125696 Removed error reporitng information and updated other files 
accordingly.
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1628577 
13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit cd3719e8a1f56e7a16ebd23aee3f3a6f6da93ab8)
---
 .../source/text/shared/guide/doc_autosave.xhp      |  2 +
 .../source/text/shared/guide/error_report.xhp      | 58 ----------------------
 .../source/text/shared/guide/makefile.mk           |  1 -
 .../source/text/shared/guide/start_parameters.xhp  |  3 +-
 4 files changed, 4 insertions(+), 60 deletions(-)

diff --git a/main/helpcontent2/source/text/shared/guide/doc_autosave.xhp 
b/main/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index 530e3c0..fef9a3b 100644
--- a/main/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/main/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -86,7 +86,9 @@
 <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
 <paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" 
oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save 
As</link></paragraph>
 <paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" 
oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - 
Preferences</caseinline><defaultinline>Tools - 
Options</defaultinline></switchinline> - <link 
href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - 
General</link></paragraph>
+<!--
 <paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" 
l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report 
Tool</link></paragraph>
+-->
 </section>
 </body>
 </helpdocument>
diff --git a/main/helpcontent2/source/text/shared/guide/error_report.xhp 
b/main/helpcontent2/source/text/shared/guide/error_report.xhp
deleted file mode 100644
index bf344c0..0000000
--- a/main/helpcontent2/source/text/shared/guide/error_report.xhp
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--***********************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
-
-
-
-
-<meta>
-      <topic id="textsharedguideerror_reportxml" indexer="include" 
status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Error Report Tool</title>
-         <filename>/text/shared/guide/error_report.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3150616"><bookmark_value>Error Report Tool</bookmark_value>
-      <bookmark_value>reports;error reports</bookmark_value>
-      <bookmark_value>crash reports</bookmark_value>
-      <bookmark_value>activating;Error Report Tool</bookmark_value>
-</bookmark><comment>MW changed "reporting..." to "reports;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3150616" role="heading" level="1" l10n="U"
-                 oldref="17"><variable id="error_report"><link 
href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report 
Tool</link>
-</variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="U" 
oldref="1">The Error Report Tool starts automatically when a program crash 
occurs.<comment>removed sentene about manually - i96770</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" 
oldref="2">The Error Report Tool gathers all necessary information that can 
help the program developers to improve the code, so that in later versions this 
error can possibly be avoided. Please help us to improve the software and send 
the generated error report.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" 
l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="U" 
oldref="5">With most program crashes the Error Report Tool will start 
automatically.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" 
l10n="U" oldref="7">Completing the Report</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" 
oldref="8">On the main Error Report Tool dialog, you can enter some additional 
information that may help the developers to localize the error. For example, if 
the error only appears after a change in your hardware or software environment, 
or if you clicked on a button, please include that information.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3159399" role="heading" level="2" 
l10n="U" oldref="9">Sending the Error Report</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150504" role="paragraph" l10n="U" 
oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the 
report data. You may optionally enter some descriptive text that will help us 
to identify the context of the program crash. Then click the <emph>Send</emph> 
button.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149670" role="warning" l10n="U" 
oldref="11">You will not get an answer to your error report. If you need 
support, please visit the <link href="text/shared/main0108.xhp">support 
forum</link> on the Internet.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153526" role="paragraph" l10n="U" 
oldref="12">You may choose to respond to questions that the developers may have 
about the reported error. Mark the check box if you allow to be contacted by 
e-mail, should additional information be required. By default this box is not 
marked, so you will not get any e-mail.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="2" 
l10n="U"
-                 oldref="13">What Data is Sent?</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" 
oldref="14">The error report consists of several files. The main file contains 
information about the error type, operating system name and version, memory 
usage, and the description that you entered. You can click the <emph>Show 
Report</emph> button on the main dialog of the Error Report Tool to view what 
will get sent in the main file.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151177" role="paragraph" l10n="U" 
oldref="15">In addition, relevant memory contents and stack traces are gathered 
by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on 
UNIX systems). This information will be sent also.</paragraph>
-   </body>
-</helpdocument>
\ No newline at end of file
diff --git a/main/helpcontent2/source/text/shared/guide/makefile.mk 
b/main/helpcontent2/source/text/shared/guide/makefile.mk
index a11e748..78c1631 100644
--- a/main/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/main/helpcontent2/source/text/shared/guide/makefile.mk
@@ -94,7 +94,6 @@ XHPFILES = \
    dragdrop_table.xhp \
    edit_symbolbar.xhp \
    email.xhp \
-   error_report.xhp \
    export_ms.xhp \
    fax.xhp \
    filternavigator.xhp \
diff --git a/main/helpcontent2/source/text/shared/guide/start_parameters.xhp 
b/main/helpcontent2/source/text/shared/guide/start_parameters.xhp
index 096d2e8..083b2a0 100644
--- a/main/helpcontent2/source/text/shared/guide/start_parameters.xhp
+++ b/main/helpcontent2/source/text/shared/guide/start_parameters.xhp
@@ -169,7 +169,7 @@
 <paragraph role="tablecontent" id="par_id3145147" xml-lang="en-US" l10n="U" 
oldref="19">More information is found in the <emph>$[officename] Developer's 
Guide</emph>.</paragraph>
 </tablecell>
 </tablerow>
-<tablerow>
+<!--<tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3155334" xml-lang="en-US" l10n="U" 
oldref="77">-nocrashreport</paragraph>
 </tablecell>
@@ -177,6 +177,7 @@
 <paragraph role="tablecontent" id="par_id3149259" xml-lang="en-US" l10n="U" 
oldref="78">Disables the error report tool.</paragraph>
 </tablecell>
 </tablerow>
+-->
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3155903" xml-lang="en-US" l10n="U" 
oldref="20">-norestore</paragraph>

Reply via email to