coar 98/10/22 14:14:45
Modified: htdocs/manual new_features_1_3.html upgrading_to_1_3.html Log: Add the One True Config File stuff to the new/upgrade notes. Revision Changes Path 1.75 +12 -0 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- new_features_1_3.html 1998/10/06 19:54:00 1.74 +++ new_features_1_3.html 1998/10/22 21:14:43 1.75 @@ -125,6 +125,18 @@ <H2><A NAME="config">Configuration Enhancements</A></H2> <DL> +<DT><STRONG>Unified Server Configuration Files</STRONG></DT> +<DD>As of the release following Apache 1.3.3, the contents of the three + server configuration files (<SAMP>httpd.conf</SAMP>, + <SAMP>srm.conf</SAMP>, and <SAMP>access.conf</SAMP>) have + been merged into a single <SAMP>httpd.conf</SAMP> file. + The <SAMP>srm.conf</SAMP> and <SAMP>access.conf</SAMP> files + are now empty except for comments directing the Webmaster + to look in <SAMP>httpd.conf</SAMP>. In addition, the + merged <SAMP>httpd.conf</SAMP> file has been restructured + to allow directives to appear in a hopefully more + intuitive and meaningful order. +</DD> <DT><STRONG>Apache Autoconf-style Interface (APACI)</STRONG> <DD>Until Apache 1.3 there was no real out-of-the-box batch-capable build and installation procedure for the complete Apache 1.34 +12 -4 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- upgrading_to_1_3.html 1998/10/18 20:08:51 1.33 +++ upgrading_to_1_3.html 1998/10/22 21:14:43 1.34 @@ -75,10 +75,18 @@ <LI>There have been numerous changes to the default config files. Ensure that you compare your existing configuration files with the new ones to ensure there aren't any undesired differences. In - particular, the current config files apply different - <A HREF="mod/core.html#options">Options</A> and - <A HREF="mod/core.html#allowoverride">AllowOverride</A> settings to - various directories. + particular: + <UL> + <LI>As of Apache 1.3.0, the current config files apply different + <A HREF="mod/core.html#options">Options</A> and + <A HREF="mod/core.html#allowoverride">AllowOverride</A> settings to + various directories than were used in 1.2. + </LI> + <LI>As of the release following Apache 1.3.3, the three + config file templates have been merged into <SAMP>httpd.conf-dist</SAMP> + and the order of the directives changed. + </LI> + </UL> <LI>As of 1.3.2, <A HREF="mod/mod_expires.html"><CODE>mod_expires</CODE></A> will add Expires headers to content that does not come from a file on disk, unless you are using a modification time based setting.