rebase to DEV300_m96

3 files changed, 12 insertions, 15 deletions

diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index b2aa53fcb3..27b1a1dbbf 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -47,9 +47,6 @@ terminate() if ( ! defined $inpath );
 my $destpath = $inpath;
 my $with_lang = $ENV{WITH_LANG};
 
-if ( defined $ENV{COMMON_OUTDIR} && $ENV{COMMON_OUTDIR} ne "" ) {
-    $destpath =~ s/$ENV{OUTPATH}/$ENV{COMMON_OUTDIR}/;
-}
 
 # Always use / directory separators
 $prj =~ s/\\/\//g if defined($prj);
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index d45a6806fd..5537361d39 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -43,7 +43,13 @@
                     oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
          <embed href="text/shared/01/password_main.xhp#password_rules"/>
+
+         <paragraph xml-lang="en-US" id="par_id31222" role="paragraph" l10n="NEW">The open password must be entered to open the file.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id313339" role="paragraph" l10n="NEW">The permission password must be entered to edit the document.</paragraph>
+
+
 <bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx.Edit.2316.26" id="bm_id3155554" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
 
@@ -52,6 +58,7 @@
                     oldref="65">Password</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx.Edit.2316.28" id="bm_id3155524" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
 
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 9eac0c77ee..02029b6b72 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -243,18 +243,11 @@
 <paragraph xml-lang="en-US" id="hd_id3168736" role="heading" level="2" l10n="NEW">Open with Internet browser</paragraph>
       <paragraph xml-lang="en-US" id="par_id1909848" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Security</paragraph>
-<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT -->
-<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="2" l10n="NEW">Encrypt the PDF document</paragraph>
-      <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD" id="bm_id8720358" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set open password</paragraph>
-      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS -->
-<paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Restrict permission</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id6478469" role="heading" level="2" l10n="NEW">Set permission password</paragraph>
-      <paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_PWD" id="bm_id8720358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set passwords</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="CHG"><ahelp hid=".">Click to open a dialog where you enter the passwords.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id41123951" role="paragraph" l10n="NEW">You can enter a password to open the file. You can enter an optional password that allows to edit the document.</paragraph>
+
       <paragraph xml-lang="en-US" id="hd_id7985168" role="heading" level="2" l10n="NEW">Printing</paragraph>
 <bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Not permitted</paragraph>