From owner-p4-projects@FreeBSD.ORG Thu Mar 25 19:54:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD9A0106566C; Thu, 25 Mar 2010 19:54:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 817981065670 for ; Thu, 25 Mar 2010 19:54:45 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D6EC8FC13 for ; Thu, 25 Mar 2010 19:54:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2PJsjAp074060 for ; Thu, 25 Mar 2010 19:54:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2PJsjOT074058 for perforce@freebsd.org; Thu, 25 Mar 2010 19:54:45 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 25 Mar 2010 19:54:45 GMT Message-Id: <201003251954.o2PJsjOT074058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 176099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2010 19:54:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=176099 Change 176099 by pgj@Binturong on 2010/03/25 19:53:56 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/share/images/articles/releng/branches-releng7.pic#3 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#14 integrate .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#16 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#9 integrate .. //depot/projects/docproj_hu/src_7/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#17 integrate .. //depot/projects/docproj_hu/www/en/projects/2010-freebsd-gsoc-thumbnail.jpg#1 branch .. //depot/projects/docproj_hu/www/en/projects/2010-freebsd-gsoc.pdf#1 branch .. //depot/projects/docproj_hu/www/en/projects/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#14 integrate .. //depot/projects/docproj_hu/www/en/projects/summerofcode.xsl#6 integrate .. //depot/projects/docproj_hu/www/en/releases/7.3R/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/releases/7.3R/announce.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/errata.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.3R/relnotes.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/schedule.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releases/index.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#38 integrate .. //depot/projects/docproj_hu/www/en/security/security.sgml#11 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#30 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#90 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#89 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#23 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#12 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml,v 1.4 2009/07/12 08:36:13 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml,v 1.5 2010/03/21 01:12:11 pgj Exp $ --> - - + + ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#16 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.105 2010/03/17 13:13:25 pav Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.106 2010/03/21 21:12:37 pav Exp $ @@ -2253,7 +2253,6 @@ ftp6.us.FreeBSD.org ftp://ftp6.us.FreeBSD.org/pub/FreeBSD/ - http://ftp6.us.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#9 (text+ko) ==== @@ -16,7 +16,7 @@ %release; - + ]>
@@ -37,11 +37,10 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.15 2009/06/08 05:11:35 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.16 2010/03/23 18:36:45 hrs Exp $ - 2008 - 2009 + 2010 The &os; Documentation Project @@ -126,7 +125,7 @@ Security Advisories - No advisories. + No advisory. - + - + - + - + @@ -36,10 +36,10 @@ - - + + - + ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#17 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -195,8 +195,8 @@ %manPath = ( 'FreeBSD 8.0-RELEASE and Ports', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", - 'FreeBSD 7.2-RELEASE and Ports', -"$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", + 'FreeBSD 7.3-RELEASE and Ports', +"$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 6.4-RELEASE and Ports', "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", @@ -206,6 +206,8 @@ 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", 'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man", + 'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-stable", + 'FreeBSD 7.3-RELEASE', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", 'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable", 'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", @@ -1429,7 +1431,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $'; return qq{\
 Copyright (c) 1996-2010 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/projects/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/projects/Makefile,v 1.33 2009/03/16 13:43:53 rwatson Exp $
+# $FreeBSD: www/en/projects/Makefile,v 1.34 2010/03/22 16:23:13 rwatson Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -17,6 +17,8 @@
 
 DATA=	2009-freebsd-gsoc-thumbnail.jpg
 DATA+=	2009-freebsd-gsoc.pdf
+DATA+=	2010-freebsd-gsoc-thumbnail.jpg
+DATA+=	2010-freebsd-gsoc.pdf
 
 XML_IDEAS=		${WEB_PREFIX}/en/projects/ideas/ideas.xml
 XSL_SOC=		${WEB_PREFIX}/en/projects/summerofcode.xsl

==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#14 (text+ko) ====

@@ -15,7 +15,7 @@
 
   
     
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.150 2010/03/20 12:28:24 rwatson Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.158 2010/03/22 16:36:20 erwin Exp $
     
   
 
@@ -329,7 +329,9 @@
     
       PMC support for modern CPUs
 
-      

Technical contact: Joseph Koshy

+

Technical contact: Joseph Koshy, + href="mailto:gnn@FreeBSD.org">George Neville-Neil

Part of this project would be to add support to PMC for running on modern x86 CPUs. This is a relatively @@ -441,7 +443,8 @@ CPU online/offline project

Technical contact: John Baldwin

+ href="mailto:jhb@FreeBSD.org">John Baldwin, Attilio Rao

The project would need to extend the current CPU states of absent and present to include absent, offline, and online. A @@ -502,6 +505,36 @@ + + Rewrite umtx - userspace mutex system calls + +

Technical contact: Attilio Rao

+ +

umtx is the underbelly of the FreeBSD pthreads synchronization + primitives, allowing kernel-assisted sleeping, wakeups, priority + propagation, and other features supporting efficient mutexes and + reader-writer locks in userspace. As kernel features have evolved + (such as the addition of a sleepqueue primitive), hardware + scalability has grown, and application-writer expectations have + changed, some weaknesses have come to light. In particular, there + are concerns about overhead and scalability with highly-threaded + applications. This project would profile and evaluate the existing + system call service provided by umtex, and consider cleanups, + optimizations, and the application of newer algorithms to improve + functionality and performance. The effectiveness of the rewrite + would be demonstrated through careful testing with sensitive + workloads, such as MySQL on 16-core systems.

+ +

Requirements:

+
    +
  • Strong knowledge of C.
  • +
  • Experience with multi-threaded programming.
  • +
  • Experience with kernel programming.
  • +
+
+
+ Document all sysctls @@ -1128,16 +1161,90 @@ + + + Multiqueue BPF support and other BPF features + +

Technical contact: Robert Watson

+ +

The Berkeley Packet Filter (BPF) allows packet capture filters to + be compiled into a bytecode that is either interpreted by a kernel + virtual machine, or compiled into native machine code via a JIT and + executed in in-kernel. Historically, the origin of packets has + been the network interface, with each (synthetic) BPF device + attached to exactly one NIC as requested by the application (for + example, tcpdump). However, network interfaces have become + significantly more complicated, and BPF has had to grow to support + new features, such as Data Link Types (DLTs), in which BPF devices + can tap network processing at different layers. This task would + involve teaching BPF about a further dimension in network interface + complexity: multiple input and output queues.

+ +

Modern 10gbps, and even 1gbps, network cards support multiple + queues for various reasons: at first quality of service (QoS) + differentiation in processing, but now especially to improve + parallelism in network processing by distributing work to many CPUs + on input. This same technica can also accelerate packet capture, + but BPF currently doesn't know this. In this project, BPF would be + enhanced to be aware of individual input and output queues on a NIC, + which means providing network stack abstractions for these concepts, + visible today only within device drivers. Userspace threads might + then use enhanced ioctl(2)s to query the set of available queues + and attach to one or more. Applications seeking maximum parallelism + could open (n) devices, attaching each to a queue, and executing + with appropriate CPU affinity. Ideally this would involve neither + lock nor cache line contention throughout the entire stack, from + device driver to userspace delivery.

+ +

Requirements:

+
    +
  • Strong knowledge of C.
  • +
  • Experience with multi-threaded programming.
  • +
  • Experience with kernel programming.
  • +
  • Familiarity with the TCP/IP protocol suite.
  • +
+
+
+ + + Implement a simulated 802.11 wireless radio + +

Technical contact: Rui Paulo

+ +

The FreeBSD 802.11 layer, net80211, implements a broad range of + advanced functionality: station, access point, virtual access + point, mesh networking, authentication/encryption, and more. This + task implements a net80211 driver simulating a wireless radio in + order to allow protocol-layer testing without the hassle of real + live hardware limitations: interference, signal propagation, and + regulatory domains. The driver should let the user specify a + number of radios to be simulated, with an eye towards future work + to simulate physical properties.

+ +

A useful reference for this work would be the notionally similar + mac80211_hwsim driver in Linux + (http://linuxwireless.org/en/users/Drivers/mac80211_hwsim), which + might provide a model in some areas of the work, and has similarly + been used on that platform to test hostapd/wpa_supplication.

+ +

Requirements:

+
    +
  • Good knowledge of C.
  • +
  • Wireless networking fundamentals.
  • +
+
+
+ Ports - + Add .db support to pkg_tools -

Technical contact: Kris Kennaway

pkg_create(1) and friends use flat databases (aka ordinary files and directories in /var/db/pkg) to maintain their data. This makes it cumbersome and/or impossible to do efficient lookups of data @@ -1175,13 +1282,10 @@ - + Parallelization in the Ports Collection -

Technical contact: Pav Lucistnik

-

Add locking of write access to PKG_DBDIR (/var/db/pkg), to allow several port builds run in parallel without clobbering the package data. Should be done both in makefiles and in C tools like @@ -1210,33 +1314,6 @@ - - Ports license auditing infrastructure - - -

Technical contact: Kris Kennaway, Brooks Davis

- -

Develop and deploy infrastructure for annotating license - conditions that apply to third party software in the ports - collection. For example, identifying ports provided under - the GPL version 3 license, or under licenses that do not - permit redistribution or which impose non-standard - requirements. Part of this project will involve exploring - methods for automatically classifying licenses using HP's - fossology tool (http://www.fossology.org/) or other - mechanisms.

- -

Requirements:

- -
    -
  • Familiarity with bsd.port.mk and related ports collection - infrastructure.
  • -
-
-
- Complete (a.k.a. Fat) packages @@ -1261,6 +1338,27 @@ + + Performance improvement of the Ports system + + +

A number of tasks of the Ports system can take quite a long time + to perform. Some are well known for traversing each and every port + in the tree, e.g. building INDEX, which does not scale well with + the number of ports being added to the collection.

+

Detailed profiling of the most used commands in the ports + framework needs to be done to analyze the bottlenecks and identify + possible solutions. Refactoring of the main file bsd.ports.mk + is also necessary to improve code readability, but not at the + cost of performance.

+

Requirements:

+
    +
  • Strong knowledge of make and shell code.
  • +
  • Good understanding of the inner design of the Ports Collection.
  • +
+
+
+
@@ -1939,8 +2037,7 @@ BSNMP enhancements

Technical contact: - Shteryana Shopova, - Bjoern A. Zeeb

+ Shteryana Shopova

BSNMP is a portable SNMP framework consisting of a daemon, modules and tools. It includes libraries that ease @@ -2069,5 +2166,39 @@ + + + Jail init and management + +

Technical contact: Bjoern Zeeb, Warner Losh, Robert Watson

+ +

FreeBSD's jail(8) facility provides lightweight operating system + virtualization; with the addition of experimental virtual network + stacks, ISPs are able to efficiently host thousands of FreeBSD + instances on a single machine. This task improves FreeBSD's + userspace management of jails by introducing jailinit(8), an + enhancement to the init(8) utility responsible for starting up and + shutting down the operating system. Currently, jails are started + by executing their /etc/rc script directly using jail(8); in the + proposed new world order, init(8) would have a jail start mode, + and would continue running throughout the lifetime of the jail to + manage services and eventually shut down the jail. This might + require minor kernel changes in order to let jailinit perform some + of the same functions for jails as it does for normal userspace. + jailinit could also be responsible for setting up and managing + console logging, launching tty-attached services such as getty + within a jail, and other jail properties.

+ +

Requirements

+
    +
  • C and shell programming skills
  • +
  • Interest in virtualization
  • +
+
+ +
==== //depot/projects/docproj_hu/www/en/projects/summerofcode.xsl#6 (text+ko) ==== @@ -7,7 +7,7 @@ %developers; ]> - + @@ -50,6 +50,11 @@ href="&base;/projects/summerofcode-2008.html">2008, and 2009.

+

This page will be updated throughout the GSoC 2010 application period + to include new information, such as project ideas, proposal information, + and potential mentor contact information. If you don't see an idea that + interests you, visit again in a couple of days!

+
  • Benefits of Participating
  • Past Student Projects
  • @@ -381,11 +386,11 @@ local university or college campus! You can forward around our e-mail announcement to department and club mailing lists, and to department secretaries to distribute. You can also print out and post copies of the - FreeBSD GSoC 2009 poster.

    + FreeBSD GSoC 2010 poster.

    -

    [FreeBSD GSoC 2009 poster thumnail] [FreeBSD GSoC 2010 poster thumnail]

    ==== //depot/projects/docproj_hu/www/en/releases/7.3R/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/7.3R/Makefile,v 1.2 2010/03/19 18:50:42 hrs Exp $ +# $FreeBSD: www/en/releases/7.3R/Makefile,v 1.4 2010/03/23 18:45:59 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,7 +7,9 @@ .include "../Makefile.inc" .endif -DOCS= schedule.sgml +DOCS= schedule.sgml \ + relnotes.sgml \ + announce.sgml DATA= docbook.css \ errata.html \ ==== //depot/projects/docproj_hu/www/en/releases/7.3R/errata.html#2 (text+ko) ==== @@ -18,8 +18,8 @@ -

    $FreeBSD: releng/7.3/release/doc/en_US.ISO8859-1/errata/article.sgml -205344 2010-03-19 18:43:15Z hrs $
    +

    $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml +205521 2010-03-23 18:36:45Z hrs $

    @@ -102,13 +102,17 @@

    4 Late-Breaking News and Corrections

    -

    No news.

    +

    [20100323] The FreeBSD 7.3-RELEASE Release Notes incorrectly mentioned that the +hwpmc(4) driver has been added though this driver has already been added in 7.0-RELEASE. +The changes in 7.3-RELEASE are that pmcannotate(8) utility and support for Intel Core 2 +and Core i7 have been added.


    This file, and other release-related documents, can be -downloaded from ftp://ftp.FreeBSD.org/.

    +downloaded from http://www.FreeBSD.org/snapshots/.

    For questions about FreeBSD, read the documentation before contacting < - + re@FreeBSD.org'> @@ -121,16 +121,23 @@ + RELENG_7_3_0_RELEASE tagged + — + 21 March 2010 + The release tag for 7.3-RELEASE is set on RELENG_7_3 branch. + + + RELEASE builds — - — + 21 March 2010 Begin RELEASE builds. Announcement - 1 March 2010 - — + 1 March 2010
    23 March 2010 + 23 March 2010 Announcement sent out after a majority of the mirrors have received the bits. ==== //depot/projects/docproj_hu/www/en/releases/index.sgml#8 (text+ko) ==== @@ -1,10 +1,10 @@ - + ]> - + &header; @@ -30,7 +30,6 @@ Announcement : Release Notes : Hardware Notes : -Installation Notes : Readme : Errata

    @@ -65,6 +64,16 @@

    Past Releases

      +
    • 7.2 (May 2009) + + Announcement: + Release Notes: + Hardware Notes: + Readme: + Errata + +
    • +
    • 7.1 (January 2009) Announcement: ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#38 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,8 +50,7 @@ March 2010 &os; 7.3 - RC2 is available + Released on March 23, 2010. ==== //depot/projects/docproj_hu/www/en/security/security.sgml#11 (text+ko) ==== @@ -1,12 +1,12 @@ - + %developers; ]> - + &header; @@ -283,8 +283,8 @@ RELENG_7_3 7.3-RELEASE Extended - not yet - release + 2 years + March 23, 2010 + March 31, 2012 RELENG_8 ==== //depot/projects/docproj_hu/www/hu/administration.sgml#30 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#90 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.39 2010/03/12 23:06:04 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.40 2010/03/21 01:24:40 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#89 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.302 2010/03/18 19:04:46 tabthorpe Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.304 2010/03/23 18:45:59 hrs Exp $ @@ -34,10 +34,32 @@ 3 + + + 23 + + + FreeBSD 7.3-RELEASE Available + +

      FreeBSD + 7.3-RELEASE is now available. Please be sure to check + the Release + Notes and Release + Errata before installation for any late-breaking news + and/or issues with 7.3. More information about FreeBSD + releases can be found on the Release + Information page.

      +
      +
      + 18 -

      Portmgr is pleased to announce Thomas Abthorpe has assumed the role of portmgr-secretary.

      + New Ports Management Team Secretary: <a href="mailto:tabthorpe@FreeBSD.org">Thomas Abthorpe</a> + +

      The &os; Ports Management Team is pleased to announce Thomas Abthorpe has assumed the role of Ports Management Team Secretary.

      ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#23 (text+ko) ==== @@ -1,4 +1,4 @@ - + - - + + @@ -54,8 +54,8 @@ - - + +