SYNC

Revision: 11460 Author: bdubbs Date: 1 сентября 2018 г. 23:08:48 Message: LFS-8.3 ---- Added : /tags/8.3 (Copy from path: /trunk/BOOK, Revision, 11458) Replacing : /tags/8.3/appendices/dependencies.xml (Copy from path: /trunk/BOOK/appendices/dependencies.xml, Revision, 11459) Modified : /tags/8.3/chapter01/changelog.xml Replacing : /tags/8.3/chapter01/whatsnew.xml (Copy from path: /trunk/BOOK/chapter01/whatsnew.xml, Revision, 11459) Modified : /tags/8.3/general.ent Modified : /tags/8.3/packages.ent
avmaisak · Sep 2, 2018 · 8533c3f · 8533c3f
1 parent 38e5c19
commit 8533c3f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 38 deletions.
diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml
@@ -36,17 +36,22 @@
 
     <listitem>
       <para><ulink url="mailto:[email protected]">Pierre Labastie</ulink>
-      &lt;[email protected]&gt; &ndash; BLFS Editor and ALFS Lead</para>
+      &lt;[email protected]&gt; &ndash; BLFS Editor и ALFS руководитель</para>
     </listitem>
 
     <listitem>
       <para><ulink url="mailto:[email protected]">DJ Lucas</ulink>
-      &lt;[email protected]&gt; &ndash; LFS and BLFS Editor</para>
+      &lt;[email protected]&gt; &ndash; LFS и BLFS редактор</para>
     </listitem>
 
     <listitem>
       <para><ulink url="mailto:[email protected]">Ken Moffat</ulink>
-      &lt;[email protected]&gt; &ndash; BLFS Editor</para>
+      &lt;[email protected]&gt; &ndash; BLFS редактор</para>
+    </listitem>
+
+	 <listitem>
+      <para><ulink url="mailto:[email protected]">Douglas Reno</ulink>
+      &lt;[email protected]&gt; &ndash; systemd редактор</para>
     </listitem>
 
     <listitem>

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
@@ -39,7 +39,18 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
-
+<listitem>
+      <para>2018-09-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Релиз LFS-8.3.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Обновлено до linux-4.18.5. Исправления
+          <ulink url="&lfs-ticket-root;4337">#4337</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 <listitem>
       <para>2018-08-25</para>
       <itemizedlist>
@@ -53,7 +64,7 @@
       <para>2018-08-12</para>
       <itemizedlist>
        <listitem>
-          <para>[bdubbs] - Обновлено до linux-4.18. Fixes
+          <para>[bdubbs] - Обновлено до linux-4.18. Исправления
           <ulink url="&lfs-ticket-root;4330">#4332</ulink>.</para>
         </listitem>
 

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -9,7 +9,7 @@
 <sect1 id="ch-intro-whatsnew">
   <?dbhtml filename="whatsnew.html"?>
 
-  <title>Что нового в релизе</title>
+<title>Что нового в релизе</title>
 
   <para>Ниже приведен список обновлений пакетов, сделанных с предыдущего
    выпуска книги.</para>
@@ -21,7 +21,7 @@
   -->
 
   <itemizedlist>
-    <title>Обновлено:</title>
+    <title>Обновлено до:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <!--<listitem>
     <para>None</para>
@@ -56,7 +56,7 @@
     <!--<listitem>
       <para>Check-&check-version;</para>
     </listitem>-->
-   <listitem>
+    <listitem>
       <para>Coreutils-&coreutils-version;</para>
    </listitem>
     <!--<listitem>
@@ -74,9 +74,9 @@
    <listitem>
       <para>E2fsprogs-&e2fsprogs-version;</para>
    </listitem>
-   <!--<listitem>
+   <listitem>
       <para>Expat-&expat-version;</para>
-   </listitem>-->
+   </listitem>
    <!-- <listitem>
       <para>Expect-&expect-version;</para>
    </listitem>-->
@@ -185,7 +185,7 @@
    <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
    </listitem>-->
-	 <listitem>
+   <listitem>
       <para>Openssl-&openssl-version;</para>
    </listitem>
    <!-- <listitem>
@@ -203,13 +203,16 @@
     <!--<listitem>
       <para>Psmisc-&psmisc-version;</para>
     </listitem>-->
+    <listitem>
+      <para>Python-&python-version;</para>
+    </listitem>
     <!--<listitem>
       <para>Readline-&readline-version;</para>
     </listitem>-->
     <listitem>
       <para>Sed-&sed-version;</para>
     </listitem>
-   <listitem>
+    <listitem>
       <para>Shadow-&shadow-version;</para>
     </listitem>
     <!--<listitem revision="sysv">
@@ -218,7 +221,7 @@
     <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
    </listitem>
-   <listitem revision="sysv">
+    <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>
     <!--<listitem>
@@ -260,13 +263,13 @@
   </itemizedlist>-->
 
   <itemizedlist>
-    <title>Добавлено:</title>
+    <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
   </itemizedlist>
 
   <itemizedlist>
-    <title>Удалено:</title>
+    <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <!--<listitem>

diff --git a/general.ent b/general.ent
@@ -1,16 +1,16 @@
-<!ENTITY version         "20180813">
-<!ENTITY short-version   "8.2">  <!-- Used below in &blfs-book;
+<!ENTITY version         "8.3">
+<!ENTITY short-version   "8.3">  <!-- Used below in &blfs-book;
                                       Change to x.y for release but not -rc releases -->
-<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
+<!ENTITY generic-version "8.3"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180813-systemd">
+<!ENTITY versiond        "8.3-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd">
 
-<!ENTITY releasedate     "12 Августа, 2018">
+<!ENTITY releasedate     "1 Сентября, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone       "8.2">
+<!ENTITY milestone       "8.3">
 
 <!ENTITY lfs-root        "https://linuxfromscratch.org.ru/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
@@ -25,10 +25,10 @@
 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
 <!ENTITY min-kernel      "3.2">
 
-<!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
-<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
-<!ENTITY test-resultsd   "&lfs-root;lfs/build-logs/&generic-versiond;/">
-<!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
+<!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-version;/">
+<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&versiond;/">
+<!ENTITY test-resultsd   "&lfs-root;lfs/build-logs/&generic-version;/">
+<!ENTITY erratad         "&lfs-root;lfs/errata/&versiond;/">
 
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
 

diff --git a/packages.ent b/packages.ent
@@ -374,13 +374,13 @@
 <!ENTITY less-ch6-du "3.9 MB">
 <!ENTITY less-ch6-sbu "менее чем 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20170626">      <!-- Scripts depend on this format -->
-<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
+<!ENTITY lfs-bootscripts-version "20180820">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-size "32 KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
-<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">  
+<!ENTITY lfs-bootscripts-md5 "57c9501afe65b95bc4428f344ab2c85e">
 <!ENTITY lfs-bootscripts-home " ">
-<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> 
-<!ENTITY lfs-bootscripts-ch7-sbu "менее чем 0.1 SBU">
+<!ENTITY lfs-bootscripts-ch7-du "244 KB">
+<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
 <!ENTITY libcap-version "2.25">
 <!ENTITY libcap-size "64 KB">
@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "0">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> 
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
-<!ENTITY linux-size "99,397 KB">
+<!ENTITY linux-patch-version "5">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!ENTITY linux-size "99,411 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "bee5fe53ee1c3142b8f0c12c0d3348f9">
+<!ENTITY linux-md5 "22851fe6c82db6673a844bbb7c62df67">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -564,7 +564,7 @@
 <!ENTITY psmisc-ch6-du "4.3 MB">
 <!ENTITY psmisc-ch6-sbu "менее чем 0.1 SBU">
 
-<!-- If python minor version changes, updates in python and 
+<!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
 <!ENTITY python-version "3.7.0">
@@ -601,7 +601,7 @@
 <!ENTITY shadow-size "1,639 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
 <!ENTITY shadow-md5 "b491fecbf1232632c32ff8f1437fd60e">
-<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> 
+<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/">
 <!ENTITY shadow-ch6-du "46 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">